diff --git a/src/servers/app/drawing/DWindowBuffer.cpp b/src/servers/app/drawing/interface/virtual/DWindowBuffer.cpp
similarity index 100%
rename from src/servers/app/drawing/DWindowBuffer.cpp
rename to src/servers/app/drawing/interface/virtual/DWindowBuffer.cpp
diff --git a/src/servers/app/drawing/DWindowBuffer.h b/src/servers/app/drawing/interface/virtual/DWindowBuffer.h
similarity index 100%
rename from src/servers/app/drawing/DWindowBuffer.h
rename to src/servers/app/drawing/interface/virtual/DWindowBuffer.h
diff --git a/src/servers/app/drawing/DWindowHWInterface.cpp b/src/servers/app/drawing/interface/virtual/DWindowHWInterface.cpp
similarity index 100%
rename from src/servers/app/drawing/DWindowHWInterface.cpp
rename to src/servers/app/drawing/interface/virtual/DWindowHWInterface.cpp
diff --git a/src/servers/app/drawing/DWindowHWInterface.h b/src/servers/app/drawing/interface/virtual/DWindowHWInterface.h
similarity index 100%
rename from src/servers/app/drawing/DWindowHWInterface.h
rename to src/servers/app/drawing/interface/virtual/DWindowHWInterface.h
diff --git a/src/servers/app/drawing/ViewHWInterface.cpp b/src/servers/app/drawing/interface/virtual/ViewHWInterface.cpp
similarity index 100%
rename from src/servers/app/drawing/ViewHWInterface.cpp
rename to src/servers/app/drawing/interface/virtual/ViewHWInterface.cpp
diff --git a/src/servers/app/drawing/ViewHWInterface.h b/src/servers/app/drawing/interface/virtual/ViewHWInterface.h
similarity index 100%
rename from src/servers/app/drawing/ViewHWInterface.h
rename to src/servers/app/drawing/interface/virtual/ViewHWInterface.h
diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile
index 45fc01527b..7ed7f48452 100644
--- a/src/tests/servers/app/Jamfile
+++ b/src/tests/servers/app/Jamfile
@@ -47,6 +47,7 @@ SEARCH_SOURCE += [ FDirName $(appServerDir) decorator ] ;
 SEARCH_SOURCE += [ FDirName $(appServerDir) drawing ] ;
 SEARCH_SOURCE += [ FDirName $(appServerDir) drawing Painter ] ;
 SEARCH_SOURCE += [ FDirName $(appServerDir) drawing interface remote ] ;
+SEARCH_SOURCE += [ FDirName $(appServerDir) drawing interface virtual ] ;
 SEARCH_SOURCE += [ FDirName $(appServerDir) font ] ;
 
 SharedLibrary libhwinterface.so :