diff --git a/src/win/VARCem.rc b/src/win/VARCem.rc
index 6b169e4..65bfc0b 100644
--- a/src/win/VARCem.rc
+++ b/src/win/VARCem.rc
@@ -618,9 +618,9 @@ END
 //
 // 24
 //
-
+#ifndef SKIP_MANIFEST
 1                       24      MOVEABLE PURE   "VARCem.manifest"
-
+#endif
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
diff --git a/src/win/msvc15/VARCem.vcxproj b/src/win/msvc15/VARCem.vcxproj
index 15d57a1..3170c12 100644
--- a/src/win/msvc15/VARCem.vcxproj
+++ b/src/win/msvc15/VARCem.vcxproj
@@ -175,13 +175,13 @@
     <ClCompile Include="..\..\scsi\scsi_ncr53c810.c" />
     <ClCompile Include="..\..\scsi\scsi_x54x.c" />
     <ClCompile Include="..\..\serial.c" />
-    <ClCompile Include="..\..\sio_detect.c" />
-    <ClCompile Include="..\..\sio_fdc37c669.c" />
-    <ClCompile Include="..\..\sio_fdc37c66x.c" />
-    <ClCompile Include="..\..\sio_fdc37c93x.c" />
-    <ClCompile Include="..\..\sio_pc87306.c" />
-    <ClCompile Include="..\..\sio_um8669f.c" />
-    <ClCompile Include="..\..\sio_w83877f.c" />
+    <ClCompile Include="..\..\sio\sio_detect.c" />
+    <ClCompile Include="..\..\sio\sio_fdc37c669.c" />
+    <ClCompile Include="..\..\sio\sio_fdc37c66x.c" />
+    <ClCompile Include="..\..\sio\sio_fdc37c93x.c" />
+    <ClCompile Include="..\..\sio\sio_pc87306.c" />
+    <ClCompile Include="..\..\sio\sio_um8669f.c" />
+    <ClCompile Include="..\..\sio\sio_w83877f.c" />
     <ClCompile Include="..\..\sound\dbopl.cpp" />
     <ClCompile Include="..\..\sound\midi.c" />
     <ClCompile Include="..\..\sound\midi_mt32.c" />
@@ -483,7 +483,7 @@
     <ClInclude Include="..\..\scsi\scsi_ncr53c810.h" />
     <ClInclude Include="..\..\scsi\scsi_x54x.h" />
     <ClInclude Include="..\..\serial.h" />
-    <ClInclude Include="..\..\sio.h" />
+    <ClInclude Include="..\..\sio\sio.h" />
     <ClInclude Include="..\..\sound\dbopl.h" />
     <ClInclude Include="..\..\sound\filters.h" />
     <ClInclude Include="..\..\sound\midi.h" />
@@ -555,6 +555,7 @@
     <ClInclude Include="..\..\sound\sound.h" />
     <ClInclude Include="..\..\timer.h" />
     <ClInclude Include="..\..\ui.h" />
+    <ClInclude Include="..\..\version.h" />
     <ClInclude Include="..\..\video\video.h" />
     <ClInclude Include="..\..\video\vid_ati18800.h" />
     <ClInclude Include="..\..\video\vid_ati28800.h" />
@@ -665,7 +666,6 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
@@ -673,7 +673,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -695,6 +694,7 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>SKIP_MANIFEST</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -735,6 +735,7 @@
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>SKIP_MANIFEST</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/src/win/msvc15/VARCem.vcxproj.filters b/src/win/msvc15/VARCem.vcxproj.filters
index d6302db..c93f09a 100644
--- a/src/win/msvc15/VARCem.vcxproj.filters
+++ b/src/win/msvc15/VARCem.vcxproj.filters
@@ -36,13 +36,6 @@
     <ClCompile Include="..\..\random.c" />
     <ClCompile Include="..\..\rom.c" />
     <ClCompile Include="..\..\serial.c" />
-    <ClCompile Include="..\..\sio_detect.c" />
-    <ClCompile Include="..\..\sio_fdc37c669.c" />
-    <ClCompile Include="..\..\sio_fdc37c66x.c" />
-    <ClCompile Include="..\..\sio_fdc37c93x.c" />
-    <ClCompile Include="..\..\sio_pc87306.c" />
-    <ClCompile Include="..\..\sio_um8669f.c" />
-    <ClCompile Include="..\..\sio_w83877f.c" />
     <ClCompile Include="..\..\timer.c" />
     <ClCompile Include="..\..\cdrom\cdrom.c">
       <Filter>cdrom</Filter>
@@ -794,6 +787,27 @@
     <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>
+    <ClCompile Include="..\..\sio\sio_fdc37c66x.c">
+      <Filter>sio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sio\sio_fdc37c93x.c">
+      <Filter>sio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sio\sio_fdc37c669.c">
+      <Filter>sio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sio\sio_pc87306.c">
+      <Filter>sio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sio\sio_um8669f.c">
+      <Filter>sio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sio\sio_w83877f.c">
+      <Filter>sio</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\bugger.h" />
@@ -827,7 +841,6 @@
     <ClInclude Include="..\..\random.h" />
     <ClInclude Include="..\..\rom.h" />
     <ClInclude Include="..\..\serial.h" />
-    <ClInclude Include="..\..\sio.h" />
     <ClInclude Include="..\..\timer.h" />
     <ClInclude Include="..\..\ui.h" />
     <ClInclude Include="..\..\cdrom\cdrom.h">
@@ -1585,6 +1598,10 @@
     </ClInclude>
     <ClInclude Include="..\..\nvr_tc8521.h" />
     <ClInclude Include="..\..\rtc_tc8521.h" />
+    <ClInclude Include="..\..\sio\sio.h">
+      <Filter>sio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\version.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="cdrom">
@@ -1644,6 +1661,9 @@
     <Filter Include="win">
       <UniqueIdentifier>{cb655d08-c712-4197-9eb8-2f5b7f49eed1}</UniqueIdentifier>
     </Filter>
+    <Filter Include="sio">
+      <UniqueIdentifier>{4fc4a59c-bb7c-45d7-a467-a06198e71472}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\VARCem.rc">
diff --git a/src/win/msvc15/VARCem.vcxproj.user b/src/win/msvc15/VARCem.vcxproj.user
new file mode 100644
index 0000000..be25078
--- /dev/null
+++ b/src/win/msvc15/VARCem.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>
\ No newline at end of file