diff --git a/fellow/SRC/WinFellow.Core/DebugApi/DebugVM.cpp b/fellow/SRC/WinFellow.Core/DebugApi/DebugVM.cpp
index 6c578915..515255b5 100644
--- a/fellow/SRC/WinFellow.Core/DebugApi/DebugVM.cpp
+++ b/fellow/SRC/WinFellow.Core/DebugApi/DebugVM.cpp
@@ -1,6 +1,6 @@
-#include "Debug/DebugVM.h"
-#include "Debug/M68K.h"
-#include "Debug/MemorySystem.h"
+#include "DebugApi/DebugVM.h"
+#include "DebugApi/M68K.h"
+#include "DebugApi/MemorySystem.h"
 
 namespace Debug
 {
diff --git a/fellow/SRC/WinFellow.Core/DebugApi/DebugVM.h b/fellow/SRC/WinFellow.Core/DebugApi/DebugVM.h
index 75241b20..1ea6a4aa 100644
--- a/fellow/SRC/WinFellow.Core/DebugApi/DebugVM.h
+++ b/fellow/SRC/WinFellow.Core/DebugApi/DebugVM.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Debug/IM68K.h"
-#include "Debug/IMemorySystem.h"
+#include "DebugApi/IM68K.h"
+#include "DebugApi/IMemorySystem.h"
 
 namespace Debug
 {
diff --git a/fellow/SRC/WinFellow.Core/DebugApi/M68K.h b/fellow/SRC/WinFellow.Core/DebugApi/M68K.h
index a8eb76ef..95b03ac4 100644
--- a/fellow/SRC/WinFellow.Core/DebugApi/M68K.h
+++ b/fellow/SRC/WinFellow.Core/DebugApi/M68K.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Debug/IM68K.h"
+#include "DebugApi/IM68K.h"
 
 namespace Debug
 {
diff --git a/fellow/SRC/WinFellow.Core/DebugApi/MemorySystem.h b/fellow/SRC/WinFellow.Core/DebugApi/MemorySystem.h
index bbb0516f..a6f7baaa 100644
--- a/fellow/SRC/WinFellow.Core/DebugApi/MemorySystem.h
+++ b/fellow/SRC/WinFellow.Core/DebugApi/MemorySystem.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Debug/IMemorySystem.h"
+#include "DebugApi/IMemorySystem.h"
 
 namespace Debug
 {
diff --git a/fellow/SRC/WinFellow.Core/VirtualHost/Core.h b/fellow/SRC/WinFellow.Core/VirtualHost/Core.h
index 4c2c4db3..a95d2e0d 100644
--- a/fellow/SRC/WinFellow.Core/VirtualHost/Core.h
+++ b/fellow/SRC/WinFellow.Core/VirtualHost/Core.h
@@ -12,7 +12,7 @@
 #include "CustomChipset/RegisterUtility.h"
 #include "IO/Uart.h"
 #include "IO/RtcOkiMsm6242rs.h"
-#include "Debug/DebugVM.h"
+#include "DebugApi/DebugVM.h"
 
 class Core
 {
diff --git a/fellow/SRC/WinFellow.Core/WinFellow.Core.vcxproj b/fellow/SRC/WinFellow.Core/WinFellow.Core.vcxproj
index 4cc75dd4..62793fd6 100644
--- a/fellow/SRC/WinFellow.Core/WinFellow.Core.vcxproj
+++ b/fellow/SRC/WinFellow.Core/WinFellow.Core.vcxproj
@@ -32,11 +32,11 @@
     <ClInclude Include="CustomChipset\Sound\Sound.h" />
     <ClInclude Include="CustomChipset\Sound\SoundConfiguration.h" />
     <ClInclude Include="CustomChipset\Sound\WavFileWriter.h" />
-    <ClInclude Include="Debug\IM68K.h" />
-    <ClInclude Include="Debug\IMemorySystem.h" />
-    <ClInclude Include="Debug\M68K.h" />
-    <ClInclude Include="Debug\MemorySystem.h" />
-    <ClInclude Include="Debug\DebugVM.h" />
+    <ClInclude Include="DebugApi\DebugVM.h" />
+    <ClInclude Include="DebugApi\IM68K.h" />
+    <ClInclude Include="DebugApi\IMemorySystem.h" />
+    <ClInclude Include="DebugApi\M68K.h" />
+    <ClInclude Include="DebugApi\MemorySystem.h" />
     <ClInclude Include="Defs.h" />
     <ClInclude Include="Driver\Drivers.h" />
     <ClInclude Include="Driver\ISoundDriver.h" />
@@ -62,7 +62,7 @@
   <ItemGroup>
     <ClCompile Include="CustomChipset\Registers.cpp" />
     <ClCompile Include="CustomChipset\RegisterUtility.cpp" />
-    <ClCompile Include="Debug\DebugVM.cpp" />
+    <ClCompile Include="DebugApi\DebugVM.cpp" />
     <ClCompile Include="IO\RtcOkiMsm6242rs.cpp" />
     <ClCompile Include="Module\Hardfile\HardfileConfiguration.cpp" />
     <ClCompile Include="Module\Hardfile\HardfileGeometry.cpp" />
diff --git a/fellow/SRC/WinFellow.Core/WinFellow.Core.vcxproj.filters b/fellow/SRC/WinFellow.Core/WinFellow.Core.vcxproj.filters
index 22ca43a3..379867c3 100644
--- a/fellow/SRC/WinFellow.Core/WinFellow.Core.vcxproj.filters
+++ b/fellow/SRC/WinFellow.Core/WinFellow.Core.vcxproj.filters
@@ -31,7 +31,7 @@
     <Filter Include="Module\Hardfile">
       <UniqueIdentifier>{32917180-f62e-4787-b4fc-e1387ca91014}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Debug">
+    <Filter Include="DebugApi">
       <UniqueIdentifier>{82fb5aee-8c48-4c42-8bdd-d9dc76624636}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -110,20 +110,20 @@
     <ClInclude Include="Service\IRetroPlatform.h">
       <Filter>Service</Filter>
     </ClInclude>
-    <ClInclude Include="Debug\IM68K.h">
-      <Filter>Debug</Filter>
+    <ClInclude Include="DebugApi\DebugVM.h">
+      <Filter>DebugApi</Filter>
     </ClInclude>
-    <ClInclude Include="Debug\IMemorySystem.h">
-      <Filter>Debug</Filter>
+    <ClInclude Include="DebugApi\IM68K.h">
+      <Filter>DebugApi</Filter>
     </ClInclude>
-    <ClInclude Include="Debug\M68K.h">
-      <Filter>Debug</Filter>
+    <ClInclude Include="DebugApi\IMemorySystem.h">
+      <Filter>DebugApi</Filter>
     </ClInclude>
-    <ClInclude Include="Debug\MemorySystem.h">
-      <Filter>Debug</Filter>
+    <ClInclude Include="DebugApi\M68K.h">
+      <Filter>DebugApi</Filter>
     </ClInclude>
-    <ClInclude Include="Debug\DebugVM.h">
-      <Filter>Debug</Filter>
+    <ClInclude Include="DebugApi\MemorySystem.h">
+      <Filter>DebugApi</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -154,8 +154,8 @@
     <ClCompile Include="Module\Hardfile\HardfileConfiguration.cpp">
       <Filter>Module\Hardfile</Filter>
     </ClCompile>
-    <ClCompile Include="Debug\DebugVM.cpp">
-      <Filter>Debug</Filter>
+    <ClCompile Include="DebugApi\DebugVM.cpp">
+      <Filter>DebugApi</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/fellow/SRC/WinFellow.Hardfile/hardfile/HardfileHandler.h b/fellow/SRC/WinFellow.Hardfile/hardfile/HardfileHandler.h
index ca53eb96..3d2711fd 100644
--- a/fellow/SRC/WinFellow.Hardfile/hardfile/HardfileHandler.h
+++ b/fellow/SRC/WinFellow.Hardfile/hardfile/HardfileHandler.h
@@ -3,8 +3,8 @@
 #include <string>
 #include <vector>
 #include "Module/Hardfile/IHardfileHandler.h"
-#include "Debug/IMemorySystem.h"
-#include "Debug/IM68K.h"
+#include "DebugApi/IMemorySystem.h"
+#include "DebugApi/IM68K.h"
 #include "Service/ILog.h"
 #include "hardfile/HardfileStructs.h"
 
@@ -128,7 +128,7 @@ namespace fellow::hardfile
     void Startup() override;
     void Shutdown() override;
 
-    HardfileHandler(Debug::IMemorySystem& memory, Debug::IM68K& cpu, Service::ILog& log);
+    HardfileHandler(Debug::IMemorySystem &memory, Debug::IM68K &cpu, Service::ILog &log);
     virtual ~HardfileHandler();
   };
 }
diff --git a/fellow/SRC/WinFellow.Hardfile/hardfile/HardfileStructs.cpp b/fellow/SRC/WinFellow.Hardfile/hardfile/HardfileStructs.cpp
index e469eb8f..dad96584 100644
--- a/fellow/SRC/WinFellow.Hardfile/hardfile/HardfileStructs.cpp
+++ b/fellow/SRC/WinFellow.Hardfile/hardfile/HardfileStructs.cpp
@@ -1,5 +1,5 @@
 #include "hardfile/HardfileStructs.h"
-#include "Debug/IMemorySystem.h"
+#include "DebugApi/IMemorySystem.h"
 
 using namespace Debug;
 using namespace fellow::hardfile::rdb;
diff --git a/fellow/SRC/WinFellow.Hardfile/hardfile/HardfileStructs.h b/fellow/SRC/WinFellow.Hardfile/hardfile/HardfileStructs.h
index 06b15979..9fea4e12 100644
--- a/fellow/SRC/WinFellow.Hardfile/hardfile/HardfileStructs.h
+++ b/fellow/SRC/WinFellow.Hardfile/hardfile/HardfileStructs.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Module/Hardfile/IHardfileHandler.h"
-#include "Debug/IMemorySystem.h"
+#include "DebugApi/IMemorySystem.h"
 #include "hardfile/rdb/RDB.h"
 
 namespace fellow::hardfile
@@ -41,7 +41,7 @@ namespace fellow::hardfile
     uint32_t GetVersion();
     void CopyHunkToAddress(uint32_t destinationAddress, uint32_t hunkIndex);
 
-    HardfileFileSystemEntry(Debug::IMemorySystem& memory, rdb::RDBFileSystemHeader *header, uint32_t segListAddress);
+    HardfileFileSystemEntry(Debug::IMemorySystem &memory, rdb::RDBFileSystemHeader *header, uint32_t segListAddress);
   };
 
   class HardfileDevice
diff --git a/fellow/SRC/WinFellow.Hardfile/hardfile/hunks/HunkRelocator.h b/fellow/SRC/WinFellow.Hardfile/hardfile/hunks/HunkRelocator.h
index ced970c5..16cf3ba0 100644
--- a/fellow/SRC/WinFellow.Hardfile/hardfile/hunks/HunkRelocator.h
+++ b/fellow/SRC/WinFellow.Hardfile/hardfile/hunks/HunkRelocator.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Debug/IMemorySystem.h"
+#include "DebugApi/IMemorySystem.h"
 #include "hardfile/hunks/FileImage.h"
 #include "hardfile/hunks/Reloc32Hunk.h"
 
diff --git a/fellow/SRC/WinFellow/DebugApi/M68K.cpp b/fellow/SRC/WinFellow/DebugApi/M68K.cpp
index 09d03de6..c0ad718b 100644
--- a/fellow/SRC/WinFellow/DebugApi/M68K.cpp
+++ b/fellow/SRC/WinFellow/DebugApi/M68K.cpp
@@ -1,4 +1,4 @@
-#include "Debug/M68K.h"
+#include "DebugApi/M68K.h"
 #include "CpuModule_Internal.h"
 
 namespace Debug
diff --git a/fellow/SRC/WinFellow/DebugApi/MemorySystem.cpp b/fellow/SRC/WinFellow/DebugApi/MemorySystem.cpp
index 0eabbcc6..b6a5e73f 100644
--- a/fellow/SRC/WinFellow/DebugApi/MemorySystem.cpp
+++ b/fellow/SRC/WinFellow/DebugApi/MemorySystem.cpp
@@ -1,4 +1,4 @@
-#include "Debug/MemorySystem.h"
+#include "DebugApi/MemorySystem.h"
 #include "FMEM.H"
 
 namespace Debug
diff --git a/fellow/SRC/WinFellow/VirtualHost/CoreFactory.cpp b/fellow/SRC/WinFellow/VirtualHost/CoreFactory.cpp
index 594c0f93..bcd63850 100644
--- a/fellow/SRC/WinFellow/VirtualHost/CoreFactory.cpp
+++ b/fellow/SRC/WinFellow/VirtualHost/CoreFactory.cpp
@@ -12,8 +12,8 @@
 
 #include "Windows/Service/FileopsWin32.h"
 
-#include "Debug/M68K.h"
-#include "Debug/MemorySystem.h"
+#include "DebugApi/M68K.h"
+#include "DebugApi/MemorySystem.h"
 
 using namespace Service;
 using namespace Debug;
diff --git a/fellow/SRC/WinFellow/WinFellow.vcxproj b/fellow/SRC/WinFellow/WinFellow.vcxproj
index a33a1b20..beaa2c84 100644
--- a/fellow/SRC/WinFellow/WinFellow.vcxproj
+++ b/fellow/SRC/WinFellow/WinFellow.vcxproj
@@ -484,8 +484,8 @@ PowerShell.exe ..\build\Scripts\GitWCRev.ps1 -InputFileName GUI_versioninfo-wcre
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="C\WavFileWriter.cpp" />
-    <ClCompile Include="Debug\M68K.cpp" />
-    <ClCompile Include="Debug\MemorySystem.cpp" />
+    <ClCompile Include="DebugApi\M68K.cpp" />
+    <ClCompile Include="DebugApi\MemorySystem.cpp" />
     <ClCompile Include="VirtualHost\CoreFactory.cpp" />
     <ClCompile Include="Windows\Driver\Sound\DirectSoundDriver.cpp" />
     <ClCompile Include="Windows\Service\FileopsWin32.cpp" />
diff --git a/fellow/SRC/WinFellow/WinFellow.vcxproj.filters b/fellow/SRC/WinFellow/WinFellow.vcxproj.filters
index dd41ee1c..793e8300 100644
--- a/fellow/SRC/WinFellow/WinFellow.vcxproj.filters
+++ b/fellow/SRC/WinFellow/WinFellow.vcxproj.filters
@@ -67,7 +67,7 @@
     <Filter Include="Windows\Driver\Sound">
       <UniqueIdentifier>{d3362cca-2d02-4d07-8940-1a7b0be5fb67}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Debug">
+    <Filter Include="DebugApi">
       <UniqueIdentifier>{f4c581b1-69af-4198-938c-5825eab5edbf}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -450,11 +450,11 @@
     <ClCompile Include="Windows\Service\RetroPlatformWrapper.cpp">
       <Filter>Windows\Service</Filter>
     </ClCompile>
-    <ClCompile Include="Debug\M68K.cpp">
-      <Filter>Debug</Filter>
+    <ClCompile Include="DebugApi\M68K.cpp">
+      <Filter>DebugApi</Filter>
     </ClCompile>
-    <ClCompile Include="Debug\MemorySystem.cpp">
-      <Filter>Debug</Filter>
+    <ClCompile Include="DebugApi\MemorySystem.cpp">
+      <Filter>DebugApi</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>