diff --git a/MiSTer.vcxproj b/MiSTer.vcxproj
index 24036a9..df594ec 100644
--- a/MiSTer.vcxproj
+++ b/MiSTer.vcxproj
@@ -39,7 +39,11 @@
   <ItemDefinitionGroup>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="archie.cpp" />
+    <None Include="build.sh" />
+    <None Include="clean.sh" />
+    <None Include="Makefile" />
+  </ItemGroup>
+  <ItemGroup>
     <ClCompile Include="battery.cpp" />
     <ClCompile Include="brightness.cpp" />
     <ClCompile Include="cfg.cpp" />
@@ -51,22 +55,22 @@
     <ClCompile Include="input.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="menu.cpp" />
-    <ClCompile Include="minimig_boot.cpp" />
-    <ClCompile Include="minimig_config.cpp" />
-    <ClCompile Include="minimig_fdd.cpp" />
-    <ClCompile Include="minimig_hdd.cpp" />
     <ClCompile Include="osd.cpp" />
-    <ClCompile Include="sharpmz.cpp" />
     <ClCompile Include="spi.cpp" />
-    <ClCompile Include="st_ikbd.cpp" />
-    <ClCompile Include="st_tos.cpp" />
+    <ClCompile Include="support\archie\archie.cpp" />
+    <ClCompile Include="support\minimig\minimig_boot.cpp" />
+    <ClCompile Include="support\minimig\minimig_config.cpp" />
+    <ClCompile Include="support\minimig\minimig_fdd.cpp" />
+    <ClCompile Include="support\minimig\minimig_hdd.cpp" />
+    <ClCompile Include="support\sharpmz\sharpmz.cpp" />
+    <ClCompile Include="support\st\st_ikbd.cpp" />
+    <ClCompile Include="support\st\st_tos.cpp" />
+    <ClCompile Include="support\x86\x86.cpp" />
     <ClCompile Include="sxmlc.c" />
     <ClCompile Include="tzx2wav.cpp" />
     <ClCompile Include="user_io.cpp" />
-    <ClCompile Include="x86.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="archie.h" />
     <ClInclude Include="battery.h" />
     <ClInclude Include="brightness.h" />
     <ClInclude Include="cfg.h" />
@@ -85,25 +89,22 @@
     <ClInclude Include="input.h" />
     <ClInclude Include="logo.h" />
     <ClInclude Include="menu.h" />
-    <ClInclude Include="minimig_boot.h" />
-    <ClInclude Include="minimig_config.h" />
-    <ClInclude Include="minimig_fdd.h" />
-    <ClInclude Include="minimig_hdd.h" />
-    <ClInclude Include="minimig_hdd_internal.h" />
     <ClInclude Include="osd.h" />
-    <ClInclude Include="sharpmz.h" />
     <ClInclude Include="spi.h" />
-    <ClInclude Include="st_ikbd.h" />
-    <ClInclude Include="st_tos.h" />
+    <ClInclude Include="support.h" />
+    <ClInclude Include="support\archie\archie.h" />
+    <ClInclude Include="support\minimig\minimig_boot.h" />
+    <ClInclude Include="support\minimig\minimig_config.h" />
+    <ClInclude Include="support\minimig\minimig_fdd.h" />
+    <ClInclude Include="support\minimig\minimig_hdd.h" />
+    <ClInclude Include="support\minimig\minimig_hdd_internal.h" />
+    <ClInclude Include="support\sharpmz\sharpmz.h" />
+    <ClInclude Include="support\st\st_ikbd.h" />
+    <ClInclude Include="support\st\st_tos.h" />
+    <ClInclude Include="support\x86\x86.h" />
     <ClInclude Include="sxmlc.h" />
     <ClInclude Include="tzx2wav.h" />
     <ClInclude Include="user_io.h" />
-    <ClInclude Include="x86.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="build.sh" />
-    <None Include="clean.sh" />
-    <None Include="Makefile" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/MiSTer.vcxproj.filters b/MiSTer.vcxproj.filters
index 771933a..09646dd 100644
--- a/MiSTer.vcxproj.filters
+++ b/MiSTer.vcxproj.filters
@@ -11,7 +11,24 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="archie.cpp">
+    <None Include="build.sh" />
+    <None Include="Makefile" />
+    <None Include="clean.sh" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="battery.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="brightness.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="cfg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DiskImage.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="file_io.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="fpga_io.cpp">
@@ -38,57 +55,51 @@
     <ClCompile Include="spi.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="user_io.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="file_io.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="x86.cpp">
+    <ClCompile Include="sxmlc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="tzx2wav.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="DiskImage.cpp">
+    <ClCompile Include="user_io.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="cfg.cpp">
+    <ClCompile Include="support\archie\archie.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="minimig_boot.cpp">
+    <ClCompile Include="support\minimig\minimig_boot.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="minimig_config.cpp">
+    <ClCompile Include="support\minimig\minimig_config.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="minimig_fdd.cpp">
+    <ClCompile Include="support\minimig\minimig_fdd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="minimig_hdd.cpp">
+    <ClCompile Include="support\minimig\minimig_hdd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="st_ikbd.cpp">
+    <ClCompile Include="support\sharpmz\sharpmz.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="st_tos.cpp">
+    <ClCompile Include="support\st\st_ikbd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="brightness.cpp">
+    <ClCompile Include="support\st\st_tos.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="battery.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sxmlc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sharpmz.cpp">
+    <ClCompile Include="support\x86\x86.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="archie.h">
+    <ClInclude Include="battery.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="brightness.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="cfg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="charrom.h">
@@ -97,6 +108,12 @@
     <ClInclude Include="debug.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="DiskImage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="file_io.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="fpga_base_addr_ac5.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -136,61 +153,47 @@
     <ClInclude Include="spi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="user_io.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="file_io.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="x86.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="tzx2wav.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DiskImage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="cfg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="minimig_boot.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="minimig_config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="minimig_fdd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="minimig_hdd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="minimig_hdd_internal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="st_ikbd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="st_tos.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="brightness.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="battery.h">
+    <ClInclude Include="support.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="sxmlc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="sharpmz.h">
+    <ClInclude Include="tzx2wav.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="user_io.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="support\archie\archie.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="support\minimig\minimig_boot.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="support\minimig\minimig_config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="support\minimig\minimig_fdd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="support\minimig\minimig_hdd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="support\minimig\minimig_hdd_internal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="support\sharpmz\sharpmz.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="support\st\st_ikbd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="support\st\st_tos.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="support\x86\x86.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="build.sh" />
-    <None Include="Makefile" />
-    <None Include="clean.sh" />
-  </ItemGroup>
 </Project>
\ No newline at end of file