diff --git a/src/win/msvc/vc15/VARCem.vcxproj b/src/win/msvc/vc15/VARCem.vcxproj
index a1c6030..aa97c77 100644
--- a/src/win/msvc/vc15/VARCem.vcxproj
+++ b/src/win/msvc/vc15/VARCem.vcxproj
@@ -70,24 +70,26 @@
     <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" />
-    <ClCompile Include="..\..\..\game\joystick_sw_pad.c" />
-    <ClCompile Include="..\..\..\game\joystick_tm_fcs.c" />
     <ClCompile Include="..\..\..\i82335.c" />
+    <ClCompile Include="..\..\..\input\game\joystick.c" />
+    <ClCompile Include="..\..\..\input\game\js_ch_fs_pro.c" />
+    <ClCompile Include="..\..\..\input\game\js_standard.c" />
+    <ClCompile Include="..\..\..\input\game\js_sw_pad.c" />
+    <ClCompile Include="..\..\..\input\game\js_tm_fcs.c" />
+    <ClCompile Include="..\..\..\input\keyboard.c" />
+    <ClCompile Include="..\..\..\input\keyboard_at.c" />
+    <ClCompile Include="..\..\..\input\keyboard_xt.c" />
+    <ClCompile Include="..\..\..\input\mouse.c" />
+    <ClCompile Include="..\..\..\input\mouse_bus.c" />
+    <ClCompile Include="..\..\..\input\mouse_ps2.c" />
+    <ClCompile Include="..\..\..\input\mouse_serial.c" />
     <ClCompile Include="..\..\..\intel.c" />
     <ClCompile Include="..\..\..\intel_flash.c" />
     <ClCompile Include="..\..\..\intel_piix.c" />
     <ClCompile Include="..\..\..\intel_piix4.c" />
     <ClCompile Include="..\..\..\intel_sio.c" />
     <ClCompile Include="..\..\..\io.c" />
-    <ClCompile Include="..\..\..\keyboard.c" />
-    <ClCompile Include="..\..\..\keyboard_at.c" />
-    <ClCompile Include="..\..\..\keyboard_xt.c" />
     <ClCompile Include="..\..\..\machine\m_ps1_hdc.c" />
-    <ClCompile Include="..\..\..\parallel.c" />
-    <ClCompile Include="..\..\..\parallel_dev.c" />
     <ClCompile Include="..\..\..\machine\machine.c" />
     <ClCompile Include="..\..\..\machine\machine_table.c" />
     <ClCompile Include="..\..\..\machine\m_amstrad.c" />
@@ -127,10 +129,6 @@
     <ClCompile Include="..\..\..\mcr.c" />
     <ClCompile Include="..\..\..\mem.c" />
     <ClCompile Include="..\..\..\memregs.c" />
-    <ClCompile Include="..\..\..\mouse.c" />
-    <ClCompile Include="..\..\..\mouse_bus.c" />
-    <ClCompile Include="..\..\..\mouse_ps2.c" />
-    <ClCompile Include="..\..\..\mouse_serial.c" />
     <ClCompile Include="..\..\..\network\network.c" />
     <ClCompile Include="..\..\..\network\net_ne2000.c" />
     <ClCompile Include="..\..\..\network\net_pcap.c" />
@@ -161,6 +159,11 @@
     <ClCompile Include="..\..\..\pci.c" />
     <ClCompile Include="..\..\..\pic.c" />
     <ClCompile Include="..\..\..\pit.c" />
+    <ClCompile Include="..\..\..\ports\game.c" />
+    <ClCompile Include="..\..\..\ports\game_dev.c" />
+    <ClCompile Include="..\..\..\ports\parallel.c" />
+    <ClCompile Include="..\..\..\ports\parallel_dev.c" />
+    <ClCompile Include="..\..\..\ports\serial.c" />
     <ClCompile Include="..\..\..\ppi.c" />
     <ClCompile Include="..\..\..\random.c" />
     <ClCompile Include="..\..\..\rom.c" />
@@ -174,7 +177,6 @@
     <ClCompile Include="..\..\..\scsi\scsi_ncr5380.c" />
     <ClCompile Include="..\..\..\scsi\scsi_ncr53c810.c" />
     <ClCompile Include="..\..\..\scsi\scsi_x54x.c" />
-    <ClCompile Include="..\..\..\serial.c" />
     <ClCompile Include="..\..\..\sio\sio_detect.c" />
     <ClCompile Include="..\..\..\sio\sio_fdc37c669.c" />
     <ClCompile Include="..\..\..\sio\sio_fdc37c66x.c" />
@@ -301,7 +303,6 @@
     <ClCompile Include="..\..\..\win\win_dialog.c" />
     <ClCompile Include="..\..\..\win\win_dynld.c" />
     <ClCompile Include="..\..\..\win\win_joystick.cpp" />
-    <ClCompile Include="..\..\..\win\win_jsconf.c" />
     <ClCompile Include="..\..\..\win\win_keyboard.c" />
     <ClCompile Include="..\..\..\win\win_midi.c" />
     <ClCompile Include="..\..\..\win\win_mouse.cpp" />
@@ -411,18 +412,15 @@
     <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" />
-    <ClInclude Include="..\..\..\game\joystick_sw_pad.h" />
-    <ClInclude Include="..\..\..\game\joystick_tm_fcs.h" />
     <ClInclude Include="..\..\..\i82335.h" />
+    <ClInclude Include="..\..\..\input\game\joystick.h" />
+    <ClInclude Include="..\..\..\input\keyboard.h" />
+    <ClInclude Include="..\..\..\input\mouse.h" />
     <ClInclude Include="..\..\..\intel.h" />
     <ClInclude Include="..\..\..\intel_flash.h" />
     <ClInclude Include="..\..\..\intel_piix.h" />
     <ClInclude Include="..\..\..\intel_sio.h" />
     <ClInclude Include="..\..\..\io.h" />
-    <ClInclude Include="..\..\..\keyboard.h" />
     <ClInclude Include="..\..\..\lang\language.h" />
     <ClInclude Include="..\..\..\machine\machine.h" />
     <ClInclude Include="..\..\..\machine\m_at_t3100e.h" />
@@ -431,7 +429,6 @@
     <ClInclude Include="..\..\..\mca.h" />
     <ClInclude Include="..\..\..\mem.h" />
     <ClInclude Include="..\..\..\memregs.h" />
-    <ClInclude Include="..\..\..\mouse.h" />
     <ClInclude Include="..\..\..\network\bswap.h" />
     <ClInclude Include="..\..\..\network\network.h" />
     <ClInclude Include="..\..\..\network\net_ne2000.h" />
@@ -461,12 +458,15 @@
     <ClInclude Include="..\..\..\nmi.h" />
     <ClInclude Include="..\..\..\nvr.h" />
     <ClInclude Include="..\..\..\nvr_ps2.h" />
-    <ClInclude Include="..\..\..\parallel.h" />
-    <ClInclude Include="..\..\..\parallel_dev.h" />
     <ClInclude Include="..\..\..\pci.h" />
     <ClInclude Include="..\..\..\pic.h" />
     <ClInclude Include="..\..\..\pit.h" />
     <ClInclude Include="..\..\..\plat.h" />
+    <ClInclude Include="..\..\..\ports\game.h" />
+    <ClInclude Include="..\..\..\ports\game_dev.h" />
+    <ClInclude Include="..\..\..\ports\parallel.h" />
+    <ClInclude Include="..\..\..\ports\parallel_dev.h" />
+    <ClInclude Include="..\..\..\ports\serial.h" />
     <ClInclude Include="..\..\..\ppi.h" />
     <ClInclude Include="..\..\..\random.h" />
     <ClInclude Include="..\..\..\rom.h" />
@@ -479,7 +479,6 @@
     <ClInclude Include="..\..\..\scsi\scsi_ncr5380.h" />
     <ClInclude Include="..\..\..\scsi\scsi_ncr53c810.h" />
     <ClInclude Include="..\..\..\scsi\scsi_x54x.h" />
-    <ClInclude Include="..\..\..\serial.h" />
     <ClInclude Include="..\..\..\sio\sio.h" />
     <ClInclude Include="..\..\..\sound\sound.h" />
     <ClInclude Include="..\..\..\sound\dbopl.h" />
diff --git a/src/win/msvc/vc15/VARCem.vcxproj.filters b/src/win/msvc/vc15/VARCem.vcxproj.filters
index 6148c8a..01a2522 100644
--- a/src/win/msvc/vc15/VARCem.vcxproj.filters
+++ b/src/win/msvc/vc15/VARCem.vcxproj.filters
@@ -12,23 +12,14 @@
     <ClCompile Include="..\..\..\intel_piix4.c" />
     <ClCompile Include="..\..\..\intel_sio.c" />
     <ClCompile Include="..\..\..\io.c" />
-    <ClCompile Include="..\..\..\keyboard.c" />
-    <ClCompile Include="..\..\..\keyboard_at.c" />
-    <ClCompile Include="..\..\..\keyboard_xt.c" />
     <ClCompile Include="..\..\..\mca.c" />
     <ClCompile Include="..\..\..\mcr.c" />
     <ClCompile Include="..\..\..\mem.c" />
     <ClCompile Include="..\..\..\memregs.c" />
-    <ClCompile Include="..\..\..\mouse.c" />
-    <ClCompile Include="..\..\..\mouse_bus.c" />
-    <ClCompile Include="..\..\..\mouse_ps2.c" />
-    <ClCompile Include="..\..\..\mouse_serial.c" />
     <ClCompile Include="..\..\..\nmi.c" />
     <ClCompile Include="..\..\..\nvr.c" />
     <ClCompile Include="..\..\..\nvr_at.c" />
     <ClCompile Include="..\..\..\nvr_ps2.c" />
-    <ClCompile Include="..\..\..\parallel.c" />
-    <ClCompile Include="..\..\..\parallel_dev.c" />
     <ClCompile Include="..\..\..\pc.c" />
     <ClCompile Include="..\..\..\pci.c" />
     <ClCompile Include="..\..\..\pic.c" />
@@ -36,7 +27,6 @@
     <ClCompile Include="..\..\..\ppi.c" />
     <ClCompile Include="..\..\..\random.c" />
     <ClCompile Include="..\..\..\rom.c" />
-    <ClCompile Include="..\..\..\serial.c" />
     <ClCompile Include="..\..\..\timer.c" />
     <ClCompile Include="..\..\..\cdrom\cdrom.c">
       <Filter>cdrom</Filter>
@@ -161,21 +151,6 @@
     <ClCompile Include="..\..\..\floppy\fdi2raw.c">
       <Filter>floppy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\game\gameport.c">
-      <Filter>game</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\game\joystick_tm_fcs.c">
-      <Filter>game</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\game\joystick_sw_pad.c">
-      <Filter>game</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\game\joystick_standard.c">
-      <Filter>game</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\game\joystick_ch_flightstick_pro.c">
-      <Filter>game</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\machine\m_amstrad.c">
       <Filter>machine</Filter>
     </ClCompile>
@@ -710,9 +685,6 @@
     <ClCompile Include="..\..\..\win\win_joystick.cpp">
       <Filter>win</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\win\win_jsconf.c">
-      <Filter>win</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\win\win_keyboard.c">
       <Filter>win</Filter>
     </ClCompile>
@@ -805,6 +777,57 @@
     <ClCompile Include="..\..\..\machine\m_ps1_hdc.c">
       <Filter>machine</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\input\game\joystick.c">
+      <Filter>input\game</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\input\game\js_ch_fs_pro.c">
+      <Filter>input\game</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\input\game\js_standard.c">
+      <Filter>input\game</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\input\game\js_sw_pad.c">
+      <Filter>input\game</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\input\game\js_tm_fcs.c">
+      <Filter>input\game</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\input\keyboard.c">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\input\keyboard_at.c">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\input\keyboard_xt.c">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\input\mouse.c">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\input\mouse_bus.c">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\input\mouse_ps2.c">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\input\mouse_serial.c">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ports\game.c">
+      <Filter>ports</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ports\game_dev.c">
+      <Filter>ports</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ports\parallel.c">
+      <Filter>ports</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ports\parallel_dev.c">
+      <Filter>ports</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ports\serial.c">
+      <Filter>ports</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\bugger.h" />
@@ -818,13 +841,9 @@
     <ClInclude Include="..\..\..\intel_piix.h" />
     <ClInclude Include="..\..\..\intel_sio.h" />
     <ClInclude Include="..\..\..\io.h" />
-    <ClInclude Include="..\..\..\keyboard.h" />
-    <ClInclude Include="..\..\..\parallel.h" />
-    <ClInclude Include="..\..\..\parallel_dev.h" />
     <ClInclude Include="..\..\..\mca.h" />
     <ClInclude Include="..\..\..\mem.h" />
     <ClInclude Include="..\..\..\memregs.h" />
-    <ClInclude Include="..\..\..\mouse.h" />
     <ClInclude Include="..\..\..\nmi.h" />
     <ClInclude Include="..\..\..\nvr.h" />
     <ClInclude Include="..\..\..\nvr_ps2.h" />
@@ -837,7 +856,6 @@
     <ClInclude Include="..\..\..\ppi.h" />
     <ClInclude Include="..\..\..\random.h" />
     <ClInclude Include="..\..\..\rom.h" />
-    <ClInclude Include="..\..\..\serial.h" />
     <ClInclude Include="..\..\..\timer.h" />
     <ClInclude Include="..\..\..\ui.h" />
     <ClInclude Include="..\..\..\cdrom\cdrom.h">
@@ -1101,21 +1119,6 @@
     <ClInclude Include="..\..\..\floppy\fdi2raw.h">
       <Filter>floppy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\game\gameport.h">
-      <Filter>game</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\game\joystick_tm_fcs.h">
-      <Filter>game</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\game\joystick_sw_pad.h">
-      <Filter>game</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\game\joystick_standard.h">
-      <Filter>game</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\game\joystick_ch_flightstick_pro.h">
-      <Filter>game</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\lang\language.h">
       <Filter>lang</Filter>
     </ClInclude>
@@ -1504,6 +1507,30 @@
     <ClInclude Include="..\..\..\floppy\lzf\lzfP.h">
       <Filter>floppy\lzf</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\input\game\joystick.h">
+      <Filter>input\game</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\input\keyboard.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\input\mouse.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ports\game.h">
+      <Filter>ports</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ports\game_dev.h">
+      <Filter>ports</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ports\parallel.h">
+      <Filter>ports</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ports\parallel_dev.h">
+      <Filter>ports</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ports\serial.h">
+      <Filter>ports</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="cdrom">
@@ -1521,9 +1548,6 @@
     <Filter Include="floppy">
       <UniqueIdentifier>{a9a86e4f-b4eb-4687-a979-f97b394db706}</UniqueIdentifier>
     </Filter>
-    <Filter Include="game">
-      <UniqueIdentifier>{542ab504-19c9-43b6-91b6-b3a205ffeb97}</UniqueIdentifier>
-    </Filter>
     <Filter Include="lang">
       <UniqueIdentifier>{232b8441-5106-47b6-939d-ebd46589c0b2}</UniqueIdentifier>
     </Filter>
@@ -1566,6 +1590,15 @@
     <Filter Include="floppy\lzf">
       <UniqueIdentifier>{98d7b877-02b8-4c6b-b2b6-d2cc49f357bc}</UniqueIdentifier>
     </Filter>
+    <Filter Include="input">
+      <UniqueIdentifier>{923338ef-338a-4592-9839-9f8587d93c52}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="input\game">
+      <UniqueIdentifier>{fc7fc92b-b4da-4f3c-a5c7-4d2548b60fb2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ports">
+      <UniqueIdentifier>{b9d0388f-b14d-4448-85fe-7179fff3f77f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\VARCem.rc">