diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 4c21c168ee..6823e5160f 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -238,63 +238,6 @@
     <Compile Include="DisplayManager\DisplayManager.cs" />
     <Compile Include="DisplayManager\Filters\Hq2x.cs" />
     <Compile Include="FirmwareManager.cs" />
-    <Compile Include="GBAtools\GBAGPUView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBAtools\GBAGPUView.Designer.cs">
-      <DependentUpon>GBAGPUView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBAtools\MobileBmpView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBAtools\MobileBmpView.Designer.cs">
-      <DependentUpon>MobileBmpView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBAtools\MobileDetailView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBAtools\MobileDetailView.Designer.cs">
-      <DependentUpon>MobileDetailView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBtools\BmpView.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="GBtools\CGBColorChooserForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBtools\CGBColorChooserForm.Designer.cs">
-      <DependentUpon>CGBColorChooserForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBtools\ColorChooserForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBtools\ColorChooserForm.designer.cs">
-      <DependentUpon>ColorChooserForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBtools\DualGBFileSelector.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="GBtools\DualGBFileSelector.Designer.cs">
-      <DependentUpon>DualGBFileSelector.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBtools\DualGBXMLCreator.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBtools\DualGBXMLCreator.Designer.cs">
-      <DependentUpon>DualGBXMLCreator.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBtools\GBGPUView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBtools\GBGPUView.Designer.cs">
-      <DependentUpon>GBGPUView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBtools\GBGameGenie.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBtools\GBGameGenie.Designer.cs">
-      <DependentUpon>GBGameGenie.cs</DependentUpon>
-    </Compile>
     <Compile Include="Global.cs" />
     <Compile Include="HawkFile.cs" />
     <Compile Include="Input\ControllerBinding.cs" />
@@ -374,116 +317,14 @@
     <Compile Include="NameStateForm.Designer.cs">
       <DependentUpon>NameStateForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="NEStools\NameTableViewer.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="NEStools\NESDebugger.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NEStools\NESDebugger.Designer.cs">
-      <DependentUpon>NESDebugger.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NEStools\NESGameGenie.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NEStools\NESGameGenie.Designer.cs">
-      <DependentUpon>NESGameGenie.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NEStools\NESGraphicsConfig.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NEStools\NESGraphicsConfig.Designer.cs">
-      <DependentUpon>NESGraphicsConfig.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NEStools\NESNameTableViewer.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NEStools\NESNameTableViewer.Designer.cs">
-      <DependentUpon>NESNameTableViewer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NEStools\NESPPU.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NEStools\NESPPU.Designer.cs">
-      <DependentUpon>NESPPU.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NEStools\NESSoundConfig.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NEStools\NESSoundConfig.Designer.cs">
-      <DependentUpon>NESSoundConfig.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NEStools\PaletteViewer.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="NEStools\PatternViewer.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="NEStools\SpriteViewer.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="GENtools\GenGameGenie.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GENtools\GenGameGenie.Designer.cs">
-      <DependentUpon>GenGameGenie.cs</DependentUpon>
-    </Compile>
     <Compile Include="config\NewPathConfig.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="config\NewPathConfig.Designer.cs">
       <DependentUpon>NewPathConfig.cs</DependentUpon>
     </Compile>
-    <Compile Include="PCEtools\PCEBGCanvas.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PCEtools\PCEBGViewer.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PCEtools\PCEBGViewer.Designer.cs">
-      <DependentUpon>PCEBGViewer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PCEtools\PCEGraphicsConfig.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PCEtools\PCEGraphicsConfig.Designer.cs">
-      <DependentUpon>PCEGraphicsConfig.cs</DependentUpon>
-    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SATTools\SaturnPrefs.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SATTools\SaturnPrefs.Designer.cs">
-      <DependentUpon>SaturnPrefs.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SNESTools\SNESGameGenie.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SNESTools\SNESGameGenie.Designer.cs">
-      <DependentUpon>SNESGameGenie.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SNESTools\SNESGraphicsDebugger.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SNESTools\SNESGraphicsDebugger.Designer.cs">
-      <DependentUpon>SNESGraphicsDebugger.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SNESTools\SNESGraphicsViewer.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="SNESTools\SNESOptions.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SNESTools\SNESOptions.Designer.cs">
-      <DependentUpon>SNESOptions.cs</DependentUpon>
-    </Compile>
-    <Compile Include="N64tools\N64VideoPluginconfig.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="N64tools\N64VideoPluginconfig.Designer.cs">
-      <DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
-    </Compile>
     <Compile Include="tools\Cheats\Cheat.cs" />
     <Compile Include="tools\Cheats\CheatEdit.cs">
       <SubType>UserControl</SubType>
@@ -498,6 +339,69 @@
       <DependentUpon>CheatForm.cs</DependentUpon>
     </Compile>
     <Compile Include="tools\Cheats\CheatList.cs" />
+    <Compile Include="tools\GBA\GBAGPUView.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GBA\GBAGPUView.Designer.cs">
+      <DependentUpon>GBAGPUView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GBA\MobileBmpView.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GBA\MobileBmpView.Designer.cs">
+      <DependentUpon>MobileBmpView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GBA\MobileDetailView.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GBA\MobileDetailView.Designer.cs">
+      <DependentUpon>MobileDetailView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GB\BmpView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\GB\CGBColorChooserForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GB\CGBColorChooserForm.Designer.cs">
+      <DependentUpon>CGBColorChooserForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GB\ColorChooserForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GB\ColorChooserForm.Designer.cs">
+      <DependentUpon>ColorChooserForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GB\DualGBFileSelector.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="tools\GB\DualGBFileSelector.Designer.cs">
+      <DependentUpon>DualGBFileSelector.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GB\DualGBXMLCreator.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GB\DualGBXMLCreator.Designer.cs">
+      <DependentUpon>DualGBXMLCreator.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GB\GBGameGenie.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GB\GBGameGenie.Designer.cs">
+      <DependentUpon>GBGameGenie.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GB\GBGPUView.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GB\GBGPUView.Designer.cs">
+      <DependentUpon>GBGPUView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\Genesis\GenGameGenie.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\Genesis\GenGameGenie.Designer.cs">
+      <DependentUpon>GenGameGenie.cs</DependentUpon>
+    </Compile>
     <Compile Include="tools\HexEditor\HexColor.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -565,7 +469,114 @@
     <Compile Include="tools\Lua\LuaWriterColorConfig.Designer.cs">
       <DependentUpon>LuaWriterColorConfig.cs</DependentUpon>
     </Compile>
+    <Compile Include="tools\N64\N64VideoPluginconfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\N64\N64VideoPluginconfig.Designer.cs">
+      <DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\NES\MovieConvert.cs" />
+    <Compile Include="tools\NES\NameTableViewer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\NES\NESDebugger.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\NES\NESDebugger.Designer.cs">
+      <DependentUpon>NESDebugger.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\NES\NESGameGenie.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\NES\NESGameGenie.Designer.cs">
+      <DependentUpon>NESGameGenie.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\NES\NESGraphicsConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\NES\NESGraphicsConfig.Designer.cs">
+      <DependentUpon>NESGraphicsConfig.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\NES\NESNameTableViewer.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\NES\NESNameTableViewer.Designer.cs">
+      <DependentUpon>NESNameTableViewer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\NES\NESPPU.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\NES\NESPPU.Designer.cs">
+      <DependentUpon>NESPPU.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\NES\NESSoundConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\NES\NESSoundConfig.Designer.cs">
+      <DependentUpon>NESSoundConfig.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\NES\PaletteViewer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\NES\PatternViewer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\NES\SpriteViewer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\PCE\PCEBGCanvas.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\PCE\PCEBGViewer.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\PCE\PCEBGViewer.Designer.cs">
+      <DependentUpon>PCEBGViewer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\PCE\PCEGraphicsConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\PCE\PCEGraphicsConfig.Designer.cs">
+      <DependentUpon>PCEGraphicsConfig.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\Saturn\SaturnPrefs.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\Saturn\SaturnPrefs.Designer.cs">
+      <DependentUpon>SaturnPrefs.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\SMS\SMSGraphicsConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\SMS\SMSGraphicsConfig.Designer.cs">
+      <DependentUpon>SMSGraphicsConfig.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\SNES\SNESGameGenie.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\SNES\SNESGameGenie.Designer.cs">
+      <DependentUpon>SNESGameGenie.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\SNES\SNESGraphicsDebugger.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\SNES\SNESGraphicsDebugger.Designer.cs">
+      <DependentUpon>SNESGraphicsDebugger.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\SNES\SNESGraphicsViewer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\SNES\SNESOptions.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\SNES\SNESOptions.Designer.cs">
+      <DependentUpon>SNESOptions.cs</DependentUpon>
+    </Compile>
     <Compile Include="tools\StateVisualizer.cs" />
+    <Compile Include="tools\TI83\TI83KeyPad.cs" />
+    <Compile Include="tools\TI83\TI83KeyPad.Designer.cs">
+      <DependentUpon>TI83KeyPad.cs</DependentUpon>
+    </Compile>
     <Compile Include="tools\ToolHelpers.cs" />
     <Compile Include="tools\TraceLogger.cs">
       <SubType>Form</SubType>
@@ -738,34 +749,6 @@
     <EmbeddedResource Include="config\RewindConfig.resx">
       <DependentUpon>RewindConfig.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GBAtools\GBAGPUView.resx">
-      <DependentUpon>GBAGPUView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBAtools\MobileBmpView.resx">
-      <DependentUpon>MobileBmpView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBAtools\MobileDetailView.resx">
-      <DependentUpon>MobileDetailView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBtools\CGBColorChooserForm.resx">
-      <DependentUpon>CGBColorChooserForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBtools\ColorChooserForm.resx">
-      <DependentUpon>ColorChooserForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBtools\DualGBFileSelector.resx">
-      <DependentUpon>DualGBFileSelector.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBtools\DualGBXMLCreator.resx">
-      <DependentUpon>DualGBXMLCreator.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBtools\GBGPUView.resx">
-      <DependentUpon>GBGPUView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBtools\GBGameGenie.resx">
-      <DependentUpon>GBGameGenie.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -780,45 +763,14 @@
       <DependentUpon>NameStateForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="NEStools\NESSoundConfig.resx">
-      <DependentUpon>NESSoundConfig.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GENtools\GenGameGenie.resx">
-      <DependentUpon>GenGameGenie.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="config\NewPathConfig.resx">
       <DependentUpon>NewPathConfig.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="PCEtools\PCEBGViewer.resx">
-      <DependentUpon>PCEBGViewer.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PCEtools\PCEGraphicsConfig.resx">
-      <DependentUpon>PCEGraphicsConfig.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="SATTools\SaturnPrefs.resx">
-      <DependentUpon>SaturnPrefs.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SMStools\SMSGraphicsConfig.resx">
-      <DependentUpon>SMSGraphicsConfig.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SNESTools\SNESGameGenie.resx">
-      <DependentUpon>SNESGameGenie.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SNESTools\SNESGraphicsDebugger.resx">
-      <DependentUpon>SNESGraphicsDebugger.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SNESTools\SNESOptions.resx">
-      <DependentUpon>SNESOptions.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="N64tools\N64VideoPluginconfig.resx">
-      <DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
-    </EmbeddedResource>
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
@@ -830,6 +782,36 @@
     <EmbeddedResource Include="tools\Cheats\CheatForm.resx">
       <DependentUpon>CheatForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="tools\GBA\GBAGPUView.resx">
+      <DependentUpon>GBAGPUView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GBA\MobileBmpView.resx">
+      <DependentUpon>MobileBmpView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GBA\MobileDetailView.resx">
+      <DependentUpon>MobileDetailView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GB\CGBColorChooserForm.resx">
+      <DependentUpon>CGBColorChooserForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GB\ColorChooserForm.resx">
+      <DependentUpon>ColorChooserForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GB\DualGBFileSelector.resx">
+      <DependentUpon>DualGBFileSelector.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GB\DualGBXMLCreator.resx">
+      <DependentUpon>DualGBXMLCreator.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GB\GBGameGenie.resx">
+      <DependentUpon>GBGameGenie.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GB\GBGPUView.resx">
+      <DependentUpon>GBGPUView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\Genesis\GenGameGenie.resx">
+      <DependentUpon>GenGameGenie.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="tools\HexEditor\HexColor.resx">
       <DependentUpon>HexColor.cs</DependentUpon>
     </EmbeddedResource>
@@ -857,6 +839,54 @@
     <EmbeddedResource Include="tools\Lua\LuaWriterColorConfig.resx">
       <DependentUpon>LuaWriterColorConfig.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="tools\N64\N64VideoPluginconfig.resx">
+      <DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\NES\NESDebugger.resx">
+      <DependentUpon>NESDebugger.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\NES\NESGameGenie.resx">
+      <DependentUpon>NESGameGenie.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\NES\NESGraphicsConfig.resx">
+      <DependentUpon>NESGraphicsConfig.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\NES\NESNameTableViewer.resx">
+      <DependentUpon>NESNameTableViewer.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\NES\NESPPU.resx">
+      <DependentUpon>NESPPU.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\NES\NESSoundConfig.resx">
+      <DependentUpon>NESSoundConfig.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\NES\PatternViewer.resx">
+      <DependentUpon>PatternViewer.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\PCE\PCEBGViewer.resx">
+      <DependentUpon>PCEBGViewer.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\PCE\PCEGraphicsConfig.resx">
+      <DependentUpon>PCEGraphicsConfig.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\Saturn\SaturnPrefs.resx">
+      <DependentUpon>SaturnPrefs.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\SMS\SMSGraphicsConfig.resx">
+      <DependentUpon>SMSGraphicsConfig.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\SNES\SNESGameGenie.resx">
+      <DependentUpon>SNESGameGenie.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\SNES\SNESGraphicsDebugger.resx">
+      <DependentUpon>SNESGraphicsDebugger.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\SNES\SNESOptions.resx">
+      <DependentUpon>SNESOptions.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\TI83\TI83KeyPad.resx">
+      <DependentUpon>TI83KeyPad.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="tools\VirtualPads\VirtualPad.resx">
       <DependentUpon>VirtualPad.cs</DependentUpon>
     </EmbeddedResource>
@@ -907,19 +937,7 @@
     </Compile>
     <Compile Include="Properties\svnrev.cs" />
     <Compile Include="SavestateManager.cs" />
-    <Compile Include="SMStools\SMSGraphicsConfig.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SMStools\SMSGraphicsConfig.Designer.cs">
-      <DependentUpon>SMSGraphicsConfig.cs</DependentUpon>
-    </Compile>
     <Compile Include="Throttle.cs" />
-    <Compile Include="TI83tools\TI83KeyPad.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="TI83tools\TI83KeyPad.Designer.cs">
-      <DependentUpon>TI83KeyPad.cs</DependentUpon>
-    </Compile>
     <Compile Include="tools\MemoryViewer.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -997,33 +1015,6 @@
     <EmbeddedResource Include="movie\SubtitleMaker.resx">
       <DependentUpon>SubtitleMaker.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="NEStools\NESDebugger.resx">
-      <DependentUpon>NESDebugger.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NEStools\NESGameGenie.resx">
-      <DependentUpon>NESGameGenie.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NEStools\NESGraphicsConfig.resx">
-      <DependentUpon>NESGraphicsConfig.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NEStools\NESNameTableViewer.resx">
-      <DependentUpon>NESNameTableViewer.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NEStools\NESPPU.resx">
-      <DependentUpon>NESPPU.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NEStools\PatternViewer.resx">
-      <DependentUpon>PatternViewer.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TI83tools\TI83KeyPad.resx">
-      <DependentUpon>TI83KeyPad.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="tools\TraceLogger.resx">
       <DependentUpon>TraceLogger.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
index bffe4ab1f6..a639a68950 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
@@ -246,69 +246,6 @@
     <Compile Include="DisplayManager\DisplayManager.cs" />
     <Compile Include="DisplayManager\Filters\Hq2x.cs" />
     <Compile Include="FirmwareManager.cs" />
-    <Compile Include="GBAtools\GBAGPUView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBAtools\GBAGPUView.Designer.cs">
-      <DependentUpon>GBAGPUView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBAtools\MobileBmpView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBAtools\MobileBmpView.Designer.cs">
-      <DependentUpon>MobileBmpView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBAtools\MobileDetailView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBAtools\MobileDetailView.Designer.cs">
-      <DependentUpon>MobileDetailView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBtools\BmpView.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="GBtools\CGBColorChooserForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBtools\CGBColorChooserForm.Designer.cs">
-      <DependentUpon>CGBColorChooserForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBtools\ColorChooserForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBtools\ColorChooserForm.designer.cs">
-      <DependentUpon>ColorChooserForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBtools\DualGBFileSelector.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="GBtools\DualGBFileSelector.Designer.cs">
-      <DependentUpon>DualGBFileSelector.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBtools\DualGBXMLCreator.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBtools\DualGBXMLCreator.Designer.cs">
-      <DependentUpon>DualGBXMLCreator.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBtools\GBGameGenie.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBtools\GBGameGenie.Designer.cs">
-      <DependentUpon>GBGameGenie.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GBtools\GBGPUView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GBtools\GBGPUView.Designer.cs">
-      <DependentUpon>GBGPUView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GENtools\GenGameGenie.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GENtools\GenGameGenie.Designer.cs">
-      <DependentUpon>GenGameGenie.cs</DependentUpon>
-    </Compile>
     <Compile Include="Global.cs" />
     <Compile Include="HawkFile.cs" />
     <Compile Include="Input\ControllerBinding.cs" />
@@ -382,110 +319,14 @@
       <DependentUpon>SubtitleMaker.cs</DependentUpon>
     </Compile>
     <Compile Include="MruStack.cs" />
-    <Compile Include="N64tools\N64VideoPluginconfig.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="N64tools\N64VideoPluginconfig.Designer.cs">
-      <DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
-    </Compile>
     <Compile Include="NameStateForm.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="NameStateForm.Designer.cs">
       <DependentUpon>NameStateForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="NEStools\NameTableViewer.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="NEStools\NESDebugger.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NEStools\NESDebugger.Designer.cs">
-      <DependentUpon>NESDebugger.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NEStools\NESGameGenie.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NEStools\NESGameGenie.Designer.cs">
-      <DependentUpon>NESGameGenie.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NEStools\NESGraphicsConfig.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NEStools\NESGraphicsConfig.Designer.cs">
-      <DependentUpon>NESGraphicsConfig.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NEStools\NESNameTableViewer.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NEStools\NESNameTableViewer.Designer.cs">
-      <DependentUpon>NESNameTableViewer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NEStools\NESPPU.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NEStools\NESPPU.Designer.cs">
-      <DependentUpon>NESPPU.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NEStools\NESSoundConfig.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NEStools\NESSoundConfig.Designer.cs">
-      <DependentUpon>NESSoundConfig.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NEStools\PaletteViewer.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="NEStools\PatternViewer.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="NEStools\SpriteViewer.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PCEtools\PCEBGCanvas.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PCEtools\PCEBGViewer.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PCEtools\PCEBGViewer.Designer.cs">
-      <DependentUpon>PCEBGViewer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PCEtools\PCEGraphicsConfig.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PCEtools\PCEGraphicsConfig.Designer.cs">
-      <DependentUpon>PCEGraphicsConfig.cs</DependentUpon>
-    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SATTools\SaturnPrefs.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SATTools\SaturnPrefs.Designer.cs">
-      <DependentUpon>SaturnPrefs.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SNESTools\SNESGameGenie.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SNESTools\SNESGameGenie.Designer.cs">
-      <DependentUpon>SNESGameGenie.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SNESTools\SNESGraphicsDebugger.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SNESTools\SNESGraphicsDebugger.Designer.cs">
-      <DependentUpon>SNESGraphicsDebugger.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SNESTools\SNESGraphicsViewer.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="SNESTools\SNESOptions.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SNESTools\SNESOptions.Designer.cs">
-      <DependentUpon>SNESOptions.cs</DependentUpon>
-    </Compile>
     <Compile Include="tools\Cheats\CheatEdit.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -500,6 +341,69 @@
     <Compile Include="tools\Cheats\CheatForm.Designer.cs">
       <DependentUpon>CheatForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="tools\GBA\GBAGPUView.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GBA\GBAGPUView.Designer.cs">
+      <DependentUpon>GBAGPUView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GBA\MobileBmpView.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GBA\MobileBmpView.Designer.cs">
+      <DependentUpon>MobileBmpView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GBA\MobileDetailView.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GBA\MobileDetailView.Designer.cs">
+      <DependentUpon>MobileDetailView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GB\BmpView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\GB\CGBColorChooserForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GB\CGBColorChooserForm.Designer.cs">
+      <DependentUpon>CGBColorChooserForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GB\ColorChooserForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GB\ColorChooserForm.Designer.cs">
+      <DependentUpon>ColorChooserForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GB\DualGBFileSelector.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="tools\GB\DualGBFileSelector.Designer.cs">
+      <DependentUpon>DualGBFileSelector.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GB\DualGBXMLCreator.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GB\DualGBXMLCreator.Designer.cs">
+      <DependentUpon>DualGBXMLCreator.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GB\GBGameGenie.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GB\GBGameGenie.Designer.cs">
+      <DependentUpon>GBGameGenie.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\GB\GBGPUView.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\GB\GBGPUView.Designer.cs">
+      <DependentUpon>GBGPUView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\Genesis\GenGameGenie.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\Genesis\GenGameGenie.Designer.cs">
+      <DependentUpon>GenGameGenie.cs</DependentUpon>
+    </Compile>
     <Compile Include="tools\HexEditor\HexColor.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -567,7 +471,114 @@
     <Compile Include="tools\Lua\LuaWriterColorConfig.Designer.cs">
       <DependentUpon>LuaWriterColorConfig.cs</DependentUpon>
     </Compile>
+    <Compile Include="tools\N64\N64VideoPluginconfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\N64\N64VideoPluginconfig.Designer.cs">
+      <DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\NES\MovieConvert.cs" />
+    <Compile Include="tools\NES\NameTableViewer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\NES\NESDebugger.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\NES\NESDebugger.Designer.cs">
+      <DependentUpon>NESDebugger.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\NES\NESGameGenie.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\NES\NESGameGenie.Designer.cs">
+      <DependentUpon>NESGameGenie.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\NES\NESGraphicsConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\NES\NESGraphicsConfig.Designer.cs">
+      <DependentUpon>NESGraphicsConfig.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\NES\NESNameTableViewer.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\NES\NESNameTableViewer.Designer.cs">
+      <DependentUpon>NESNameTableViewer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\NES\NESPPU.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\NES\NESPPU.Designer.cs">
+      <DependentUpon>NESPPU.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\NES\NESSoundConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\NES\NESSoundConfig.Designer.cs">
+      <DependentUpon>NESSoundConfig.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\NES\PaletteViewer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\NES\PatternViewer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\NES\SpriteViewer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\PCE\PCEBGCanvas.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\PCE\PCEBGViewer.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\PCE\PCEBGViewer.Designer.cs">
+      <DependentUpon>PCEBGViewer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\PCE\PCEGraphicsConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\PCE\PCEGraphicsConfig.Designer.cs">
+      <DependentUpon>PCEGraphicsConfig.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\Saturn\SaturnPrefs.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\Saturn\SaturnPrefs.Designer.cs">
+      <DependentUpon>SaturnPrefs.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\SMS\SMSGraphicsConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\SMS\SMSGraphicsConfig.Designer.cs">
+      <DependentUpon>SMSGraphicsConfig.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\SNES\SNESGameGenie.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\SNES\SNESGameGenie.Designer.cs">
+      <DependentUpon>SNESGameGenie.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\SNES\SNESGraphicsDebugger.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\SNES\SNESGraphicsDebugger.Designer.cs">
+      <DependentUpon>SNESGraphicsDebugger.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\SNES\SNESGraphicsViewer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="tools\SNES\SNESOptions.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\SNES\SNESOptions.Designer.cs">
+      <DependentUpon>SNESOptions.cs</DependentUpon>
+    </Compile>
     <Compile Include="tools\StateVisualizer.cs" />
+    <Compile Include="tools\TI83\TI83KeyPad.cs" />
+    <Compile Include="tools\TI83\TI83KeyPad.Designer.cs">
+      <DependentUpon>TI83KeyPad.cs</DependentUpon>
+    </Compile>
     <Compile Include="tools\ToolHelpers.cs" />
     <Compile Include="tools\TraceLogger.cs">
       <SubType>Form</SubType>
@@ -743,36 +754,6 @@
     <EmbeddedResource Include="config\RewindConfig.resx">
       <DependentUpon>RewindConfig.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GBAtools\GBAGPUView.resx">
-      <DependentUpon>GBAGPUView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBAtools\MobileBmpView.resx">
-      <DependentUpon>MobileBmpView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBAtools\MobileDetailView.resx">
-      <DependentUpon>MobileDetailView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBtools\CGBColorChooserForm.resx">
-      <DependentUpon>CGBColorChooserForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBtools\ColorChooserForm.resx">
-      <DependentUpon>ColorChooserForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBtools\DualGBFileSelector.resx">
-      <DependentUpon>DualGBFileSelector.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBtools\DualGBXMLCreator.resx">
-      <DependentUpon>DualGBXMLCreator.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBtools\GBGameGenie.resx">
-      <DependentUpon>GBGameGenie.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GBtools\GBGPUView.resx">
-      <DependentUpon>GBGPUView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GENtools\GenGameGenie.resx">
-      <DependentUpon>GenGameGenie.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -783,42 +764,15 @@
     <EmbeddedResource Include="movie\RecordMovie.resx">
       <DependentUpon>RecordMovie.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="N64tools\N64VideoPluginconfig.resx">
-      <DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="NameStateForm.resx">
       <DependentUpon>NameStateForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="NEStools\NESSoundConfig.resx">
-      <DependentUpon>NESSoundConfig.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PCEtools\PCEBGViewer.resx">
-      <DependentUpon>PCEBGViewer.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PCEtools\PCEGraphicsConfig.resx">
-      <DependentUpon>PCEGraphicsConfig.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="SATTools\SaturnPrefs.resx">
-      <DependentUpon>SaturnPrefs.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SMStools\SMSGraphicsConfig.resx">
-      <DependentUpon>SMSGraphicsConfig.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SNESTools\SNESGameGenie.resx">
-      <DependentUpon>SNESGameGenie.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SNESTools\SNESGraphicsDebugger.resx">
-      <DependentUpon>SNESGraphicsDebugger.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SNESTools\SNESOptions.resx">
-      <DependentUpon>SNESOptions.cs</DependentUpon>
-    </EmbeddedResource>
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
@@ -830,6 +784,36 @@
     <EmbeddedResource Include="tools\Cheats\CheatForm.resx">
       <DependentUpon>CheatForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="tools\GBA\GBAGPUView.resx">
+      <DependentUpon>GBAGPUView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GBA\MobileBmpView.resx">
+      <DependentUpon>MobileBmpView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GBA\MobileDetailView.resx">
+      <DependentUpon>MobileDetailView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GB\CGBColorChooserForm.resx">
+      <DependentUpon>CGBColorChooserForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GB\ColorChooserForm.resx">
+      <DependentUpon>ColorChooserForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GB\DualGBFileSelector.resx">
+      <DependentUpon>DualGBFileSelector.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GB\DualGBXMLCreator.resx">
+      <DependentUpon>DualGBXMLCreator.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GB\GBGameGenie.resx">
+      <DependentUpon>GBGameGenie.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\GB\GBGPUView.resx">
+      <DependentUpon>GBGPUView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\Genesis\GenGameGenie.resx">
+      <DependentUpon>GenGameGenie.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="tools\HexEditor\HexColor.resx">
       <DependentUpon>HexColor.cs</DependentUpon>
     </EmbeddedResource>
@@ -857,6 +841,54 @@
     <EmbeddedResource Include="tools\Lua\LuaWriterColorConfig.resx">
       <DependentUpon>LuaWriterColorConfig.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="tools\N64\N64VideoPluginconfig.resx">
+      <DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\NES\NESDebugger.resx">
+      <DependentUpon>NESDebugger.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\NES\NESGameGenie.resx">
+      <DependentUpon>NESGameGenie.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\NES\NESGraphicsConfig.resx">
+      <DependentUpon>NESGraphicsConfig.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\NES\NESNameTableViewer.resx">
+      <DependentUpon>NESNameTableViewer.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\NES\NESPPU.resx">
+      <DependentUpon>NESPPU.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\NES\NESSoundConfig.resx">
+      <DependentUpon>NESSoundConfig.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\NES\PatternViewer.resx">
+      <DependentUpon>PatternViewer.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\PCE\PCEBGViewer.resx">
+      <DependentUpon>PCEBGViewer.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\PCE\PCEGraphicsConfig.resx">
+      <DependentUpon>PCEGraphicsConfig.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\Saturn\SaturnPrefs.resx">
+      <DependentUpon>SaturnPrefs.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\SMS\SMSGraphicsConfig.resx">
+      <DependentUpon>SMSGraphicsConfig.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\SNES\SNESGameGenie.resx">
+      <DependentUpon>SNESGameGenie.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\SNES\SNESGraphicsDebugger.resx">
+      <DependentUpon>SNESGraphicsDebugger.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\SNES\SNESOptions.resx">
+      <DependentUpon>SNESOptions.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\TI83\TI83KeyPad.resx">
+      <DependentUpon>TI83KeyPad.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="tools\VirtualPads\VirtualPad.resx">
       <DependentUpon>VirtualPad.cs</DependentUpon>
     </EmbeddedResource>
@@ -907,19 +939,7 @@
     </Compile>
     <Compile Include="Properties\svnrev.cs" />
     <Compile Include="SavestateManager.cs" />
-    <Compile Include="SMStools\SMSGraphicsConfig.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SMStools\SMSGraphicsConfig.Designer.cs">
-      <DependentUpon>SMSGraphicsConfig.cs</DependentUpon>
-    </Compile>
     <Compile Include="Throttle.cs" />
-    <Compile Include="TI83tools\TI83KeyPad.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="TI83tools\TI83KeyPad.Designer.cs">
-      <DependentUpon>TI83KeyPad.cs</DependentUpon>
-    </Compile>
     <Compile Include="tools\MemoryViewer.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -997,33 +1017,6 @@
     <EmbeddedResource Include="movie\SubtitleMaker.resx">
       <DependentUpon>SubtitleMaker.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="NEStools\NESDebugger.resx">
-      <DependentUpon>NESDebugger.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NEStools\NESGameGenie.resx">
-      <DependentUpon>NESGameGenie.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NEStools\NESGraphicsConfig.resx">
-      <DependentUpon>NESGraphicsConfig.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NEStools\NESNameTableViewer.resx">
-      <DependentUpon>NESNameTableViewer.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NEStools\NESPPU.resx">
-      <DependentUpon>NESPPU.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NEStools\PatternViewer.resx">
-      <DependentUpon>PatternViewer.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TI83tools\TI83KeyPad.resx">
-      <DependentUpon>TI83KeyPad.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="tools\TraceLogger.resx">
       <DependentUpon>TraceLogger.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/BizHawk.MultiClient/GBtools/BmpView.cs b/BizHawk.MultiClient/tools/GB/BmpView.cs
similarity index 100%
rename from BizHawk.MultiClient/GBtools/BmpView.cs
rename to BizHawk.MultiClient/tools/GB/BmpView.cs
diff --git a/BizHawk.MultiClient/GBtools/CGBColorChooserForm.Designer.cs b/BizHawk.MultiClient/tools/GB/CGBColorChooserForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/GBtools/CGBColorChooserForm.Designer.cs
rename to BizHawk.MultiClient/tools/GB/CGBColorChooserForm.Designer.cs
diff --git a/BizHawk.MultiClient/GBtools/CGBColorChooserForm.cs b/BizHawk.MultiClient/tools/GB/CGBColorChooserForm.cs
similarity index 100%
rename from BizHawk.MultiClient/GBtools/CGBColorChooserForm.cs
rename to BizHawk.MultiClient/tools/GB/CGBColorChooserForm.cs
diff --git a/BizHawk.MultiClient/GBtools/CGBColorChooserForm.resx b/BizHawk.MultiClient/tools/GB/CGBColorChooserForm.resx
similarity index 100%
rename from BizHawk.MultiClient/GBtools/CGBColorChooserForm.resx
rename to BizHawk.MultiClient/tools/GB/CGBColorChooserForm.resx
diff --git a/BizHawk.MultiClient/GBtools/ColorChooserForm.Designer.cs b/BizHawk.MultiClient/tools/GB/ColorChooserForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/GBtools/ColorChooserForm.Designer.cs
rename to BizHawk.MultiClient/tools/GB/ColorChooserForm.Designer.cs
diff --git a/BizHawk.MultiClient/GBtools/ColorChooserForm.cs b/BizHawk.MultiClient/tools/GB/ColorChooserForm.cs
similarity index 100%
rename from BizHawk.MultiClient/GBtools/ColorChooserForm.cs
rename to BizHawk.MultiClient/tools/GB/ColorChooserForm.cs
diff --git a/BizHawk.MultiClient/GBtools/ColorChooserForm.resx b/BizHawk.MultiClient/tools/GB/ColorChooserForm.resx
similarity index 100%
rename from BizHawk.MultiClient/GBtools/ColorChooserForm.resx
rename to BizHawk.MultiClient/tools/GB/ColorChooserForm.resx
diff --git a/BizHawk.MultiClient/GBtools/DualGBFileSelector.Designer.cs b/BizHawk.MultiClient/tools/GB/DualGBFileSelector.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/GBtools/DualGBFileSelector.Designer.cs
rename to BizHawk.MultiClient/tools/GB/DualGBFileSelector.Designer.cs
diff --git a/BizHawk.MultiClient/GBtools/DualGBFileSelector.cs b/BizHawk.MultiClient/tools/GB/DualGBFileSelector.cs
similarity index 100%
rename from BizHawk.MultiClient/GBtools/DualGBFileSelector.cs
rename to BizHawk.MultiClient/tools/GB/DualGBFileSelector.cs
diff --git a/BizHawk.MultiClient/GBtools/DualGBFileSelector.resx b/BizHawk.MultiClient/tools/GB/DualGBFileSelector.resx
similarity index 100%
rename from BizHawk.MultiClient/GBtools/DualGBFileSelector.resx
rename to BizHawk.MultiClient/tools/GB/DualGBFileSelector.resx
diff --git a/BizHawk.MultiClient/GBtools/DualGBXMLCreator.Designer.cs b/BizHawk.MultiClient/tools/GB/DualGBXMLCreator.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/GBtools/DualGBXMLCreator.Designer.cs
rename to BizHawk.MultiClient/tools/GB/DualGBXMLCreator.Designer.cs
diff --git a/BizHawk.MultiClient/GBtools/DualGBXMLCreator.cs b/BizHawk.MultiClient/tools/GB/DualGBXMLCreator.cs
similarity index 100%
rename from BizHawk.MultiClient/GBtools/DualGBXMLCreator.cs
rename to BizHawk.MultiClient/tools/GB/DualGBXMLCreator.cs
diff --git a/BizHawk.MultiClient/GBtools/DualGBXMLCreator.resx b/BizHawk.MultiClient/tools/GB/DualGBXMLCreator.resx
similarity index 100%
rename from BizHawk.MultiClient/GBtools/DualGBXMLCreator.resx
rename to BizHawk.MultiClient/tools/GB/DualGBXMLCreator.resx
diff --git a/BizHawk.MultiClient/GBtools/GBGPUView.Designer.cs b/BizHawk.MultiClient/tools/GB/GBGPUView.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/GBtools/GBGPUView.Designer.cs
rename to BizHawk.MultiClient/tools/GB/GBGPUView.Designer.cs
diff --git a/BizHawk.MultiClient/GBtools/GBGPUView.cs b/BizHawk.MultiClient/tools/GB/GBGPUView.cs
similarity index 100%
rename from BizHawk.MultiClient/GBtools/GBGPUView.cs
rename to BizHawk.MultiClient/tools/GB/GBGPUView.cs
diff --git a/BizHawk.MultiClient/GBtools/GBGPUView.resx b/BizHawk.MultiClient/tools/GB/GBGPUView.resx
similarity index 100%
rename from BizHawk.MultiClient/GBtools/GBGPUView.resx
rename to BizHawk.MultiClient/tools/GB/GBGPUView.resx
diff --git a/BizHawk.MultiClient/GBtools/GBGameGenie.Designer.cs b/BizHawk.MultiClient/tools/GB/GBGameGenie.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/GBtools/GBGameGenie.Designer.cs
rename to BizHawk.MultiClient/tools/GB/GBGameGenie.Designer.cs
diff --git a/BizHawk.MultiClient/GBtools/GBGameGenie.cs b/BizHawk.MultiClient/tools/GB/GBGameGenie.cs
similarity index 100%
rename from BizHawk.MultiClient/GBtools/GBGameGenie.cs
rename to BizHawk.MultiClient/tools/GB/GBGameGenie.cs
diff --git a/BizHawk.MultiClient/GBtools/GBGameGenie.resx b/BizHawk.MultiClient/tools/GB/GBGameGenie.resx
similarity index 100%
rename from BizHawk.MultiClient/GBtools/GBGameGenie.resx
rename to BizHawk.MultiClient/tools/GB/GBGameGenie.resx
diff --git a/BizHawk.MultiClient/GBAtools/GBAGPUView.Designer.cs b/BizHawk.MultiClient/tools/GBA/GBAGPUView.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/GBAtools/GBAGPUView.Designer.cs
rename to BizHawk.MultiClient/tools/GBA/GBAGPUView.Designer.cs
diff --git a/BizHawk.MultiClient/GBAtools/GBAGPUView.cs b/BizHawk.MultiClient/tools/GBA/GBAGPUView.cs
similarity index 100%
rename from BizHawk.MultiClient/GBAtools/GBAGPUView.cs
rename to BizHawk.MultiClient/tools/GBA/GBAGPUView.cs
diff --git a/BizHawk.MultiClient/GBAtools/GBAGPUView.resx b/BizHawk.MultiClient/tools/GBA/GBAGPUView.resx
similarity index 100%
rename from BizHawk.MultiClient/GBAtools/GBAGPUView.resx
rename to BizHawk.MultiClient/tools/GBA/GBAGPUView.resx
diff --git a/BizHawk.MultiClient/GBAtools/MobileBmpView.Designer.cs b/BizHawk.MultiClient/tools/GBA/MobileBmpView.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/GBAtools/MobileBmpView.Designer.cs
rename to BizHawk.MultiClient/tools/GBA/MobileBmpView.Designer.cs
diff --git a/BizHawk.MultiClient/GBAtools/MobileBmpView.cs b/BizHawk.MultiClient/tools/GBA/MobileBmpView.cs
similarity index 100%
rename from BizHawk.MultiClient/GBAtools/MobileBmpView.cs
rename to BizHawk.MultiClient/tools/GBA/MobileBmpView.cs
diff --git a/BizHawk.MultiClient/GBAtools/MobileBmpView.resx b/BizHawk.MultiClient/tools/GBA/MobileBmpView.resx
similarity index 100%
rename from BizHawk.MultiClient/GBAtools/MobileBmpView.resx
rename to BizHawk.MultiClient/tools/GBA/MobileBmpView.resx
diff --git a/BizHawk.MultiClient/GBAtools/MobileDetailView.Designer.cs b/BizHawk.MultiClient/tools/GBA/MobileDetailView.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/GBAtools/MobileDetailView.Designer.cs
rename to BizHawk.MultiClient/tools/GBA/MobileDetailView.Designer.cs
diff --git a/BizHawk.MultiClient/GBAtools/MobileDetailView.cs b/BizHawk.MultiClient/tools/GBA/MobileDetailView.cs
similarity index 100%
rename from BizHawk.MultiClient/GBAtools/MobileDetailView.cs
rename to BizHawk.MultiClient/tools/GBA/MobileDetailView.cs
diff --git a/BizHawk.MultiClient/GBAtools/MobileDetailView.resx b/BizHawk.MultiClient/tools/GBA/MobileDetailView.resx
similarity index 100%
rename from BizHawk.MultiClient/GBAtools/MobileDetailView.resx
rename to BizHawk.MultiClient/tools/GBA/MobileDetailView.resx
diff --git a/BizHawk.MultiClient/GENtools/GenGameGenie.Designer.cs b/BizHawk.MultiClient/tools/Genesis/GenGameGenie.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/GENtools/GenGameGenie.Designer.cs
rename to BizHawk.MultiClient/tools/Genesis/GenGameGenie.Designer.cs
diff --git a/BizHawk.MultiClient/GENtools/GenGameGenie.cs b/BizHawk.MultiClient/tools/Genesis/GenGameGenie.cs
similarity index 100%
rename from BizHawk.MultiClient/GENtools/GenGameGenie.cs
rename to BizHawk.MultiClient/tools/Genesis/GenGameGenie.cs
diff --git a/BizHawk.MultiClient/GENtools/GenGameGenie.resx b/BizHawk.MultiClient/tools/Genesis/GenGameGenie.resx
similarity index 100%
rename from BizHawk.MultiClient/GENtools/GenGameGenie.resx
rename to BizHawk.MultiClient/tools/Genesis/GenGameGenie.resx
diff --git a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs b/BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs
rename to BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.Designer.cs
diff --git a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs b/BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.cs
similarity index 100%
rename from BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs
rename to BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.cs
diff --git a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.resx b/BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.resx
similarity index 100%
rename from BizHawk.MultiClient/N64tools/N64VideoPluginconfig.resx
rename to BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.resx
diff --git a/BizHawk.MultiClient/NEStools/MovieConvert.cs b/BizHawk.MultiClient/tools/NES/MovieConvert.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/MovieConvert.cs
rename to BizHawk.MultiClient/tools/NES/MovieConvert.cs
diff --git a/BizHawk.MultiClient/NEStools/NESDebugger.Designer.cs b/BizHawk.MultiClient/tools/NES/NESDebugger.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESDebugger.Designer.cs
rename to BizHawk.MultiClient/tools/NES/NESDebugger.Designer.cs
diff --git a/BizHawk.MultiClient/NEStools/NESDebugger.cs b/BizHawk.MultiClient/tools/NES/NESDebugger.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESDebugger.cs
rename to BizHawk.MultiClient/tools/NES/NESDebugger.cs
diff --git a/BizHawk.MultiClient/NEStools/NESDebugger.resx b/BizHawk.MultiClient/tools/NES/NESDebugger.resx
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESDebugger.resx
rename to BizHawk.MultiClient/tools/NES/NESDebugger.resx
diff --git a/BizHawk.MultiClient/NEStools/NESGameGenie.Designer.cs b/BizHawk.MultiClient/tools/NES/NESGameGenie.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESGameGenie.Designer.cs
rename to BizHawk.MultiClient/tools/NES/NESGameGenie.Designer.cs
diff --git a/BizHawk.MultiClient/NEStools/NESGameGenie.cs b/BizHawk.MultiClient/tools/NES/NESGameGenie.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESGameGenie.cs
rename to BizHawk.MultiClient/tools/NES/NESGameGenie.cs
diff --git a/BizHawk.MultiClient/NEStools/NESGameGenie.resx b/BizHawk.MultiClient/tools/NES/NESGameGenie.resx
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESGameGenie.resx
rename to BizHawk.MultiClient/tools/NES/NESGameGenie.resx
diff --git a/BizHawk.MultiClient/NEStools/NESGraphicsConfig.Designer.cs b/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESGraphicsConfig.Designer.cs
rename to BizHawk.MultiClient/tools/NES/NESGraphicsConfig.Designer.cs
diff --git a/BizHawk.MultiClient/NEStools/NESGraphicsConfig.cs b/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESGraphicsConfig.cs
rename to BizHawk.MultiClient/tools/NES/NESGraphicsConfig.cs
diff --git a/BizHawk.MultiClient/NEStools/NESGraphicsConfig.resx b/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESGraphicsConfig.resx
rename to BizHawk.MultiClient/tools/NES/NESGraphicsConfig.resx
diff --git a/BizHawk.MultiClient/NEStools/NESNameTableViewer.Designer.cs b/BizHawk.MultiClient/tools/NES/NESNameTableViewer.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESNameTableViewer.Designer.cs
rename to BizHawk.MultiClient/tools/NES/NESNameTableViewer.Designer.cs
diff --git a/BizHawk.MultiClient/NEStools/NESNameTableViewer.cs b/BizHawk.MultiClient/tools/NES/NESNameTableViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESNameTableViewer.cs
rename to BizHawk.MultiClient/tools/NES/NESNameTableViewer.cs
diff --git a/BizHawk.MultiClient/NEStools/NESNameTableViewer.resx b/BizHawk.MultiClient/tools/NES/NESNameTableViewer.resx
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESNameTableViewer.resx
rename to BizHawk.MultiClient/tools/NES/NESNameTableViewer.resx
diff --git a/BizHawk.MultiClient/NEStools/NESPPU.Designer.cs b/BizHawk.MultiClient/tools/NES/NESPPU.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESPPU.Designer.cs
rename to BizHawk.MultiClient/tools/NES/NESPPU.Designer.cs
diff --git a/BizHawk.MultiClient/NEStools/NESPPU.cs b/BizHawk.MultiClient/tools/NES/NESPPU.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESPPU.cs
rename to BizHawk.MultiClient/tools/NES/NESPPU.cs
diff --git a/BizHawk.MultiClient/NEStools/NESPPU.resx b/BizHawk.MultiClient/tools/NES/NESPPU.resx
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESPPU.resx
rename to BizHawk.MultiClient/tools/NES/NESPPU.resx
diff --git a/BizHawk.MultiClient/NEStools/NESSoundConfig.Designer.cs b/BizHawk.MultiClient/tools/NES/NESSoundConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESSoundConfig.Designer.cs
rename to BizHawk.MultiClient/tools/NES/NESSoundConfig.Designer.cs
diff --git a/BizHawk.MultiClient/NEStools/NESSoundConfig.cs b/BizHawk.MultiClient/tools/NES/NESSoundConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESSoundConfig.cs
rename to BizHawk.MultiClient/tools/NES/NESSoundConfig.cs
diff --git a/BizHawk.MultiClient/NEStools/NESSoundConfig.resx b/BizHawk.MultiClient/tools/NES/NESSoundConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NESSoundConfig.resx
rename to BizHawk.MultiClient/tools/NES/NESSoundConfig.resx
diff --git a/BizHawk.MultiClient/NEStools/NameTableViewer.cs b/BizHawk.MultiClient/tools/NES/NameTableViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/NameTableViewer.cs
rename to BizHawk.MultiClient/tools/NES/NameTableViewer.cs
diff --git a/BizHawk.MultiClient/NEStools/PaletteViewer.cs b/BizHawk.MultiClient/tools/NES/PaletteViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/PaletteViewer.cs
rename to BizHawk.MultiClient/tools/NES/PaletteViewer.cs
diff --git a/BizHawk.MultiClient/NEStools/PatternViewer.cs b/BizHawk.MultiClient/tools/NES/PatternViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/PatternViewer.cs
rename to BizHawk.MultiClient/tools/NES/PatternViewer.cs
diff --git a/BizHawk.MultiClient/NEStools/PatternViewer.resx b/BizHawk.MultiClient/tools/NES/PatternViewer.resx
similarity index 100%
rename from BizHawk.MultiClient/NEStools/PatternViewer.resx
rename to BizHawk.MultiClient/tools/NES/PatternViewer.resx
diff --git a/BizHawk.MultiClient/NEStools/SpriteViewer.cs b/BizHawk.MultiClient/tools/NES/SpriteViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/NEStools/SpriteViewer.cs
rename to BizHawk.MultiClient/tools/NES/SpriteViewer.cs
diff --git a/BizHawk.MultiClient/PCEtools/PCEBGCanvas.cs b/BizHawk.MultiClient/tools/PCE/PCEBGCanvas.cs
similarity index 100%
rename from BizHawk.MultiClient/PCEtools/PCEBGCanvas.cs
rename to BizHawk.MultiClient/tools/PCE/PCEBGCanvas.cs
diff --git a/BizHawk.MultiClient/PCEtools/PCEBGViewer.Designer.cs b/BizHawk.MultiClient/tools/PCE/PCEBGViewer.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/PCEtools/PCEBGViewer.Designer.cs
rename to BizHawk.MultiClient/tools/PCE/PCEBGViewer.Designer.cs
diff --git a/BizHawk.MultiClient/PCEtools/PCEBGViewer.cs b/BizHawk.MultiClient/tools/PCE/PCEBGViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/PCEtools/PCEBGViewer.cs
rename to BizHawk.MultiClient/tools/PCE/PCEBGViewer.cs
diff --git a/BizHawk.MultiClient/PCEtools/PCEBGViewer.resx b/BizHawk.MultiClient/tools/PCE/PCEBGViewer.resx
similarity index 100%
rename from BizHawk.MultiClient/PCEtools/PCEBGViewer.resx
rename to BizHawk.MultiClient/tools/PCE/PCEBGViewer.resx
diff --git a/BizHawk.MultiClient/PCEtools/PCEGraphicsConfig.Designer.cs b/BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/PCEtools/PCEGraphicsConfig.Designer.cs
rename to BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.Designer.cs
diff --git a/BizHawk.MultiClient/PCEtools/PCEGraphicsConfig.cs b/BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/PCEtools/PCEGraphicsConfig.cs
rename to BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.cs
diff --git a/BizHawk.MultiClient/PCEtools/PCEGraphicsConfig.resx b/BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/PCEtools/PCEGraphicsConfig.resx
rename to BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.resx
diff --git a/BizHawk.MultiClient/SMStools/SMSGraphicsConfig.Designer.cs b/BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/SMStools/SMSGraphicsConfig.Designer.cs
rename to BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.Designer.cs
diff --git a/BizHawk.MultiClient/SMStools/SMSGraphicsConfig.cs b/BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/SMStools/SMSGraphicsConfig.cs
rename to BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.cs
diff --git a/BizHawk.MultiClient/SMStools/SMSGraphicsConfig.resx b/BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/SMStools/SMSGraphicsConfig.resx
rename to BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.resx
diff --git a/BizHawk.MultiClient/SNESTools/SNESGameGenie.Designer.cs b/BizHawk.MultiClient/tools/SNES/SNESGameGenie.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/SNESTools/SNESGameGenie.Designer.cs
rename to BizHawk.MultiClient/tools/SNES/SNESGameGenie.Designer.cs
diff --git a/BizHawk.MultiClient/SNESTools/SNESGameGenie.cs b/BizHawk.MultiClient/tools/SNES/SNESGameGenie.cs
similarity index 100%
rename from BizHawk.MultiClient/SNESTools/SNESGameGenie.cs
rename to BizHawk.MultiClient/tools/SNES/SNESGameGenie.cs
diff --git a/BizHawk.MultiClient/SNESTools/SNESGameGenie.resx b/BizHawk.MultiClient/tools/SNES/SNESGameGenie.resx
similarity index 100%
rename from BizHawk.MultiClient/SNESTools/SNESGameGenie.resx
rename to BizHawk.MultiClient/tools/SNES/SNESGameGenie.resx
diff --git a/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.Designer.cs b/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.Designer.cs
rename to BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.Designer.cs
diff --git a/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.cs b/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.cs
similarity index 100%
rename from BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.cs
rename to BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.cs
diff --git a/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.resx b/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.resx
similarity index 100%
rename from BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.resx
rename to BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.resx
diff --git a/BizHawk.MultiClient/SNESTools/SNESGraphicsViewer.cs b/BizHawk.MultiClient/tools/SNES/SNESGraphicsViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/SNESTools/SNESGraphicsViewer.cs
rename to BizHawk.MultiClient/tools/SNES/SNESGraphicsViewer.cs
diff --git a/BizHawk.MultiClient/SNESTools/SNESOptions.Designer.cs b/BizHawk.MultiClient/tools/SNES/SNESOptions.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/SNESTools/SNESOptions.Designer.cs
rename to BizHawk.MultiClient/tools/SNES/SNESOptions.Designer.cs
diff --git a/BizHawk.MultiClient/SNESTools/SNESOptions.cs b/BizHawk.MultiClient/tools/SNES/SNESOptions.cs
similarity index 100%
rename from BizHawk.MultiClient/SNESTools/SNESOptions.cs
rename to BizHawk.MultiClient/tools/SNES/SNESOptions.cs
diff --git a/BizHawk.MultiClient/SNESTools/SNESOptions.resx b/BizHawk.MultiClient/tools/SNES/SNESOptions.resx
similarity index 100%
rename from BizHawk.MultiClient/SNESTools/SNESOptions.resx
rename to BizHawk.MultiClient/tools/SNES/SNESOptions.resx
diff --git a/BizHawk.MultiClient/SATTools/SaturnPrefs.Designer.cs b/BizHawk.MultiClient/tools/Saturn/SaturnPrefs.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/SATTools/SaturnPrefs.Designer.cs
rename to BizHawk.MultiClient/tools/Saturn/SaturnPrefs.Designer.cs
diff --git a/BizHawk.MultiClient/SATTools/SaturnPrefs.cs b/BizHawk.MultiClient/tools/Saturn/SaturnPrefs.cs
similarity index 100%
rename from BizHawk.MultiClient/SATTools/SaturnPrefs.cs
rename to BizHawk.MultiClient/tools/Saturn/SaturnPrefs.cs
diff --git a/BizHawk.MultiClient/SATTools/SaturnPrefs.resx b/BizHawk.MultiClient/tools/Saturn/SaturnPrefs.resx
similarity index 100%
rename from BizHawk.MultiClient/SATTools/SaturnPrefs.resx
rename to BizHawk.MultiClient/tools/Saturn/SaturnPrefs.resx
diff --git a/BizHawk.MultiClient/TI83tools/TI83KeyPad.Designer.cs b/BizHawk.MultiClient/tools/TI83/TI83KeyPad.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/TI83tools/TI83KeyPad.Designer.cs
rename to BizHawk.MultiClient/tools/TI83/TI83KeyPad.Designer.cs
diff --git a/BizHawk.MultiClient/TI83tools/TI83KeyPad.cs b/BizHawk.MultiClient/tools/TI83/TI83KeyPad.cs
similarity index 100%
rename from BizHawk.MultiClient/TI83tools/TI83KeyPad.cs
rename to BizHawk.MultiClient/tools/TI83/TI83KeyPad.cs
diff --git a/BizHawk.MultiClient/TI83tools/TI83KeyPad.resx b/BizHawk.MultiClient/tools/TI83/TI83KeyPad.resx
similarity index 100%
rename from BizHawk.MultiClient/TI83tools/TI83KeyPad.resx
rename to BizHawk.MultiClient/tools/TI83/TI83KeyPad.resx