diff --git a/src/win/msvc15/VARCem.vcxproj b/src/win/msvc15/VARCem.vcxproj
index 3170c12..98e160e 100644
--- a/src/win/msvc15/VARCem.vcxproj
+++ b/src/win/msvc15/VARCem.vcxproj
@@ -67,6 +67,8 @@
     <ClCompile Include="..\..\floppy\fdd_json.c" />
     <ClCompile Include="..\..\floppy\fdd_td0.c" />
     <ClCompile Include="..\..\floppy\fdi2raw.c" />
+    <ClCompile Include="..\..\floppy\lzf\lzf_c.c" />
+    <ClCompile Include="..\..\floppy\lzf\lzf_d.c" />
     <ClCompile Include="..\..\game\gameport.c" />
     <ClCompile Include="..\..\game\joystick_ch_flightstick_pro.c" />
     <ClCompile Include="..\..\game\joystick_standard.c" />
@@ -83,8 +85,6 @@
     <ClCompile Include="..\..\keyboard_at.c" />
     <ClCompile Include="..\..\keyboard_xt.c" />
     <ClCompile Include="..\..\lpt.c" />
-    <ClCompile Include="..\..\lzf\lzf_c.c" />
-    <ClCompile Include="..\..\lzf\lzf_d.c" />
     <ClCompile Include="..\..\machine\machine.c" />
     <ClCompile Include="..\..\machine\machine_table.c" />
     <ClCompile Include="..\..\machine\m_amstrad.c" />
@@ -155,7 +155,6 @@
     <ClCompile Include="..\..\nvr.c" />
     <ClCompile Include="..\..\nvr_at.c" />
     <ClCompile Include="..\..\nvr_ps2.c" />
-    <ClCompile Include="..\..\nvr_tc8521.c" />
     <ClCompile Include="..\..\pc.c" />
     <ClCompile Include="..\..\pci.c" />
     <ClCompile Include="..\..\pic.c" />
@@ -164,7 +163,6 @@
     <ClCompile Include="..\..\random.c" />
     <ClCompile Include="..\..\rom.c" />
     <ClCompile Include="..\..\rom_load.c" />
-    <ClCompile Include="..\..\rtc_tc8521.c" />
     <ClCompile Include="..\..\scsi\scsi.c" />
     <ClCompile Include="..\..\scsi\scsi_aha154x.c" />
     <ClCompile Include="..\..\scsi\scsi_bus.c" />
@@ -408,6 +406,10 @@
     <ClInclude Include="..\..\floppy\fdd_json.h" />
     <ClInclude Include="..\..\floppy\fdd_td0.h" />
     <ClInclude Include="..\..\floppy\fdi2raw.h" />
+    <ClInclude Include="..\..\floppy\lzf\config.h" />
+    <ClInclude Include="..\..\floppy\lzf\crc32.h" />
+    <ClInclude Include="..\..\floppy\lzf\lzf.h" />
+    <ClInclude Include="..\..\floppy\lzf\lzfP.h" />
     <ClInclude Include="..\..\game\gameport.h" />
     <ClInclude Include="..\..\game\joystick_ch_flightstick_pro.h" />
     <ClInclude Include="..\..\game\joystick_standard.h" />
@@ -422,8 +424,6 @@
     <ClInclude Include="..\..\keyboard.h" />
     <ClInclude Include="..\..\lang\language.h" />
     <ClInclude Include="..\..\lpt.h" />
-    <ClInclude Include="..\..\lzf\lzf.h" />
-    <ClInclude Include="..\..\lzf\lzfP.h" />
     <ClInclude Include="..\..\machine\machine.h" />
     <ClInclude Include="..\..\machine\m_at_t3100e.h" />
     <ClInclude Include="..\..\machine\m_xt_t1000.h" />
@@ -461,18 +461,13 @@
     <ClInclude Include="..\..\nmi.h" />
     <ClInclude Include="..\..\nvr.h" />
     <ClInclude Include="..\..\nvr_ps2.h" />
-    <ClInclude Include="..\..\nvr_tc8521.h" />
     <ClInclude Include="..\..\pci.h" />
     <ClInclude Include="..\..\pic.h" />
     <ClInclude Include="..\..\pit.h" />
     <ClInclude Include="..\..\plat.h" />
-    <ClInclude Include="..\..\plat_dynld.h" />
-    <ClInclude Include="..\..\plat_joystick.h" />
-    <ClInclude Include="..\..\plat_midi.h" />
     <ClInclude Include="..\..\ppi.h" />
     <ClInclude Include="..\..\random.h" />
     <ClInclude Include="..\..\rom.h" />
-    <ClInclude Include="..\..\rtc_tc8521.h" />
     <ClInclude Include="..\..\scsi\queue.h" />
     <ClInclude Include="..\..\scsi\scsi.h" />
     <ClInclude Include="..\..\scsi\scsi_aha154x.h" />
diff --git a/src/win/msvc15/VARCem.vcxproj.filters b/src/win/msvc15/VARCem.vcxproj.filters
index c93f09a..f3757b2 100644
--- a/src/win/msvc15/VARCem.vcxproj.filters
+++ b/src/win/msvc15/VARCem.vcxproj.filters
@@ -184,12 +184,6 @@
     <ClCompile Include="..\..\game\joystick_ch_flightstick_pro.c">
       <Filter>game</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\lzf\lzf_c.c">
-      <Filter>lzf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lzf\lzf_d.c">
-      <Filter>lzf</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\machine\m_amstrad.c">
       <Filter>machine</Filter>
     </ClCompile>
@@ -784,9 +778,7 @@
     <ClCompile Include="..\..\machine\m_xt_xi8088.c">
       <Filter>machine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\nvr_tc8521.c" />
     <ClCompile Include="..\..\rom_load.c" />
-    <ClCompile Include="..\..\rtc_tc8521.c" />
     <ClCompile Include="..\..\sio\sio_detect.c">
       <Filter>sio</Filter>
     </ClCompile>
@@ -808,6 +800,12 @@
     <ClCompile Include="..\..\sio\sio_w83877f.c">
       <Filter>sio</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\floppy\lzf\lzf_c.c">
+      <Filter>floppy\lzf</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\floppy\lzf\lzf_d.c">
+      <Filter>floppy\lzf</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\bugger.h" />
@@ -834,9 +832,6 @@
     <ClInclude Include="..\..\pic.h" />
     <ClInclude Include="..\..\pit.h" />
     <ClInclude Include="..\..\plat.h" />
-    <ClInclude Include="..\..\plat_dynld.h" />
-    <ClInclude Include="..\..\plat_joystick.h" />
-    <ClInclude Include="..\..\plat_midi.h" />
     <ClInclude Include="..\..\ppi.h" />
     <ClInclude Include="..\..\random.h" />
     <ClInclude Include="..\..\rom.h" />
@@ -1122,12 +1117,6 @@
     <ClInclude Include="..\..\lang\language.h">
       <Filter>lang</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\lzf\lzfP.h">
-      <Filter>lzf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lzf\lzf.h">
-      <Filter>lzf</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\machine\m_at_t3100e.h">
       <Filter>machine</Filter>
     </ClInclude>
@@ -1596,12 +1585,22 @@
     <ClInclude Include="..\..\machine\m_xt_t1000.h">
       <Filter>machine</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\nvr_tc8521.h" />
-    <ClInclude Include="..\..\rtc_tc8521.h" />
     <ClInclude Include="..\..\sio\sio.h">
       <Filter>sio</Filter>
     </ClInclude>
     <ClInclude Include="..\..\version.h" />
+    <ClInclude Include="..\..\floppy\lzf\config.h">
+      <Filter>floppy\lzf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\floppy\lzf\crc32.h">
+      <Filter>floppy\lzf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\floppy\lzf\lzf.h">
+      <Filter>floppy\lzf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\floppy\lzf\lzfP.h">
+      <Filter>floppy\lzf</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="cdrom">
@@ -1625,9 +1624,6 @@
     <Filter Include="lang">
       <UniqueIdentifier>{232b8441-5106-47b6-939d-ebd46589c0b2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="lzf">
-      <UniqueIdentifier>{cb8b17b6-bd02-4712-a3c2-97f66710e84e}</UniqueIdentifier>
-    </Filter>
     <Filter Include="machine">
       <UniqueIdentifier>{a99de26d-e4fd-4223-952c-21f1657a20e7}</UniqueIdentifier>
     </Filter>
@@ -1664,6 +1660,9 @@
     <Filter Include="sio">
       <UniqueIdentifier>{4fc4a59c-bb7c-45d7-a467-a06198e71472}</UniqueIdentifier>
     </Filter>
+    <Filter Include="floppy\lzf">
+      <UniqueIdentifier>{98d7b877-02b8-4c6b-b2b6-d2cc49f357bc}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\VARCem.rc">