diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 47f940d230..755593c0c4 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -480,9 +480,6 @@
     <Compile Include="SNESTools\SNESOptions.Designer.cs">
       <DependentUpon>SNESOptions.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\AnalogControlPanel.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="N64tools\N64VideoPluginconfig.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -501,7 +498,6 @@
     <Compile Include="tools\HexFind.Designer.cs">
       <DependentUpon>HexFind.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\IVirtualPad.cs" />
     <Compile Include="tools\LuaButton.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -543,70 +539,98 @@
     <Compile Include="tools\TraceLogger.Designer.cs">
       <DependentUpon>TraceLogger.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadA78.cs">
+    <Compile Include="tools\VirtualPads\AnalogControlPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\IVirtualPad.cs" />
+    <Compile Include="tools\VirtualPads\VirtualPad.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadA26.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadA26Control.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadA78.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadA78.Designer.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadA78.Designer.cs">
       <DependentUpon>VirtualPadA78.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadA78Control.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadA78Control.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadA78Control.Designer.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadA78Control.Designer.cs">
       <DependentUpon>VirtualPadA78Control.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadC64Keyboard.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadC64Keyboard.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadC64Keyboard.Designer.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadC64Keyboard.Designer.cs">
       <DependentUpon>VirtualPadC64Keyboard.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadColeco.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadColeco.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadColeco.Designer.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadColeco.Designer.cs">
       <DependentUpon>VirtualPadColeco.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadForm.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadForm.Designer.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadForm.Designer.cs">
       <DependentUpon>VirtualPadForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadGB.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadGB.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadGBA.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadGBA.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadGBControl.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadGBControl.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadGen3Button.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadGen3Button.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadN64.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadN64.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadN64.Designer.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadN64.Designer.cs">
       <DependentUpon>VirtualPadN64.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadSaturn.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="tools\VirtualPadSaturn.Designer.cs">
-      <DependentUpon>VirtualPadSaturn.cs</DependentUpon>
-    </Compile>
-    <Compile Include="tools\VirtualPadSaturnControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="tools\VirtualPadSaturnControl.Designer.cs">
-      <DependentUpon>VirtualPadSaturnControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="tools\VirtualPadSNES.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadNES.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadSNESControl.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadNESControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadPCE.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadSaturn.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadSaturn.Designer.cs">
+      <DependentUpon>VirtualPadSaturn.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadSaturnControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadSaturnControl.Designer.cs">
+      <DependentUpon>VirtualPadSaturnControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadSMS.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadSMSControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadSNES.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadSNESControl.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="tools\WatchCommon.cs" />
@@ -762,28 +786,31 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="tools\VirtualPadA78.resx">
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPad.resx">
+      <DependentUpon>VirtualPad.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadA78.resx">
       <DependentUpon>VirtualPadA78.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPadA78Control.resx">
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadA78Control.resx">
       <DependentUpon>VirtualPadA78Control.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPadC64Keyboard.resx">
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadC64Keyboard.resx">
       <DependentUpon>VirtualPadC64Keyboard.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPadColeco.resx">
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadColeco.resx">
       <DependentUpon>VirtualPadColeco.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPadForm.resx">
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadForm.resx">
       <DependentUpon>VirtualPadForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPadN64.resx">
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadN64.resx">
       <DependentUpon>VirtualPadN64.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPadSaturn.resx">
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadSaturn.resx">
       <DependentUpon>VirtualPadSaturn.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPadSaturnControl.resx">
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadSaturnControl.resx">
       <DependentUpon>VirtualPadSaturnControl.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="Properties\Settings.settings">
@@ -825,9 +852,6 @@
       <DependentUpon>LuaFunctionList.cs</DependentUpon>
     </Compile>
     <Compile Include="tools\MemoryPulse.cs" />
-    <Compile Include="tools\VirtualPad.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="tools\HexEditor.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -892,27 +916,6 @@
     <Compile Include="tools\ToolBox.Designer.cs">
       <DependentUpon>ToolBox.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadA26.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="tools\VirtualPadA26Control.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="tools\VirtualPadNES.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="tools\VirtualPadNESControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="tools\VirtualPadPCE.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="tools\VirtualPadSMS.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="tools\VirtualPadSMSControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="tools\Watch.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -999,10 +1002,6 @@
     <EmbeddedResource Include="tools\TraceLogger.resx">
       <DependentUpon>TraceLogger.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPad.resx">
-      <DependentUpon>VirtualPad.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="tools\HexEditor.resx">
       <DependentUpon>HexEditor.cs</DependentUpon>
       <SubType>Designer</SubType>
diff --git a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
index 06df2c9589..73bbb81a03 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
@@ -488,9 +488,6 @@
     <Compile Include="SNESTools\SNESOptions.Designer.cs">
       <DependentUpon>SNESOptions.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\AnalogControlPanel.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="tools\HexColor.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -503,7 +500,6 @@
     <Compile Include="tools\HexFind.Designer.cs">
       <DependentUpon>HexFind.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\IVirtualPad.cs" />
     <Compile Include="tools\LuaButton.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -545,70 +541,98 @@
     <Compile Include="tools\TraceLogger.Designer.cs">
       <DependentUpon>TraceLogger.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadN64.cs">
+    <Compile Include="tools\VirtualPads\AnalogControlPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\IVirtualPad.cs" />
+    <Compile Include="tools\VirtualPads\VirtualPad.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadA26.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadA26Control.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadA78.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadN64.Designer.cs">
-      <DependentUpon>VirtualPadN64.cs</DependentUpon>
-    </Compile>
-    <Compile Include="tools\VirtualPadA78.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="tools\VirtualPadA78.Designer.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadA78.Designer.cs">
       <DependentUpon>VirtualPadA78.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadA78Control.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadA78Control.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadA78Control.Designer.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadA78Control.Designer.cs">
       <DependentUpon>VirtualPadA78Control.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadC64Keyboard.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadC64Keyboard.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadC64Keyboard.Designer.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadC64Keyboard.Designer.cs">
       <DependentUpon>VirtualPadC64Keyboard.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadColeco.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadColeco.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadColeco.Designer.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadColeco.Designer.cs">
       <DependentUpon>VirtualPadColeco.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadForm.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadForm.Designer.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadForm.Designer.cs">
       <DependentUpon>VirtualPadForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadGB.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadGB.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadGBA.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadGBA.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadGBControl.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadGBControl.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadGen3Button.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadGen3Button.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadSaturn.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadN64.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadSaturn.Designer.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadN64.Designer.cs">
+      <DependentUpon>VirtualPadN64.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadNES.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadNESControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadPCE.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadSaturn.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadSaturn.Designer.cs">
       <DependentUpon>VirtualPadSaturn.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadSaturnControl.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadSaturnControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadSaturnControl.Designer.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadSaturnControl.Designer.cs">
       <DependentUpon>VirtualPadSaturnControl.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadSNES.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadSMS.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadSNESControl.cs">
+    <Compile Include="tools\VirtualPads\VirtualPadSMSControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadSNES.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPads\VirtualPadSNESControl.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="tools\WatchCommon.cs" />
@@ -762,28 +786,31 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="tools\VirtualPadN64.resx">
-      <DependentUpon>VirtualPadN64.cs</DependentUpon>
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPad.resx">
+      <DependentUpon>VirtualPad.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPadA78.resx">
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadA78.resx">
       <DependentUpon>VirtualPadA78.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPadA78Control.resx">
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadA78Control.resx">
       <DependentUpon>VirtualPadA78Control.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPadC64Keyboard.resx">
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadC64Keyboard.resx">
       <DependentUpon>VirtualPadC64Keyboard.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPadColeco.resx">
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadColeco.resx">
       <DependentUpon>VirtualPadColeco.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPadForm.resx">
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadForm.resx">
       <DependentUpon>VirtualPadForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPadSaturn.resx">
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadN64.resx">
+      <DependentUpon>VirtualPadN64.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadSaturn.resx">
       <DependentUpon>VirtualPadSaturn.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPadSaturnControl.resx">
+    <EmbeddedResource Include="tools\VirtualPads\VirtualPadSaturnControl.resx">
       <DependentUpon>VirtualPadSaturnControl.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="Properties\Settings.settings">
@@ -825,9 +852,6 @@
       <DependentUpon>LuaFunctionList.cs</DependentUpon>
     </Compile>
     <Compile Include="tools\MemoryPulse.cs" />
-    <Compile Include="tools\VirtualPad.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="tools\HexEditor.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -892,27 +916,6 @@
     <Compile Include="tools\ToolBox.Designer.cs">
       <DependentUpon>ToolBox.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\VirtualPadA26.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="tools\VirtualPadA26Control.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="tools\VirtualPadNES.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="tools\VirtualPadNESControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="tools\VirtualPadPCE.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="tools\VirtualPadSMS.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="tools\VirtualPadSMSControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="tools\Watch.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -999,10 +1002,6 @@
     <EmbeddedResource Include="tools\TraceLogger.resx">
       <DependentUpon>TraceLogger.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\VirtualPad.resx">
-      <DependentUpon>VirtualPad.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="tools\HexEditor.resx">
       <DependentUpon>HexEditor.cs</DependentUpon>
       <SubType>Designer</SubType>
diff --git a/BizHawk.MultiClient/tools/AnalogControlPanel.cs b/BizHawk.MultiClient/tools/VirtualPads/AnalogControlPanel.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/AnalogControlPanel.cs
rename to BizHawk.MultiClient/tools/VirtualPads/AnalogControlPanel.cs
diff --git a/BizHawk.MultiClient/tools/IVirtualPad.cs b/BizHawk.MultiClient/tools/VirtualPads/IVirtualPad.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/IVirtualPad.cs
rename to BizHawk.MultiClient/tools/VirtualPads/IVirtualPad.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPad.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPad.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPad.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPad.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPad.resx b/BizHawk.MultiClient/tools/VirtualPads/VirtualPad.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPad.resx
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPad.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPadA26.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadA26.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadA26Control.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26Control.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadA26Control.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26Control.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadA78.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadA78.Designer.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadA78.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadA78.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadA78.resx b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadA78.resx
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPadA78Control.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadA78Control.Designer.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadA78Control.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadA78Control.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadA78Control.resx b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadA78Control.resx
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPadC64Keyboard.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadC64Keyboard.Designer.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadC64Keyboard.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadC64Keyboard.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadC64Keyboard.resx b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadC64Keyboard.resx
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPadColeco.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadColeco.Designer.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadColeco.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadColeco.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadColeco.resx b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadColeco.resx
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPadForm.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadForm.Designer.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadForm.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadForm.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadForm.resx b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadForm.resx
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPadGB.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGB.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadGB.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadGB.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadGBA.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBA.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadGBA.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBA.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadGBControl.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBControl.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadGBControl.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBControl.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadGen3Button.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGen3Button.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadGen3Button.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadGen3Button.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadN64.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadN64.Designer.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadN64.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadN64.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadN64.resx b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadN64.resx
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPadNES.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadNES.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadNES.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadNES.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadNESControl.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadNESControl.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadNESControl.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadNESControl.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadPCE.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadPCE.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadPCE.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadPCE.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadSMS.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMS.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadSMS.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMS.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadSMSControl.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMSControl.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadSMSControl.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMSControl.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadSNES.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNES.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadSNES.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNES.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadSNESControl.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNESControl.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadSNESControl.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNESControl.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadSaturn.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadSaturn.Designer.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadSaturn.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadSaturn.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadSaturn.resx b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadSaturn.resx
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPadSaturnControl.Designer.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadSaturnControl.Designer.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadSaturnControl.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadSaturnControl.cs
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPadSaturnControl.resx b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPadSaturnControl.resx
rename to BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.resx