diff --git a/DDrawCompat/D3dDdi/AdapterCallbacks.h b/DDrawCompat/D3dDdi/AdapterCallbacks.h
index 470fc59..6e8743b 100644
--- a/DDrawCompat/D3dDdi/AdapterCallbacks.h
+++ b/DDrawCompat/D3dDdi/AdapterCallbacks.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include "Common/CompatVtable.h"
-#include "D3dDdiAdapterCallbacksVisitor.h"
+#include "D3dDdi/Visitors/AdapterCallbacksVisitor.h"
 
 namespace D3dDdi
 {
 	class AdapterCallbacks :
-		public CompatVtable<AdapterCallbacks, D3dDdiAdapterCallbacksIntf>
+		public CompatVtable<AdapterCallbacks, AdapterCallbacksIntf>
 	{
 	public:
 		static void setCompatVtable(D3DDDI_ADAPTERCALLBACKS& vtable);
diff --git a/DDrawCompat/D3dDdi/AdapterFuncs.h b/DDrawCompat/D3dDdi/AdapterFuncs.h
index b80ce69..1b0c9e9 100644
--- a/DDrawCompat/D3dDdi/AdapterFuncs.h
+++ b/DDrawCompat/D3dDdi/AdapterFuncs.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include "Common/CompatVtable.h"
-#include "D3dDdiAdapterFuncsVisitor.h"
+#include "D3dDdi/Visitors/AdapterFuncsVisitor.h"
 
 namespace D3dDdi
 {
-	class AdapterFuncs : public CompatVtable<AdapterFuncs, D3dDdiAdapterFuncsIntf>
+	class AdapterFuncs : public CompatVtable<AdapterFuncs, AdapterFuncsIntf>
 	{
 	public:
 		static void setCompatVtable(D3DDDI_ADAPTERFUNCS& vtable);
diff --git a/DDrawCompat/D3dDdi/DeviceCallbacks.h b/DDrawCompat/D3dDdi/DeviceCallbacks.h
index 9b5743a..110e4da 100644
--- a/DDrawCompat/D3dDdi/DeviceCallbacks.h
+++ b/DDrawCompat/D3dDdi/DeviceCallbacks.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Common/CompatVtable.h"
-#include "D3dDdiDeviceCallbacksVisitor.h"
+#include "D3dDdi/Visitors/DeviceCallbacksVisitor.h"
 
 std::ostream& operator<<(std::ostream& os, const D3DDDI_ALLOCATIONINFO& data);
 std::ostream& operator<<(std::ostream& os, const D3DDDICB_ALLOCATE& data);
@@ -14,7 +14,7 @@ std::ostream& operator<<(std::ostream& os, const D3DDDICB_UNLOCK2& data);
 
 namespace D3dDdi
 {
-	class DeviceCallbacks : public CompatVtable<DeviceCallbacks, D3dDdiDeviceCallbacksIntf>
+	class DeviceCallbacks : public CompatVtable<DeviceCallbacks, DeviceCallbacksIntf>
 	{
 	public:
 		static void setCompatVtable(D3DDDI_DEVICECALLBACKS& vtable);
diff --git a/DDrawCompat/D3dDdi/DeviceFuncs.h b/DDrawCompat/D3dDdi/DeviceFuncs.h
index a146656..2c5810a 100644
--- a/DDrawCompat/D3dDdi/DeviceFuncs.h
+++ b/DDrawCompat/D3dDdi/DeviceFuncs.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Common/CompatVtable.h"
-#include "D3dDdiDeviceFuncsVisitor.h"
+#include "D3dDdi/Visitors/DeviceFuncsVisitor.h"
 
 std::ostream& operator<<(std::ostream& os, const D3DDDI_RATIONAL& val);
 std::ostream& operator<<(std::ostream& os, const D3DDDI_SURFACEINFO& val);
@@ -14,7 +14,7 @@ std::ostream& operator<<(std::ostream& os, const D3DDDIBOX& val);
 
 namespace D3dDdi
 {
-	class DeviceFuncs : public CompatVtable<DeviceFuncs, D3dDdiDeviceFuncsIntf>
+	class DeviceFuncs : public CompatVtable<DeviceFuncs, DeviceFuncsIntf>
 	{
 	public:
 		static void setCompatVtable(D3DDDI_DEVICEFUNCS& vtable);
diff --git a/DDrawCompat/D3dDdiAdapterCallbacksVisitor.h b/DDrawCompat/D3dDdi/Visitors/AdapterCallbacksVisitor.h
similarity index 92%
rename from DDrawCompat/D3dDdiAdapterCallbacksVisitor.h
rename to DDrawCompat/D3dDdi/Visitors/AdapterCallbacksVisitor.h
index 1f4d683..5f13fd0 100644
--- a/DDrawCompat/D3dDdiAdapterCallbacksVisitor.h
+++ b/DDrawCompat/D3dDdi/Visitors/AdapterCallbacksVisitor.h
@@ -7,7 +7,7 @@
 
 #include "Common/VtableVisitor.h"
 
-struct D3dDdiAdapterCallbacksIntf
+struct AdapterCallbacksIntf
 {
 	D3DDDI_ADAPTERCALLBACKS* lpVtbl;
 };
diff --git a/DDrawCompat/D3dDdiAdapterFuncsVisitor.h b/DDrawCompat/D3dDdi/Visitors/AdapterFuncsVisitor.h
similarity index 92%
rename from DDrawCompat/D3dDdiAdapterFuncsVisitor.h
rename to DDrawCompat/D3dDdi/Visitors/AdapterFuncsVisitor.h
index eecdac7..1548f8f 100644
--- a/DDrawCompat/D3dDdiAdapterFuncsVisitor.h
+++ b/DDrawCompat/D3dDdi/Visitors/AdapterFuncsVisitor.h
@@ -7,7 +7,7 @@
 
 #include "Common/VtableVisitor.h"
 
-struct D3dDdiAdapterFuncsIntf
+struct AdapterFuncsIntf
 {
 	D3DDDI_ADAPTERFUNCS* lpVtbl;
 };
diff --git a/DDrawCompat/D3dDdiDeviceCallbacksVisitor.h b/DDrawCompat/D3dDdi/Visitors/DeviceCallbacksVisitor.h
similarity index 98%
rename from DDrawCompat/D3dDdiDeviceCallbacksVisitor.h
rename to DDrawCompat/D3dDdi/Visitors/DeviceCallbacksVisitor.h
index a790a6d..a1c9467 100644
--- a/DDrawCompat/D3dDdiDeviceCallbacksVisitor.h
+++ b/DDrawCompat/D3dDdi/Visitors/DeviceCallbacksVisitor.h
@@ -8,7 +8,7 @@
 #include "Common/VtableVisitor.h"
 #include "D3dDdi/Hooks.h"
 
-struct D3dDdiDeviceCallbacksIntf
+struct DeviceCallbacksIntf
 {
 	D3DDDI_DEVICECALLBACKS* lpVtbl;
 };
diff --git a/DDrawCompat/D3dDdiDeviceFuncsVisitor.h b/DDrawCompat/D3dDdi/Visitors/DeviceFuncsVisitor.h
similarity index 99%
rename from DDrawCompat/D3dDdiDeviceFuncsVisitor.h
rename to DDrawCompat/D3dDdi/Visitors/DeviceFuncsVisitor.h
index afb38e9..d4377c7 100644
--- a/DDrawCompat/D3dDdiDeviceFuncsVisitor.h
+++ b/DDrawCompat/D3dDdi/Visitors/DeviceFuncsVisitor.h
@@ -8,7 +8,7 @@
 #include "Common/VtableVisitor.h"
 #include "D3dDdi/Hooks.h"
 
-struct D3dDdiDeviceFuncsIntf
+struct DeviceFuncsIntf
 {
 	D3DDDI_DEVICEFUNCS* lpVtbl;
 };
diff --git a/DDrawCompat/DDraw/DirectDraw.h b/DDrawCompat/DDraw/DirectDraw.h
index 07eb9e8..b1095bc 100644
--- a/DDrawCompat/DDraw/DirectDraw.h
+++ b/DDrawCompat/DDraw/DirectDraw.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Common/CompatVtable.h"
+#include "DDraw/Visitors/DirectDrawVtblVisitor.h"
 #include "DDraw/Types.h"
-#include "DirectDrawVtblVisitor.h"
 
 namespace DDraw
 {
diff --git a/DDrawCompat/DDraw/DirectDrawPalette.h b/DDrawCompat/DDraw/DirectDrawPalette.h
index 308af50..7d3d0a5 100644
--- a/DDrawCompat/DDraw/DirectDrawPalette.h
+++ b/DDrawCompat/DDraw/DirectDrawPalette.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Common/CompatVtable.h"
-#include "DirectDrawPaletteVtblVisitor.h"
+#include "DDraw/Visitors/DirectDrawPaletteVtblVisitor.h"
 
 namespace DDraw
 {
diff --git a/DDrawCompat/DDraw/DirectDrawSurface.h b/DDrawCompat/DDraw/DirectDrawSurface.h
index 53c02d2..9c6aa1a 100644
--- a/DDrawCompat/DDraw/DirectDrawSurface.h
+++ b/DDrawCompat/DDraw/DirectDrawSurface.h
@@ -2,8 +2,8 @@
 
 #include "Common/CompatRef.h"
 #include "Common/CompatVtable.h"
+#include "DDraw/Visitors/DirectDrawSurfaceVtblVisitor.h"
 #include "DDraw/Types.h"
-#include "DirectDrawSurfaceVtblVisitor.h"
 
 namespace DDraw
 {
diff --git a/DDrawCompat/DirectDrawPaletteVtblVisitor.h b/DDrawCompat/DDraw/Visitors/DirectDrawPaletteVtblVisitor.h
similarity index 100%
rename from DDrawCompat/DirectDrawPaletteVtblVisitor.h
rename to DDrawCompat/DDraw/Visitors/DirectDrawPaletteVtblVisitor.h
diff --git a/DDrawCompat/DirectDrawSurfaceVtblVisitor.h b/DDrawCompat/DDraw/Visitors/DirectDrawSurfaceVtblVisitor.h
similarity index 100%
rename from DDrawCompat/DirectDrawSurfaceVtblVisitor.h
rename to DDrawCompat/DDraw/Visitors/DirectDrawSurfaceVtblVisitor.h
diff --git a/DDrawCompat/DirectDrawVtblVisitor.h b/DDrawCompat/DDraw/Visitors/DirectDrawVtblVisitor.h
similarity index 100%
rename from DDrawCompat/DirectDrawVtblVisitor.h
rename to DDrawCompat/DDraw/Visitors/DirectDrawVtblVisitor.h
diff --git a/DDrawCompat/DDrawCompat.vcxproj b/DDrawCompat/DDrawCompat.vcxproj
index dd4f58d..ab61b86 100644
--- a/DDrawCompat/DDrawCompat.vcxproj
+++ b/DDrawCompat/DDrawCompat.vcxproj
@@ -163,15 +163,15 @@
     <ClInclude Include="CompatHooks.h" />
     <ClInclude Include="CompatRegistry.h" />
     <ClInclude Include="Config.h" />
-    <ClInclude Include="D3dDdiAdapterCallbacksVisitor.h" />
-    <ClInclude Include="D3dDdiAdapterFuncsVisitor.h" />
-    <ClInclude Include="D3dDdiDeviceCallbacksVisitor.h" />
-    <ClInclude Include="D3dDdiDeviceFuncsVisitor.h" />
     <ClInclude Include="D3dDdi\AdapterCallbacks.h" />
     <ClInclude Include="D3dDdi\AdapterFuncs.h" />
     <ClInclude Include="D3dDdi\DeviceCallbacks.h" />
     <ClInclude Include="D3dDdi\DeviceFuncs.h" />
     <ClInclude Include="D3dDdi\Hooks.h" />
+    <ClInclude Include="D3dDdi\Visitors\AdapterCallbacksVisitor.h" />
+    <ClInclude Include="D3dDdi\Visitors\AdapterFuncsVisitor.h" />
+    <ClInclude Include="D3dDdi\Visitors\DeviceCallbacksVisitor.h" />
+    <ClInclude Include="D3dDdi\Visitors\DeviceFuncsVisitor.h" />
     <ClInclude Include="DDrawProcs.h" />
     <ClInclude Include="DDraw\ActivateAppHandler.h" />
     <ClInclude Include="DDraw\DirectDraw.h" />
@@ -186,16 +186,16 @@
     <ClInclude Include="DDraw\Types.h" />
     <ClInclude Include="DDraw\IReleaseNotifier.h" />
     <ClInclude Include="DDraw\RealPrimarySurface.h" />
-    <ClInclude Include="Direct3dDeviceVtblVisitor.h" />
-    <ClInclude Include="Direct3dVtblVisitor.h" />
+    <ClInclude Include="DDraw\Visitors\DirectDrawPaletteVtblVisitor.h" />
+    <ClInclude Include="DDraw\Visitors\DirectDrawSurfaceVtblVisitor.h" />
+    <ClInclude Include="DDraw\Visitors\DirectDrawVtblVisitor.h" />
     <ClInclude Include="Direct3d\DepthBuffer.h" />
     <ClInclude Include="Direct3d\Direct3d.h" />
     <ClInclude Include="Direct3d\Direct3dDevice.h" />
     <ClInclude Include="Direct3d\Hooks.h" />
     <ClInclude Include="Direct3d\Types.h" />
-    <ClInclude Include="DirectDrawPaletteVtblVisitor.h" />
-    <ClInclude Include="DirectDrawSurfaceVtblVisitor.h" />
-    <ClInclude Include="DirectDrawVtblVisitor.h" />
+    <ClInclude Include="Direct3d\Visitors\Direct3dDeviceVtblVisitor.h" />
+    <ClInclude Include="Direct3d\Visitors\Direct3dVtblVisitor.h" />
     <ClInclude Include="Gdi\Gdi.h" />
     <ClInclude Include="Gdi\Caret.h" />
     <ClInclude Include="Gdi\Dc.h" />
diff --git a/DDrawCompat/DDrawCompat.vcxproj.filters b/DDrawCompat/DDrawCompat.vcxproj.filters
index e61f440..b658d93 100644
--- a/DDrawCompat/DDrawCompat.vcxproj.filters
+++ b/DDrawCompat/DDrawCompat.vcxproj.filters
@@ -43,20 +43,20 @@
     <Filter Include="Source Files\Common">
       <UniqueIdentifier>{012be7da-29a5-477e-90e8-8847222d87ce}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\D3dDdi\Visitors">
+      <UniqueIdentifier>{9c09a432-31fd-442b-8b3f-18291e6ed327}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\DDraw\Visitors">
+      <UniqueIdentifier>{e2fa8c38-27b4-4156-b77e-3f515addc312}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Direct3d\Visitors">
+      <UniqueIdentifier>{be1190e0-8e87-4751-86d0-ff327c46637f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="DDrawProcs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="DirectDrawSurfaceVtblVisitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirectDrawVtblVisitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DirectDrawPaletteVtblVisitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -69,24 +69,6 @@
     <ClInclude Include="CompatHooks.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Direct3dVtblVisitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Direct3dDeviceVtblVisitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="D3dDdiAdapterCallbacksVisitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="D3dDdiAdapterFuncsVisitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="D3dDdiDeviceCallbacksVisitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="D3dDdiDeviceFuncsVisitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Gdi\Gdi.h">
       <Filter>Header Files\Gdi</Filter>
     </ClInclude>
@@ -216,6 +198,33 @@
     <ClInclude Include="Common\VtableVisitor.h">
       <Filter>Header Files\Common</Filter>
     </ClInclude>
+    <ClInclude Include="D3dDdi\Visitors\AdapterCallbacksVisitor.h">
+      <Filter>Header Files\D3dDdi\Visitors</Filter>
+    </ClInclude>
+    <ClInclude Include="D3dDdi\Visitors\AdapterFuncsVisitor.h">
+      <Filter>Header Files\D3dDdi\Visitors</Filter>
+    </ClInclude>
+    <ClInclude Include="D3dDdi\Visitors\DeviceCallbacksVisitor.h">
+      <Filter>Header Files\D3dDdi\Visitors</Filter>
+    </ClInclude>
+    <ClInclude Include="D3dDdi\Visitors\DeviceFuncsVisitor.h">
+      <Filter>Header Files\D3dDdi\Visitors</Filter>
+    </ClInclude>
+    <ClInclude Include="DDraw\Visitors\DirectDrawPaletteVtblVisitor.h">
+      <Filter>Header Files\DDraw\Visitors</Filter>
+    </ClInclude>
+    <ClInclude Include="DDraw\Visitors\DirectDrawSurfaceVtblVisitor.h">
+      <Filter>Header Files\DDraw\Visitors</Filter>
+    </ClInclude>
+    <ClInclude Include="DDraw\Visitors\DirectDrawVtblVisitor.h">
+      <Filter>Header Files\DDraw\Visitors</Filter>
+    </ClInclude>
+    <ClInclude Include="Direct3d\Visitors\Direct3dDeviceVtblVisitor.h">
+      <Filter>Header Files\Direct3d\Visitors</Filter>
+    </ClInclude>
+    <ClInclude Include="Direct3d\Visitors\Direct3dVtblVisitor.h">
+      <Filter>Header Files\Direct3d\Visitors</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="DllMain.cpp">
diff --git a/DDrawCompat/Direct3d/Direct3d.h b/DDrawCompat/Direct3d/Direct3d.h
index a465e97..018f0e9 100644
--- a/DDrawCompat/Direct3d/Direct3d.h
+++ b/DDrawCompat/Direct3d/Direct3d.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Common/CompatVtable.h"
-#include "Direct3dVtblVisitor.h"
+#include "Direct3d/Visitors/Direct3dVtblVisitor.h"
 
 namespace Direct3d
 {
diff --git a/DDrawCompat/Direct3d/Direct3dDevice.h b/DDrawCompat/Direct3d/Direct3dDevice.h
index f62cba6..0350339 100644
--- a/DDrawCompat/Direct3d/Direct3dDevice.h
+++ b/DDrawCompat/Direct3d/Direct3dDevice.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Common/CompatVtable.h"
-#include "Direct3dDeviceVtblVisitor.h"
+#include "Direct3d/Visitors/Direct3dDeviceVtblVisitor.h"
 
 namespace Direct3d
 {
diff --git a/DDrawCompat/Direct3dDeviceVtblVisitor.h b/DDrawCompat/Direct3d/Visitors/Direct3dDeviceVtblVisitor.h
similarity index 100%
rename from DDrawCompat/Direct3dDeviceVtblVisitor.h
rename to DDrawCompat/Direct3d/Visitors/Direct3dDeviceVtblVisitor.h
diff --git a/DDrawCompat/Direct3dVtblVisitor.h b/DDrawCompat/Direct3d/Visitors/Direct3dVtblVisitor.h
similarity index 100%
rename from DDrawCompat/Direct3dVtblVisitor.h
rename to DDrawCompat/Direct3d/Visitors/Direct3dVtblVisitor.h