From de1633dab5b1f7251f3d89bbdcad879e90f23544 Mon Sep 17 00:00:00 2001
From: RadWolfie <RadWolfie@users.noreply.github.com>
Date: Sun, 2 Sep 2018 09:10:30 -0500
Subject: [PATCH] Move D3D8 and Direct3D9 files into its own folder

---
 build/win32/Cxbx.vcxproj                      | 64 +++++-----------
 build/win32/Cxbx.vcxproj.filters              | 74 +++++++++----------
 src/CxbxKrnl/EmuXTL.h                         | 14 ++--
 .../HLE/D3D8/Direct3D9/Direct3D9.cpp}         | 22 +++---
 .../Direct3D9/Direct3D9.cpp.unused-patches}   |  0
 .../HLE/D3D8/Direct3D9/Direct3D9.h}           | 12 +--
 .../HLE/D3D8/XbConvert.cpp}                   |  2 +-
 .../Convert.h => core/HLE/D3D8/XbConvert.h}   |  8 +-
 .../HLE/D3D8/XbD3D8Logging.cpp}               |  4 +-
 .../HLE/D3D8/XbD3D8Logging.h}                 |  6 +-
 .../HLE/D3D8/XbD3D8Types.h}                   |  6 +-
 .../HLE/D3D8/XbPixelShader.cpp}               |  2 +-
 .../HLE/D3D8/XbPixelShader.h}                 |  6 +-
 .../HLE/D3D8/XbPushBuffer.cpp}                |  4 +-
 .../HLE/D3D8/XbPushBuffer.h}                  |  8 +-
 .../State.cpp => core/HLE/D3D8/XbState.cpp}   |  2 +-
 .../State.h => core/HLE/D3D8/XbState.h}       |  8 +-
 .../HLE/D3D8/XbVertexBuffer.cpp}              |  2 +-
 .../HLE/D3D8/XbVertexBuffer.h}                |  6 +-
 .../HLE/D3D8/XbVertexShader.cpp}              |  4 +-
 .../HLE/D3D8/XbVertexShader.h}                |  6 +-
 21 files changed, 115 insertions(+), 145 deletions(-)
 rename src/{CxbxKrnl/EmuD3D8.cpp => core/HLE/D3D8/Direct3D9/Direct3D9.cpp} (97%)
 rename src/{CxbxKrnl/EmuD3D.cpp.unused-patches => core/HLE/D3D8/Direct3D9/Direct3D9.cpp.unused-patches} (100%)
 rename src/{CxbxKrnl/EmuD3D8.h => core/HLE/D3D8/Direct3D9/Direct3D9.h} (99%)
 rename src/{CxbxKrnl/EmuD3D8/Convert.cpp => core/HLE/D3D8/XbConvert.cpp} (99%)
 mode change 100755 => 100644
 rename src/{CxbxKrnl/EmuD3D8/Convert.h => core/HLE/D3D8/XbConvert.h} (99%)
 mode change 100755 => 100644
 rename src/{CxbxKrnl/EmuD3D8Logging.cpp => core/HLE/D3D8/XbD3D8Logging.cpp} (99%)
 rename src/{CxbxKrnl/EmuD3D8Logging.h => core/HLE/D3D8/XbD3D8Logging.h} (98%)
 rename src/{CxbxKrnl/EmuD3D8Types.h => core/HLE/D3D8/XbD3D8Types.h} (97%)
 mode change 100755 => 100644
 rename src/{CxbxKrnl/EmuD3D8/PixelShader.cpp => core/HLE/D3D8/XbPixelShader.cpp} (99%)
 rename src/{CxbxKrnl/EmuD3D8/PixelShader.h => core/HLE/D3D8/XbPixelShader.h} (95%)
 rename src/{CxbxKrnl/EmuD3D8/PushBuffer.cpp => core/HLE/D3D8/XbPushBuffer.cpp} (99%)
 rename src/{CxbxKrnl/EmuD3D8/PushBuffer.h => core/HLE/D3D8/XbPushBuffer.h} (94%)
 rename src/{CxbxKrnl/EmuD3D8/State.cpp => core/HLE/D3D8/XbState.cpp} (99%)
 rename src/{CxbxKrnl/EmuD3D8/State.h => core/HLE/D3D8/XbState.h} (95%)
 rename src/{CxbxKrnl/EmuD3D8/VertexBuffer.cpp => core/HLE/D3D8/XbVertexBuffer.cpp} (99%)
 mode change 100755 => 100644
 rename src/{CxbxKrnl/EmuD3D8/VertexBuffer.h => core/HLE/D3D8/XbVertexBuffer.h} (98%)
 mode change 100755 => 100644
 rename src/{CxbxKrnl/EmuD3D8/VertexShader.cpp => core/HLE/D3D8/XbVertexShader.cpp} (96%)
 rename src/{CxbxKrnl/EmuD3D8/VertexShader.h => core/HLE/D3D8/XbVertexShader.h} (97%)

diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj
index 99a28afdd..1ad605219 100644
--- a/build/win32/Cxbx.vcxproj
+++ b/build/win32/Cxbx.vcxproj
@@ -209,7 +209,7 @@
     <ClInclude Include="..\..\src\Common\XADPCM.h" />
     <ClInclude Include="..\..\src\Common\XbePrinter.h" />
     <ClInclude Include="..\..\src\CxbxKrnl\crc32c.h" />
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8Logging.h" />
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.h" />
     <ClInclude Include="..\..\src\Common\EmuEEPROM.h" />
     <ClInclude Include="..\..\src\Common\Logging.h" />
     <ClInclude Include="..\..\src\Common\Win32\AlignPosfix1.h" />
@@ -219,14 +219,14 @@
     <ClInclude Include="..\..\src\Cxbx.h" />
     <ClInclude Include="..\..\src\CxbxKrnl\CxbxKrnl.h" />
     <ClInclude Include="..\..\src\CxbxKrnl\DbgConsole.h" />
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8.h" />
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8Types.h" />
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\Convert.h" />
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\PixelShader.h" />
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\PushBuffer.h" />
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\State.h" />
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.h" />
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.h" />
+    <ClInclude Include="..\..\src\core\HLE\D3D8\Direct3D9\Direct3D9.h" />
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Types.h" />
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbConvert.h" />
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbPixelShader.h" />
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbPushBuffer.h" />
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbState.h" />
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbVertexBuffer.h" />
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbVertexShader.h" />
     <ClInclude Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.h" />
     <ClInclude Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSound.hpp" />
     <ClInclude Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSoundInline.hpp" />
@@ -352,7 +352,7 @@
     <ClCompile Include="..\..\src\Common\Win32\XBPortMapping.cpp" />
     <ClCompile Include="..\..\src\Common\XbePrinter.cpp" />
     <ClCompile Include="..\..\src\CxbxKrnl\crc32c.cpp" />
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8Logging.cpp" />
+    <ClCompile Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.cpp" />
     <ClCompile Include="..\..\src\Common\EmuEEPROM.cpp" />
     <ClCompile Include="..\..\src\Common\Logging.cpp" />
     <ClCompile Include="..\..\src\Common\Win32\EmuShared.cpp">
@@ -382,43 +382,13 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\Convert.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\PixelShader.cpp" />
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\PushBuffer.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\State.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
+    <ClCompile Include="..\..\src\core\HLE\D3D8\Direct3D9\Direct3D9.cpp" />
+    <ClCompile Include="..\..\src\core\HLE\D3D8\XbConvert.cpp" />
+    <ClCompile Include="..\..\src\core\HLE\D3D8\XbPixelShader.cpp" />
+    <ClCompile Include="..\..\src\core\HLE\D3D8\XbPushBuffer.cpp" />
+    <ClCompile Include="..\..\src\core\HLE\D3D8\XbState.cpp" />
+    <ClCompile Include="..\..\src\core\HLE\D3D8\XbVertexBuffer.cpp" />
+    <ClCompile Include="..\..\src\core\HLE\D3D8\XbVertexShader.cpp" />
     <ClCompile Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.cpp" />
     <ClCompile Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSound.cpp" />
     <ClCompile Include="..\..\src\CxbxKrnl\EmuFile.cpp">
diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters
index 4f84615ac..99e3a8c4a 100644
--- a/build/win32/Cxbx.vcxproj.filters
+++ b/build/win32/Cxbx.vcxproj.filters
@@ -16,23 +16,23 @@
     <ClCompile Include="..\..\src\Cxbx\WndMain.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\Convert.cpp">
-      <Filter>EmuD3D8</Filter>
+    <ClCompile Include="..\..\src\core\HLE\D3D8\XbConvert.cpp">
+      <Filter>core\HLE\D3D8</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\PixelShader.cpp">
-      <Filter>EmuD3D8</Filter>
+    <ClCompile Include="..\..\src\core\HLE\D3D8\XbPixelShader.cpp">
+      <Filter>core\HLE\D3D8</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\PushBuffer.cpp">
-      <Filter>EmuD3D8</Filter>
+    <ClCompile Include="..\..\src\core\HLE\D3D8\XbPushBuffer.cpp">
+      <Filter>core\HLE\D3D8</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\State.cpp">
-      <Filter>EmuD3D8</Filter>
+    <ClCompile Include="..\..\src\core\HLE\D3D8\XbState.cpp">
+      <Filter>core\HLE\D3D8</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.cpp">
-      <Filter>EmuD3D8</Filter>
+    <ClCompile Include="..\..\src\core\HLE\D3D8\XbVertexBuffer.cpp">
+      <Filter>core\HLE\D3D8</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.cpp">
-      <Filter>EmuD3D8</Filter>
+    <ClCompile Include="..\..\src\core\HLE\D3D8\XbVertexShader.cpp">
+      <Filter>core\HLE\D3D8</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\CxbxKrnl\EmuKrnl.cpp">
       <Filter>Kernel</Filter>
@@ -106,8 +106,8 @@
     <ClCompile Include="..\..\src\CxbxKrnl\Emu.cpp">
       <Filter>Emulator</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8.cpp">
-      <Filter>Emulator</Filter>
+    <ClCompile Include="..\..\src\core\HLE\D3D8\Direct3D9\Direct3D9.cpp">
+      <Filter>core\HLE\D3D8\Direct3D9</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.cpp">
       <Filter>core\HLE\XAPI\OHCI\XInput</Filter>
@@ -172,8 +172,8 @@
     <ClCompile Include="..\..\src\Cxbx\DlgAbout.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8Logging.cpp">
-      <Filter>Emulator</Filter>
+    <ClCompile Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.cpp">
+      <Filter>core\HLE\D3D8</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\Cxbx\DlgAudioConfig.cpp">
       <Filter>GUI</Filter>
@@ -332,23 +332,23 @@
     <ClInclude Include="..\..\src\Cxbx\Wnd.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\Convert.h">
-      <Filter>EmuD3D8</Filter>
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbConvert.h">
+      <Filter>core\HLE\D3D8</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\PixelShader.h">
-      <Filter>EmuD3D8</Filter>
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbPixelShader.h">
+      <Filter>core\HLE\D3D8</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\PushBuffer.h">
-      <Filter>EmuD3D8</Filter>
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbPushBuffer.h">
+      <Filter>core\HLE\D3D8</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\State.h">
-      <Filter>EmuD3D8</Filter>
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbState.h">
+      <Filter>core\HLE\D3D8</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.h">
-      <Filter>EmuD3D8</Filter>
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbVertexBuffer.h">
+      <Filter>core\HLE\D3D8</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.h">
-      <Filter>EmuD3D8</Filter>
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbVertexShader.h">
+      <Filter>core\HLE\D3D8</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\CxbxKrnl\EmuKrnlLogging.h">
       <Filter>Kernel</Filter>
@@ -380,11 +380,11 @@
     <ClInclude Include="..\..\src\CxbxKrnl\DbgConsole.h">
       <Filter>Emulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8.h">
-      <Filter>Emulator</Filter>
+    <ClInclude Include="..\..\src\core\HLE\D3D8\Direct3D9\Direct3D9.h">
+      <Filter>core\HLE\D3D8\Direct3D9</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8Types.h">
-      <Filter>Emulator</Filter>
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Types.h">
+      <Filter>core\HLE\D3D8</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.h">
       <Filter>core\HLE\XAPI\OHCI\XInput</Filter>
@@ -458,8 +458,8 @@
     <ClInclude Include="..\..\src\Cxbx\DlgAbout.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8Logging.h">
-      <Filter>Emulator</Filter>
+    <ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.h">
+      <Filter>core\HLE\D3D8</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\Common\XADPCM.h">
       <Filter>Shared</Filter>
@@ -717,9 +717,6 @@
     <Filter Include="GUI">
       <UniqueIdentifier>{445ff8dc-8414-41ad-8681-01243121d574}</UniqueIdentifier>
     </Filter>
-    <Filter Include="EmuD3D8">
-      <UniqueIdentifier>{4ee1fc9a-ee21-4764-b96f-1caf41881bab}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Kernel">
       <UniqueIdentifier>{0187aa1f-d227-4dd5-b9ae-a336795923c7}</UniqueIdentifier>
     </Filter>
@@ -798,6 +795,9 @@
     <Filter Include="core\HLE\D3D8">
       <UniqueIdentifier>{6f39b9de-ab9d-4780-b687-2d930f86738e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="core\HLE\D3D8\Direct3D9">
+      <UniqueIdentifier>{c56dc02e-4531-4cd2-aac2-a3c97eec11c1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\resource\Cxbx.rc">
diff --git a/src/CxbxKrnl/EmuXTL.h b/src/CxbxKrnl/EmuXTL.h
index 19a79ddfc..70de97b84 100644
--- a/src/CxbxKrnl/EmuXTL.h
+++ b/src/CxbxKrnl/EmuXTL.h
@@ -39,13 +39,13 @@
 namespace XTL
 {
     #include "core/HLE/XAPI/Xapi.h"
-    #include "EmuD3D8.h"
-    #include "EmuD3D8\Convert.h"
-    #include "EmuD3D8\VertexBuffer.h"
-    #include "EmuD3D8\PushBuffer.h"
-    #include "EmuD3D8\VertexShader.h"
-	#include "EmuD3D8\PixelShader.h"
-    #include "EmuD3D8\State.h"
+    #include "core/HLE/D3D8/Direct3D9/Direct3D9.h"
+    #include "core/HLE/D3D8/XbConvert.h"
+    #include "core/HLE/D3D8/XbVertexBuffer.h"
+    #include "core/HLE/D3D8/XbPushBuffer.h"
+    #include "core/HLE/D3D8/XbVertexShader.h"
+	#include "core/HLE/D3D8/XbPixelShader.h"
+    #include "core/HLE/D3D8/XbState.h"
     #include "core/HLE/XAPI/OHCI/XInput/DInput.h"
     #include "core/HLE/DSOUND/DirectSound/DirectSound.hpp"
     #include "core/HLE/XONLINE/XOnline.h"
diff --git a/src/CxbxKrnl/EmuD3D8.cpp b/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp
similarity index 97%
rename from src/CxbxKrnl/EmuD3D8.cpp
rename to src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp
index 83a20d9a3..e98ba61a3 100644
--- a/src/CxbxKrnl/EmuD3D8.cpp
+++ b/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp
@@ -9,7 +9,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->EmuD3D8.cpp
+// *   core->HLE->D3D8->Direct3D9->Direct3D9.cpp
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -36,7 +36,7 @@
 #define _XBOXKRNL_DEFEXTRN_
 #define LOG_PREFIX CXBXR_MODULE::D3D8
 
-#include "xxhash32.h"
+#include "CxbxKrnl/xxhash32.h"
 #include <condition_variable>
 
 // prevent name collisions
@@ -47,16 +47,16 @@ namespace xboxkrnl
 
 #include "CxbxUtil.h"
 #include "CxbxVersion.h"
-#include "CxbxKrnl.h"
-#include "Emu.h"
-#include "EmuFS.h"
-#include "EmuShared.h"
-#include "DbgConsole.h"
-#include "ResourceTracker.h"
-#include "VMManager.h" // for g_VMManager
-#include "EmuXTL.h"
+#include "CxbxKrnl/CxbxKrnl.h"
+#include "CxbxKrnl/Emu.h"
+#include "CxbxKrnl/EmuFS.h"
+#include "CxbxKrnl/EmuShared.h"
+#include "CxbxKrnl/DbgConsole.h"
+#include "CxbxKrnl/ResourceTracker.h"
+#include "CxbxKrnl/VMManager.h" // for g_VMManager
+#include "CxbxKrnl/EmuXTL.h"
 #include "Logging.h"
-#include "EmuD3D8Logging.h"
+#include "../XbD3D8Logging.h"
 #include "core/HLE/Intercept.hpp" // for bLLE_GPU
 #include "Cxbx/ResCxbx.h"
 
diff --git a/src/CxbxKrnl/EmuD3D.cpp.unused-patches b/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp.unused-patches
similarity index 100%
rename from src/CxbxKrnl/EmuD3D.cpp.unused-patches
rename to src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp.unused-patches
diff --git a/src/CxbxKrnl/EmuD3D8.h b/src/core/HLE/D3D8/Direct3D9/Direct3D9.h
similarity index 99%
rename from src/CxbxKrnl/EmuD3D8.h
rename to src/core/HLE/D3D8/Direct3D9/Direct3D9.h
index 952c43098..d6b5f03ec 100644
--- a/src/CxbxKrnl/EmuD3D8.h
+++ b/src/core/HLE/D3D8/Direct3D9/Direct3D9.h
@@ -7,7 +7,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->EmuD3D8.h
+// *   core->HLE->D3D8->Direct3D9->Direct3D9.h
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -31,13 +31,13 @@
 // *  All rights reserved
 // *
 // ******************************************************************
-#ifndef EMUD3D8_H
-#define EMUD3D8_H
+#ifndef DIRECT3D9_H
+#define DIRECT3D9_H
 
-#include "EmuD3D8Types.h"
-#include "CxbxKrnl.h"
+#include "../XbD3D8Types.h"
+#include "CxbxKrnl/CxbxKrnl.h"
 #include "Common/Xbe.h"
-#include "Emu.h"
+#include "CxbxKrnl/Emu.h"
 
 #define DIRECTDRAW_VERSION 0x0700
 #include <ddraw.h>
diff --git a/src/CxbxKrnl/EmuD3D8/Convert.cpp b/src/core/HLE/D3D8/XbConvert.cpp
old mode 100755
new mode 100644
similarity index 99%
rename from src/CxbxKrnl/EmuD3D8/Convert.cpp
rename to src/core/HLE/D3D8/XbConvert.cpp
index cc701a14f..8ebd8b36f
--- a/src/CxbxKrnl/EmuD3D8/Convert.cpp
+++ b/src/core/HLE/D3D8/XbConvert.cpp
@@ -38,7 +38,7 @@
 
 #include "CxbxKrnl/Emu.h"
 #include "CxbxKrnl/EmuXTL.h"
-#include "Convert.h"
+#include "XbConvert.h"
 
 // About format color components:
 // A = alpha, byte : 0 = fully opaque, 255 = fully transparent
diff --git a/src/CxbxKrnl/EmuD3D8/Convert.h b/src/core/HLE/D3D8/XbConvert.h
old mode 100755
new mode 100644
similarity index 99%
rename from src/CxbxKrnl/EmuD3D8/Convert.h
rename to src/core/HLE/D3D8/XbConvert.h
index 36b26f306..21cf32530
--- a/src/CxbxKrnl/EmuD3D8/Convert.h
+++ b/src/core/HLE/D3D8/XbConvert.h
@@ -7,7 +7,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->EmuD3D8->Convert.h
+// *   core->HLE->D3D8->XbConvert.h
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -31,10 +31,10 @@
 // *  All rights reserved
 // *
 // ******************************************************************
-#ifndef CONVERT_H
-#define CONVERT_H
+#ifndef XBCONVERT_H
+#define XBCONVERT_H
 
-#include "CxbxKrnl.h"
+#include "CxbxKrnl/CxbxKrnl.h"
 
 #define VERTICES_PER_TRIANGLE 3
 #define VERTICES_PER_QUAD 4
diff --git a/src/CxbxKrnl/EmuD3D8Logging.cpp b/src/core/HLE/D3D8/XbD3D8Logging.cpp
similarity index 99%
rename from src/CxbxKrnl/EmuD3D8Logging.cpp
rename to src/core/HLE/D3D8/XbD3D8Logging.cpp
index 7e6761ed4..d4ce826e7 100644
--- a/src/CxbxKrnl/EmuD3D8Logging.cpp
+++ b/src/core/HLE/D3D8/XbD3D8Logging.cpp
@@ -9,7 +9,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->EmuD3D8Logging.cpp
+// *   core->HLE->D3D8->XbD3D8Logging.cpp
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -36,7 +36,7 @@
 #define _XBOXKRNL_DEFEXTRN_
 
 #include "Logging.h"
-#include "EmuD3D8Logging.h"
+#include "XbD3D8Logging.h"
 
 // prevent name collisions
 namespace XTL
diff --git a/src/CxbxKrnl/EmuD3D8Logging.h b/src/core/HLE/D3D8/XbD3D8Logging.h
similarity index 98%
rename from src/CxbxKrnl/EmuD3D8Logging.h
rename to src/core/HLE/D3D8/XbD3D8Logging.h
index 8ef7158d7..9bcc8eac3 100644
--- a/src/CxbxKrnl/EmuD3D8Logging.h
+++ b/src/core/HLE/D3D8/XbD3D8Logging.h
@@ -7,7 +7,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->EmuD3D8Logging.h
+// *   core->HLE->D3D8->XbD3D8Logging.h
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -42,7 +42,7 @@
 
 namespace XTL
 {
-#include "EmuD3D8Types.h"
+#include "XbD3D8Types.h"
 
 // Additional types, exclusively for logging (not really enums) :
 enum D3DVS20CAPS;
@@ -159,4 +159,4 @@ LOGRENDER_HEADER(X_D3DPixelContainer)
 
 }; // end of namespace XTL
 
-#endif _EMU_D3D8_LOGGING_H
\ No newline at end of file
+#endif _EMU_D3D8_LOGGING_H
diff --git a/src/CxbxKrnl/EmuD3D8Types.h b/src/core/HLE/D3D8/XbD3D8Types.h
old mode 100755
new mode 100644
similarity index 97%
rename from src/CxbxKrnl/EmuD3D8Types.h
rename to src/core/HLE/D3D8/XbD3D8Types.h
index 5e68a7490..791e098de
--- a/src/CxbxKrnl/EmuD3D8Types.h
+++ b/src/core/HLE/D3D8/XbD3D8Types.h
@@ -7,7 +7,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->EmuD3D8Types.h
+// *   core->HLE->D3D8->XbD3D8Types.h
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -31,8 +31,8 @@
 // *  All rights reserved
 // *
 // ******************************************************************
-#ifndef EMUD3D8TYPES_H
-#define EMUD3D8TYPES_H
+#ifndef XBD3D8TYPES_H
+#define XBD3D8TYPES_H
 
 #undef UNICODE // make sure dxerr.h DXGetErrorString is aliassed to *A, not *W
 
diff --git a/src/CxbxKrnl/EmuD3D8/PixelShader.cpp b/src/core/HLE/D3D8/XbPixelShader.cpp
similarity index 99%
rename from src/CxbxKrnl/EmuD3D8/PixelShader.cpp
rename to src/core/HLE/D3D8/XbPixelShader.cpp
index eb23a3002..ab45ac795 100644
--- a/src/CxbxKrnl/EmuD3D8/PixelShader.cpp
+++ b/src/core/HLE/D3D8/XbPixelShader.cpp
@@ -9,7 +9,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,  
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->PixelShader.cpp
+// *   core->HLE->D3D8->XbPixelShader.cpp
 // *
 // *  This file is part of the Cxbx project.
 // *
diff --git a/src/CxbxKrnl/EmuD3D8/PixelShader.h b/src/core/HLE/D3D8/XbPixelShader.h
similarity index 95%
rename from src/CxbxKrnl/EmuD3D8/PixelShader.h
rename to src/core/HLE/D3D8/XbPixelShader.h
index a54def255..ce001c625 100644
--- a/src/CxbxKrnl/EmuD3D8/PixelShader.h
+++ b/src/core/HLE/D3D8/XbPixelShader.h
@@ -7,7 +7,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,  
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->EmuD3D8->PixelShader.h
+// *   core->HLE->D3D8->XbPixelShader.h
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -31,8 +31,8 @@
 // *  All rights reserved
 // *
 // ******************************************************************
-#ifndef PIXELSHADER_H
-#define PIXELSHADER_H
+#ifndef XBPIXELSHADER_H
+#define XBPIXELSHADER_H
 
 #pragma once
 
diff --git a/src/CxbxKrnl/EmuD3D8/PushBuffer.cpp b/src/core/HLE/D3D8/XbPushBuffer.cpp
similarity index 99%
rename from src/CxbxKrnl/EmuD3D8/PushBuffer.cpp
rename to src/core/HLE/D3D8/XbPushBuffer.cpp
index e93b5231a..5318f0884 100644
--- a/src/CxbxKrnl/EmuD3D8/PushBuffer.cpp
+++ b/src/core/HLE/D3D8/XbPushBuffer.cpp
@@ -9,7 +9,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->EmuD3D->PushBuffer.cpp
+// *   core->HLE->D3D8->XbPushBuffer.cpp
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -41,7 +41,7 @@
 
 #include "CxbxKrnl/Emu.h"
 #include "CxbxKrnl/EmuXTL.h"
-#include "CxbxKrnl/EmuD3D8Types.h" // For X_D3DFORMAT
+#include "XbD3D8Types.h" // For X_D3DFORMAT
 #include "CxbxKrnl/ResourceTracker.h"
 #include "devices/video/nv2a.h" // For PGRAPHState
 #include "devices/video/nv2a_int.h" // For NV** defines
diff --git a/src/CxbxKrnl/EmuD3D8/PushBuffer.h b/src/core/HLE/D3D8/XbPushBuffer.h
similarity index 94%
rename from src/CxbxKrnl/EmuD3D8/PushBuffer.h
rename to src/core/HLE/D3D8/XbPushBuffer.h
index 367d261c3..519a012c9 100644
--- a/src/CxbxKrnl/EmuD3D8/PushBuffer.h
+++ b/src/core/HLE/D3D8/XbPushBuffer.h
@@ -7,7 +7,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->EmuD3D8->PushBuffer.h
+// *   core->HLE->D3D8->XbPushBuffer.h
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -31,8 +31,8 @@
 // *  All rights reserved
 // *
 // ******************************************************************
-#ifndef PUSHBUFFER_H
-#define PUSHBUFFER_H
+#ifndef XBPUSHBUFFER_H
+#define XBPUSHBUFFER_H
 
 extern int DxbxFVF_GetNumberOfTextureCoordinates(DWORD dwFVF, int aTextureIndex);
 extern UINT DxbxFVFToVertexSizeInBytes(DWORD dwFVF, BOOL bIncludeTextures);
@@ -52,4 +52,4 @@ extern void EmuExecutePushBufferRaw
 	uint32_t uSizeInBytes
 );
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CxbxKrnl/EmuD3D8/State.cpp b/src/core/HLE/D3D8/XbState.cpp
similarity index 99%
rename from src/CxbxKrnl/EmuD3D8/State.cpp
rename to src/core/HLE/D3D8/XbState.cpp
index f5e307225..4f3dbcd9e 100644
--- a/src/CxbxKrnl/EmuD3D8/State.cpp
+++ b/src/core/HLE/D3D8/XbState.cpp
@@ -9,7 +9,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->EmuD3D->State.cpp
+// *   core->HLE->D3D8->XbState.cpp
 // *
 // *  This file is part of the Cxbx project.
 // *
diff --git a/src/CxbxKrnl/EmuD3D8/State.h b/src/core/HLE/D3D8/XbState.h
similarity index 95%
rename from src/CxbxKrnl/EmuD3D8/State.h
rename to src/core/HLE/D3D8/XbState.h
index 159f6e294..68560ad8b 100644
--- a/src/CxbxKrnl/EmuD3D8/State.h
+++ b/src/core/HLE/D3D8/XbState.h
@@ -7,7 +7,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->EmuD3D8->State.h
+// *   core->HLE->D3D8->XbD3D8->State.h
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -31,8 +31,8 @@
 // *  All rights reserved
 // *
 // ******************************************************************
-#ifndef STATE_H
-#define STATE_H
+#ifndef XBSTATE_H
+#define XBSTATE_H
 
 #define X_D3DRS_UNSUPPORTED (X_D3DRS_LAST + 1)
 
@@ -55,4 +55,4 @@ extern void EmuUpdateDeferredStates();
 
 extern void CxbxUpdateNativeD3DResources();
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp b/src/core/HLE/D3D8/XbVertexBuffer.cpp
old mode 100755
new mode 100644
similarity index 99%
rename from src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp
rename to src/core/HLE/D3D8/XbVertexBuffer.cpp
index df4f4efb6..8038a9c16
--- a/src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp
+++ b/src/core/HLE/D3D8/XbVertexBuffer.cpp
@@ -9,7 +9,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->EmuD3D8->VertexBuffer.cpp
+// *   core->HLE->D3D8->XbVertexBuffer.cpp
 // *
 // *  This file is part of the Cxbx project.
 // *
diff --git a/src/CxbxKrnl/EmuD3D8/VertexBuffer.h b/src/core/HLE/D3D8/XbVertexBuffer.h
old mode 100755
new mode 100644
similarity index 98%
rename from src/CxbxKrnl/EmuD3D8/VertexBuffer.h
rename to src/core/HLE/D3D8/XbVertexBuffer.h
index c0ab737bf..b159a388d
--- a/src/CxbxKrnl/EmuD3D8/VertexBuffer.h
+++ b/src/core/HLE/D3D8/XbVertexBuffer.h
@@ -7,7 +7,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->EmuD3D8->VertexBuffer.h
+// *   core->HLE->D3D8->XbVertexBuffer.h
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -31,8 +31,8 @@
 // *  All rights reserved
 // *
 // ******************************************************************
-#ifndef VERTEXBUFFER_H
-#define VERTEXBUFFER_H
+#ifndef XBVERTEXBUFFER_H
+#define XBVERTEXBUFFER_H
 
 #include "Cxbx.h"
 //#include <ctime> // Conflict with io.h
diff --git a/src/CxbxKrnl/EmuD3D8/VertexShader.cpp b/src/core/HLE/D3D8/XbVertexShader.cpp
similarity index 96%
rename from src/CxbxKrnl/EmuD3D8/VertexShader.cpp
rename to src/core/HLE/D3D8/XbVertexShader.cpp
index 7c875d7bb..70905b039 100644
--- a/src/CxbxKrnl/EmuD3D8/VertexShader.cpp
+++ b/src/core/HLE/D3D8/XbVertexShader.cpp
@@ -9,7 +9,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->EmuD3D8->VertexShader.cpp
+// *   core->HLE->D3D8->XbVertexShader.cpp
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -43,7 +43,7 @@
 #include "CxbxKrnl/Emu.h"
 #include "CxbxKrnl/EmuFS.h"
 #include "CxbxKrnl/EmuXTL.h"
-#include "CxbxKrnl/EmuD3D8Types.h" // For X_D3DVSDE_*
+#include "XbD3D8Types.h" // For X_D3DVSDE_*
 #include <sstream>
 #include <unordered_map>
 #include <array>
diff --git a/src/CxbxKrnl/EmuD3D8/VertexShader.h b/src/core/HLE/D3D8/XbVertexShader.h
similarity index 97%
rename from src/CxbxKrnl/EmuD3D8/VertexShader.h
rename to src/core/HLE/D3D8/XbVertexShader.h
index 6a446a278..adf4f70dd 100644
--- a/src/CxbxKrnl/EmuD3D8/VertexShader.h
+++ b/src/core/HLE/D3D8/XbVertexShader.h
@@ -7,7 +7,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->EmuD3D8->VertexShader.h
+// *   core->HLE->D3D8->XbVertexShader.h
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -31,8 +31,8 @@
 // *  All rights reserved
 // *
 // ******************************************************************
-#ifndef VERTEXSHADER_H
-#define VERTEXSHADER_H
+#ifndef XBVERTEXSHADER_H
+#define XBVERTEXSHADER_H
 
 #include "Cxbx.h"