diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index aed1513d10..7e7b2faa1f 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -197,6 +197,23 @@
     <Compile Include="config\FirmwaresConfigInfo.Designer.cs">
       <DependentUpon>FirmwaresConfigInfo.cs</DependentUpon>
     </Compile>
+    <Compile Include="config\GB\BmpView.cs" />
+    <Compile Include="config\GB\CGBColorChooserForm.cs" />
+    <Compile Include="config\GB\CGBColorChooserForm.Designer.cs">
+      <DependentUpon>CGBColorChooserForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="config\GB\ColorChooserForm.cs" />
+    <Compile Include="config\GB\ColorChooserForm.Designer.cs">
+      <DependentUpon>ColorChooserForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="config\GB\DualGBFileSelector.cs" />
+    <Compile Include="config\GB\DualGBFileSelector.Designer.cs">
+      <DependentUpon>DualGBFileSelector.cs</DependentUpon>
+    </Compile>
+    <Compile Include="config\GB\DualGBXMLCreator.cs" />
+    <Compile Include="config\GB\DualGBXMLCreator.Designer.cs">
+      <DependentUpon>DualGBXMLCreator.cs</DependentUpon>
+    </Compile>
     <Compile Include="config\GifAnimator.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -218,6 +235,18 @@
     <Compile Include="config\MessageConfig.Designer.cs">
       <DependentUpon>MessageConfig.cs</DependentUpon>
     </Compile>
+    <Compile Include="config\N64\N64VideoPluginconfig.cs" />
+    <Compile Include="config\N64\N64VideoPluginconfig.Designer.cs">
+      <DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
+    </Compile>
+    <Compile Include="config\NES\NESGraphicsConfig.cs" />
+    <Compile Include="config\NES\NESGraphicsConfig.Designer.cs">
+      <DependentUpon>NESGraphicsConfig.cs</DependentUpon>
+    </Compile>
+    <Compile Include="config\NES\NESSoundConfig.cs" />
+    <Compile Include="config\NES\NESSoundConfig.Designer.cs">
+      <DependentUpon>NESSoundConfig.cs</DependentUpon>
+    </Compile>
     <Compile Include="config\PathConfig.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -230,12 +259,28 @@
     <Compile Include="config\PathInfo.Designer.cs">
       <DependentUpon>PathInfo.cs</DependentUpon>
     </Compile>
+    <Compile Include="config\PCE\PCEGraphicsConfig.cs" />
+    <Compile Include="config\PCE\PCEGraphicsConfig.Designer.cs">
+      <DependentUpon>PCEGraphicsConfig.cs</DependentUpon>
+    </Compile>
     <Compile Include="config\RewindConfig.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="config\RewindConfig.Designer.cs">
       <DependentUpon>RewindConfig.cs</DependentUpon>
     </Compile>
+    <Compile Include="config\Saturn\SaturnPrefs.cs" />
+    <Compile Include="config\Saturn\SaturnPrefs.Designer.cs">
+      <DependentUpon>SaturnPrefs.cs</DependentUpon>
+    </Compile>
+    <Compile Include="config\SMS\SMSGraphicsConfig.cs" />
+    <Compile Include="config\SMS\SMSGraphicsConfig.Designer.cs">
+      <DependentUpon>SMSGraphicsConfig.cs</DependentUpon>
+    </Compile>
+    <Compile Include="config\SNES\SNESOptions.cs" />
+    <Compile Include="config\SNES\SNESOptions.Designer.cs">
+      <DependentUpon>SNESOptions.cs</DependentUpon>
+    </Compile>
     <Compile Include="config\SoundConfig.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -378,33 +423,6 @@
     <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>
@@ -497,12 +515,6 @@
     <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\NameTableViewer.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -518,12 +530,6 @@
     <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>
@@ -536,12 +542,6 @@
     <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>
@@ -560,24 +560,6 @@
     <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>
@@ -593,12 +575,6 @@
     <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">
       <SubType>Form</SubType>
@@ -768,21 +744,54 @@
     <EmbeddedResource Include="config\FirmwaresConfigInfo.resx">
       <DependentUpon>FirmwaresConfigInfo.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="config\GB\CGBColorChooserForm.resx">
+      <DependentUpon>CGBColorChooserForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="config\GB\ColorChooserForm.resx">
+      <DependentUpon>ColorChooserForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="config\GB\DualGBFileSelector.resx">
+      <DependentUpon>DualGBFileSelector.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="config\GB\DualGBXMLCreator.resx">
+      <DependentUpon>DualGBXMLCreator.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="config\GifAnimator.resx">
       <DependentUpon>GifAnimator.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="config\HotkeyConfig.resx">
       <DependentUpon>HotkeyConfig.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="config\N64\N64VideoPluginconfig.resx">
+      <DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="config\NES\NESGraphicsConfig.resx">
+      <DependentUpon>NESGraphicsConfig.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="config\NES\NESSoundConfig.resx">
+      <DependentUpon>NESSoundConfig.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="config\PathConfig.resx">
       <DependentUpon>PathConfig.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="config\PathInfo.resx">
       <DependentUpon>PathInfo.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="config\PCE\PCEGraphicsConfig.resx">
+      <DependentUpon>PCEGraphicsConfig.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="config\RewindConfig.resx">
       <DependentUpon>RewindConfig.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="config\Saturn\SaturnPrefs.resx">
+      <DependentUpon>SaturnPrefs.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="config\SMS\SMSGraphicsConfig.resx">
+      <DependentUpon>SMSGraphicsConfig.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="config\SNES\SNESOptions.resx">
+      <DependentUpon>SNESOptions.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CustomControls\InputConfigBase.resx">
       <DependentUpon>InputConfigBase.cs</DependentUpon>
     </EmbeddedResource>
@@ -828,18 +837,6 @@
     <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>
@@ -879,51 +876,30 @@
     <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>
diff --git a/BizHawk.Client.EmuHawk/tools/GB/BmpView.cs b/BizHawk.Client.EmuHawk/config/GB/BmpView.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/GB/BmpView.cs
rename to BizHawk.Client.EmuHawk/config/GB/BmpView.cs
diff --git a/BizHawk.Client.EmuHawk/tools/GB/CGBColorChooserForm.Designer.cs b/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.Designer.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/GB/CGBColorChooserForm.Designer.cs
rename to BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.Designer.cs
diff --git a/BizHawk.Client.EmuHawk/tools/GB/CGBColorChooserForm.cs b/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/GB/CGBColorChooserForm.cs
rename to BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs
diff --git a/BizHawk.Client.EmuHawk/tools/GB/CGBColorChooserForm.resx b/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.resx
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/GB/CGBColorChooserForm.resx
rename to BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.resx
diff --git a/BizHawk.Client.EmuHawk/tools/GB/ColorChooserForm.Designer.cs b/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/GB/ColorChooserForm.Designer.cs
rename to BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs
diff --git a/BizHawk.Client.EmuHawk/tools/GB/ColorChooserForm.cs b/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/GB/ColorChooserForm.cs
rename to BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs
diff --git a/BizHawk.Client.EmuHawk/tools/GB/ColorChooserForm.resx b/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.resx
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/GB/ColorChooserForm.resx
rename to BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.resx
diff --git a/BizHawk.Client.EmuHawk/tools/GB/DualGBFileSelector.Designer.cs b/BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.Designer.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/GB/DualGBFileSelector.Designer.cs
rename to BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.Designer.cs
diff --git a/BizHawk.Client.EmuHawk/tools/GB/DualGBFileSelector.cs b/BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/GB/DualGBFileSelector.cs
rename to BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.cs
diff --git a/BizHawk.Client.EmuHawk/tools/GB/DualGBFileSelector.resx b/BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.resx
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/GB/DualGBFileSelector.resx
rename to BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.resx
diff --git a/BizHawk.Client.EmuHawk/tools/GB/DualGBXMLCreator.Designer.cs b/BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.Designer.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/GB/DualGBXMLCreator.Designer.cs
rename to BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.Designer.cs
diff --git a/BizHawk.Client.EmuHawk/tools/GB/DualGBXMLCreator.cs b/BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/GB/DualGBXMLCreator.cs
rename to BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.cs
diff --git a/BizHawk.Client.EmuHawk/tools/GB/DualGBXMLCreator.resx b/BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.resx
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/GB/DualGBXMLCreator.resx
rename to BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.resx
diff --git a/BizHawk.Client.EmuHawk/tools/N64/N64VideoPluginconfig.Designer.cs b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/N64/N64VideoPluginconfig.Designer.cs
rename to BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs
diff --git a/BizHawk.Client.EmuHawk/tools/N64/N64VideoPluginconfig.cs b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/N64/N64VideoPluginconfig.cs
rename to BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs
diff --git a/BizHawk.Client.EmuHawk/tools/N64/N64VideoPluginconfig.resx b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.resx
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/N64/N64VideoPluginconfig.resx
rename to BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.resx
diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESGraphicsConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.Designer.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/NES/NESGraphicsConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.Designer.cs
diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESGraphicsConfig.cs b/BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/NES/NESGraphicsConfig.cs
rename to BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.cs
diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESGraphicsConfig.resx b/BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.resx
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/NES/NESGraphicsConfig.resx
rename to BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.resx
diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESSoundConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.Designer.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/NES/NESSoundConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.Designer.cs
diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESSoundConfig.cs b/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/NES/NESSoundConfig.cs
rename to BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.cs
diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESSoundConfig.resx b/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.resx
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/NES/NESSoundConfig.resx
rename to BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.resx
diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCEGraphicsConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/PCE/PCEGraphicsConfig.Designer.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/PCE/PCEGraphicsConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/config/PCE/PCEGraphicsConfig.Designer.cs
diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCEGraphicsConfig.cs b/BizHawk.Client.EmuHawk/config/PCE/PCEGraphicsConfig.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/PCE/PCEGraphicsConfig.cs
rename to BizHawk.Client.EmuHawk/config/PCE/PCEGraphicsConfig.cs
diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCEGraphicsConfig.resx b/BizHawk.Client.EmuHawk/config/PCE/PCEGraphicsConfig.resx
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/PCE/PCEGraphicsConfig.resx
rename to BizHawk.Client.EmuHawk/config/PCE/PCEGraphicsConfig.resx
diff --git a/BizHawk.Client.EmuHawk/tools/SMS/SMSGraphicsConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/SMS/SMSGraphicsConfig.Designer.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/SMS/SMSGraphicsConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/config/SMS/SMSGraphicsConfig.Designer.cs
diff --git a/BizHawk.Client.EmuHawk/tools/SMS/SMSGraphicsConfig.cs b/BizHawk.Client.EmuHawk/config/SMS/SMSGraphicsConfig.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/SMS/SMSGraphicsConfig.cs
rename to BizHawk.Client.EmuHawk/config/SMS/SMSGraphicsConfig.cs
diff --git a/BizHawk.Client.EmuHawk/tools/SMS/SMSGraphicsConfig.resx b/BizHawk.Client.EmuHawk/config/SMS/SMSGraphicsConfig.resx
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/SMS/SMSGraphicsConfig.resx
rename to BizHawk.Client.EmuHawk/config/SMS/SMSGraphicsConfig.resx
diff --git a/BizHawk.Client.EmuHawk/tools/SNES/SNESOptions.Designer.cs b/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.Designer.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/SNES/SNESOptions.Designer.cs
rename to BizHawk.Client.EmuHawk/config/SNES/SNESOptions.Designer.cs
diff --git a/BizHawk.Client.EmuHawk/tools/SNES/SNESOptions.cs b/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/SNES/SNESOptions.cs
rename to BizHawk.Client.EmuHawk/config/SNES/SNESOptions.cs
diff --git a/BizHawk.Client.EmuHawk/tools/SNES/SNESOptions.resx b/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.resx
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/SNES/SNESOptions.resx
rename to BizHawk.Client.EmuHawk/config/SNES/SNESOptions.resx
diff --git a/BizHawk.Client.EmuHawk/tools/Saturn/SaturnPrefs.Designer.cs b/BizHawk.Client.EmuHawk/config/Saturn/SaturnPrefs.Designer.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/Saturn/SaturnPrefs.Designer.cs
rename to BizHawk.Client.EmuHawk/config/Saturn/SaturnPrefs.Designer.cs
diff --git a/BizHawk.Client.EmuHawk/tools/Saturn/SaturnPrefs.cs b/BizHawk.Client.EmuHawk/config/Saturn/SaturnPrefs.cs
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/Saturn/SaturnPrefs.cs
rename to BizHawk.Client.EmuHawk/config/Saturn/SaturnPrefs.cs
diff --git a/BizHawk.Client.EmuHawk/tools/Saturn/SaturnPrefs.resx b/BizHawk.Client.EmuHawk/config/Saturn/SaturnPrefs.resx
similarity index 100%
rename from BizHawk.Client.EmuHawk/tools/Saturn/SaturnPrefs.resx
rename to BizHawk.Client.EmuHawk/config/Saturn/SaturnPrefs.resx