diff --git a/PKX/f1-Main.Designer.cs b/MainWindow/f1-Main.Designer.cs
similarity index 100%
rename from PKX/f1-Main.Designer.cs
rename to MainWindow/f1-Main.Designer.cs
diff --git a/PKX/f1-Main.cs b/MainWindow/f1-Main.cs
similarity index 100%
rename from PKX/f1-Main.cs
rename to MainWindow/f1-Main.cs
diff --git a/PKX/f1-Main.resx b/MainWindow/f1-Main.resx
similarity index 100%
rename from PKX/f1-Main.resx
rename to MainWindow/f1-Main.resx
diff --git a/PKHeX.csproj b/PKHeX.csproj
index 5bcb76a18..f8ff7777e 100644
--- a/PKHeX.csproj
+++ b/PKHeX.csproj
@@ -106,10 +106,10 @@
     <Compile Include="Saves\SAV6.cs" />
     <Compile Include="Saves\SaveFile.cs" />
     <Compile Include="MysteryGifts\WC6.cs" />
-    <Compile Include="PKX\f2-Text.cs">
+    <Compile Include="Subforms\PKM Editors\f2-Text.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="PKX\f2-Text.Designer.cs">
+    <Compile Include="Subforms\PKM Editors\f2-Text.Designer.cs">
       <DependentUpon>f2-Text.cs</DependentUpon>
     </Compile>
     <Compile Include="Misc\About.cs">
@@ -119,22 +119,22 @@
       <DependentUpon>About.cs</DependentUpon>
     </Compile>
     <Compile Include="PKM\PKX.cs" />
-    <Compile Include="PKX\f1-Main.cs">
+    <Compile Include="MainWindow\f1-Main.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="PKX\f1-Main.Designer.cs">
+    <Compile Include="MainWindow\f1-Main.Designer.cs">
       <DependentUpon>f1-Main.cs</DependentUpon>
     </Compile>
-    <Compile Include="PKX\f4-RibbMedal.cs">
+    <Compile Include="Subforms\PKM Editors\f4-RibbMedal.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="PKX\f4-RibbMedal.Designer.cs">
+    <Compile Include="Subforms\PKM Editors\f4-RibbMedal.Designer.cs">
       <DependentUpon>f4-RibbMedal.cs</DependentUpon>
     </Compile>
-    <Compile Include="PKX\f3-MemoryAmie.cs">
+    <Compile Include="Subforms\PKM Editors\f3-MemoryAmie.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="PKX\f3-MemoryAmie.Designer.cs">
+    <Compile Include="Subforms\PKM Editors\f3-MemoryAmie.Designer.cs">
       <DependentUpon>f3-MemoryAmie.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\Resources.Designer.cs">
@@ -144,108 +144,108 @@
     </Compile>
     <Compile Include="Saves\SaveObjects.cs" />
     <Compile Include="Saves\SaveUtil.cs" />
-    <Compile Include="SAV\SAV_PokeBlockORAS.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_PokeBlockORAS.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_PokeBlockORAS.Designer.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_PokeBlockORAS.Designer.cs">
       <DependentUpon>SAV_PokeBlockORAS.cs</DependentUpon>
     </Compile>
-    <Compile Include="SAV\SAV_Database.cs">
+    <Compile Include="Subforms\SAV_Database.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_Database.Designer.cs">
+    <Compile Include="Subforms\SAV_Database.Designer.cs">
       <DependentUpon>SAV_Database.cs</DependentUpon>
     </Compile>
-    <Compile Include="SAV\SAV_PokedexORAS.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_PokedexORAS.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_PokedexORAS.Designer.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_PokedexORAS.Designer.cs">
       <DependentUpon>SAV_PokedexORAS.cs</DependentUpon>
     </Compile>
-    <Compile Include="SAV\SAV_SecretBase.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_SecretBase.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_SecretBase.Designer.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_SecretBase.Designer.cs">
       <DependentUpon>SAV_SecretBase.cs</DependentUpon>
     </Compile>
-    <Compile Include="SAV\SAV_EventFlags.cs">
+    <Compile Include="Subforms\Save Editors\SAV_EventFlags.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_EventFlags.Designer.cs">
+    <Compile Include="Subforms\Save Editors\SAV_EventFlags.Designer.cs">
       <DependentUpon>SAV_EventFlags.cs</DependentUpon>
     </Compile>
-    <Compile Include="SAV\frmReport.cs">
+    <Compile Include="Subforms\frmReport.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\frmReport.Designer.cs">
+    <Compile Include="Subforms\frmReport.Designer.cs">
       <DependentUpon>frmReport.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SAV\SAV_BerryFieldXY.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_BerryFieldXY.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_BerryFieldXY.Designer.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_BerryFieldXY.Designer.cs">
       <DependentUpon>SAV_BerryFieldXY.cs</DependentUpon>
     </Compile>
-    <Compile Include="SAV\SAV_BoxLayout.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_BoxLayout.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_BoxLayout.Designer.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_BoxLayout.Designer.cs">
       <DependentUpon>SAV_BoxLayout.cs</DependentUpon>
     </Compile>
-    <Compile Include="SAV\SAV_HallOfFame.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_HallOfFame.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_HallOfFame.Designer.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_HallOfFame.Designer.cs">
       <DependentUpon>SAV_HallOfFame.cs</DependentUpon>
     </Compile>
-    <Compile Include="SAV\SAV_Inventory.cs">
+    <Compile Include="Subforms\Save Editors\SAV_Inventory.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_Inventory.Designer.cs">
+    <Compile Include="Subforms\Save Editors\SAV_Inventory.Designer.cs">
       <DependentUpon>SAV_Inventory.cs</DependentUpon>
     </Compile>
-    <Compile Include="SAV\SAV_OPower.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_OPower.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_OPower.Designer.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_OPower.Designer.cs">
       <DependentUpon>SAV_OPower.cs</DependentUpon>
     </Compile>
-    <Compile Include="SAV\SAV_PokedexXY.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_PokedexXY.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_PokedexXY.Designer.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_PokedexXY.Designer.cs">
       <DependentUpon>SAV_PokedexXY.cs</DependentUpon>
     </Compile>
-    <Compile Include="SAV\SAV_Pokepuff.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_Pokepuff.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_Pokepuff.Designer.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_Pokepuff.Designer.cs">
       <DependentUpon>SAV_Pokepuff.cs</DependentUpon>
     </Compile>
-    <Compile Include="SAV\SAV_SimpleTrainer.cs">
+    <Compile Include="Subforms\Save Editors\SAV_SimpleTrainer.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_SimpleTrainer.Designer.cs">
+    <Compile Include="Subforms\Save Editors\SAV_SimpleTrainer.Designer.cs">
       <DependentUpon>SAV_SimpleTrainer.cs</DependentUpon>
     </Compile>
-    <Compile Include="SAV\SAV_SuperTrain.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_SuperTrain.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_SuperTrain.Designer.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_SuperTrain.Designer.cs">
       <DependentUpon>SAV_SuperTrain.cs</DependentUpon>
     </Compile>
-    <Compile Include="SAV\SAV_Trainer.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_Trainer.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_Trainer.Designer.cs">
+    <Compile Include="Subforms\Save Editors\Gen6\SAV_Trainer.Designer.cs">
       <DependentUpon>SAV_Trainer.cs</DependentUpon>
     </Compile>
-    <Compile Include="SAV\SAV_Wondercard.cs">
+    <Compile Include="Subforms\Save Editors\SAV_Wondercard.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SAV\SAV_Wondercard.Designer.cs">
+    <Compile Include="Subforms\Save Editors\SAV_Wondercard.Designer.cs">
       <DependentUpon>SAV_Wondercard.cs</DependentUpon>
     </Compile>
     <Compile Include="Misc\SplashScreen.cs">
@@ -259,39 +259,39 @@
       <DependentUpon>QR.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="PKX\f2-Text.resx">
+    <EmbeddedResource Include="Subforms\PKM Editors\f2-Text.resx">
       <DependentUpon>f2-Text.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Misc\About.resx">
       <DependentUpon>About.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="PKX\f1-Main.resx">
+    <EmbeddedResource Include="MainWindow\f1-Main.resx">
       <DependentUpon>f1-Main.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="PKX\f4-RibbMedal.resx">
+    <EmbeddedResource Include="Subforms\PKM Editors\f4-RibbMedal.resx">
       <DependentUpon>f4-RibbMedal.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="PKX\f3-MemoryAmie.resx">
+    <EmbeddedResource Include="Subforms\PKM Editors\f3-MemoryAmie.resx">
       <DependentUpon>f3-MemoryAmie.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_PokeBlockORAS.resx">
+    <EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_PokeBlockORAS.resx">
       <DependentUpon>SAV_PokeBlockORAS.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_Database.resx">
+    <EmbeddedResource Include="Subforms\SAV_Database.resx">
       <DependentUpon>SAV_Database.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_PokedexORAS.resx">
+    <EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_PokedexORAS.resx">
       <DependentUpon>SAV_PokedexORAS.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_SecretBase.resx">
+    <EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_SecretBase.resx">
       <DependentUpon>SAV_SecretBase.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_EventFlags.resx">
+    <EmbeddedResource Include="Subforms\Save Editors\SAV_EventFlags.resx">
       <DependentUpon>SAV_EventFlags.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\frmReport.resx">
+    <EmbeddedResource Include="Subforms\frmReport.resx">
       <DependentUpon>frmReport.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -299,37 +299,37 @@
       <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_BerryFieldXY.resx">
+    <EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_BerryFieldXY.resx">
       <DependentUpon>SAV_BerryFieldXY.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_BoxLayout.resx">
+    <EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_BoxLayout.resx">
       <DependentUpon>SAV_BoxLayout.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_HallOfFame.resx">
+    <EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_HallOfFame.resx">
       <DependentUpon>SAV_HallOfFame.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_Inventory.resx">
+    <EmbeddedResource Include="Subforms\Save Editors\SAV_Inventory.resx">
       <DependentUpon>SAV_Inventory.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_OPower.resx">
+    <EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_OPower.resx">
       <DependentUpon>SAV_OPower.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_PokedexXY.resx">
+    <EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_PokedexXY.resx">
       <DependentUpon>SAV_PokedexXY.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_Pokepuff.resx">
+    <EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_Pokepuff.resx">
       <DependentUpon>SAV_Pokepuff.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_SimpleTrainer.resx">
+    <EmbeddedResource Include="Subforms\Save Editors\SAV_SimpleTrainer.resx">
       <DependentUpon>SAV_SimpleTrainer.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_SuperTrain.resx">
+    <EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_SuperTrain.resx">
       <DependentUpon>SAV_SuperTrain.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_Trainer.resx">
+    <EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_Trainer.resx">
       <DependentUpon>SAV_Trainer.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SAV\SAV_Wondercard.resx">
+    <EmbeddedResource Include="Subforms\Save Editors\SAV_Wondercard.resx">
       <DependentUpon>SAV_Wondercard.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Misc\SplashScreen.resx">
@@ -2410,7 +2410,9 @@
     <None Include="Resources\img\ribbons\artist.png" />
     <None Include="Resources\img\ribbons\alert.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="SAV\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/PKX/f2-Text.Designer.cs b/Subforms/PKM Editors/f2-Text.Designer.cs
similarity index 100%
rename from PKX/f2-Text.Designer.cs
rename to Subforms/PKM Editors/f2-Text.Designer.cs
diff --git a/PKX/f2-Text.cs b/Subforms/PKM Editors/f2-Text.cs
similarity index 100%
rename from PKX/f2-Text.cs
rename to Subforms/PKM Editors/f2-Text.cs
diff --git a/PKX/f2-Text.resx b/Subforms/PKM Editors/f2-Text.resx
similarity index 100%
rename from PKX/f2-Text.resx
rename to Subforms/PKM Editors/f2-Text.resx
diff --git a/PKX/f3-MemoryAmie.Designer.cs b/Subforms/PKM Editors/f3-MemoryAmie.Designer.cs
similarity index 100%
rename from PKX/f3-MemoryAmie.Designer.cs
rename to Subforms/PKM Editors/f3-MemoryAmie.Designer.cs
diff --git a/PKX/f3-MemoryAmie.cs b/Subforms/PKM Editors/f3-MemoryAmie.cs
similarity index 100%
rename from PKX/f3-MemoryAmie.cs
rename to Subforms/PKM Editors/f3-MemoryAmie.cs
diff --git a/PKX/f3-MemoryAmie.resx b/Subforms/PKM Editors/f3-MemoryAmie.resx
similarity index 100%
rename from PKX/f3-MemoryAmie.resx
rename to Subforms/PKM Editors/f3-MemoryAmie.resx
diff --git a/PKX/f4-RibbMedal.Designer.cs b/Subforms/PKM Editors/f4-RibbMedal.Designer.cs
similarity index 100%
rename from PKX/f4-RibbMedal.Designer.cs
rename to Subforms/PKM Editors/f4-RibbMedal.Designer.cs
diff --git a/PKX/f4-RibbMedal.cs b/Subforms/PKM Editors/f4-RibbMedal.cs
similarity index 100%
rename from PKX/f4-RibbMedal.cs
rename to Subforms/PKM Editors/f4-RibbMedal.cs
diff --git a/PKX/f4-RibbMedal.resx b/Subforms/PKM Editors/f4-RibbMedal.resx
similarity index 100%
rename from PKX/f4-RibbMedal.resx
rename to Subforms/PKM Editors/f4-RibbMedal.resx
diff --git a/SAV/SAV_Database.Designer.cs b/Subforms/SAV_Database.Designer.cs
similarity index 100%
rename from SAV/SAV_Database.Designer.cs
rename to Subforms/SAV_Database.Designer.cs
diff --git a/SAV/SAV_Database.cs b/Subforms/SAV_Database.cs
similarity index 100%
rename from SAV/SAV_Database.cs
rename to Subforms/SAV_Database.cs
diff --git a/SAV/SAV_Database.resx b/Subforms/SAV_Database.resx
similarity index 100%
rename from SAV/SAV_Database.resx
rename to Subforms/SAV_Database.resx
diff --git a/SAV/SAV_BerryFieldXY.Designer.cs b/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.Designer.cs
similarity index 100%
rename from SAV/SAV_BerryFieldXY.Designer.cs
rename to Subforms/Save Editors/Gen6/SAV_BerryFieldXY.Designer.cs
diff --git a/SAV/SAV_BerryFieldXY.cs b/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.cs
similarity index 100%
rename from SAV/SAV_BerryFieldXY.cs
rename to Subforms/Save Editors/Gen6/SAV_BerryFieldXY.cs
diff --git a/SAV/SAV_BerryFieldXY.resx b/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.resx
similarity index 100%
rename from SAV/SAV_BerryFieldXY.resx
rename to Subforms/Save Editors/Gen6/SAV_BerryFieldXY.resx
diff --git a/SAV/SAV_BoxLayout.Designer.cs b/Subforms/Save Editors/Gen6/SAV_BoxLayout.Designer.cs
similarity index 100%
rename from SAV/SAV_BoxLayout.Designer.cs
rename to Subforms/Save Editors/Gen6/SAV_BoxLayout.Designer.cs
diff --git a/SAV/SAV_BoxLayout.cs b/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs
similarity index 100%
rename from SAV/SAV_BoxLayout.cs
rename to Subforms/Save Editors/Gen6/SAV_BoxLayout.cs
diff --git a/SAV/SAV_BoxLayout.resx b/Subforms/Save Editors/Gen6/SAV_BoxLayout.resx
similarity index 100%
rename from SAV/SAV_BoxLayout.resx
rename to Subforms/Save Editors/Gen6/SAV_BoxLayout.resx
diff --git a/SAV/SAV_HallOfFame.Designer.cs b/Subforms/Save Editors/Gen6/SAV_HallOfFame.Designer.cs
similarity index 100%
rename from SAV/SAV_HallOfFame.Designer.cs
rename to Subforms/Save Editors/Gen6/SAV_HallOfFame.Designer.cs
diff --git a/SAV/SAV_HallOfFame.cs b/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs
similarity index 100%
rename from SAV/SAV_HallOfFame.cs
rename to Subforms/Save Editors/Gen6/SAV_HallOfFame.cs
diff --git a/SAV/SAV_HallOfFame.resx b/Subforms/Save Editors/Gen6/SAV_HallOfFame.resx
similarity index 100%
rename from SAV/SAV_HallOfFame.resx
rename to Subforms/Save Editors/Gen6/SAV_HallOfFame.resx
diff --git a/SAV/SAV_OPower.Designer.cs b/Subforms/Save Editors/Gen6/SAV_OPower.Designer.cs
similarity index 100%
rename from SAV/SAV_OPower.Designer.cs
rename to Subforms/Save Editors/Gen6/SAV_OPower.Designer.cs
diff --git a/SAV/SAV_OPower.cs b/Subforms/Save Editors/Gen6/SAV_OPower.cs
similarity index 100%
rename from SAV/SAV_OPower.cs
rename to Subforms/Save Editors/Gen6/SAV_OPower.cs
diff --git a/SAV/SAV_OPower.resx b/Subforms/Save Editors/Gen6/SAV_OPower.resx
similarity index 100%
rename from SAV/SAV_OPower.resx
rename to Subforms/Save Editors/Gen6/SAV_OPower.resx
diff --git a/SAV/SAV_PokeBlockORAS.Designer.cs b/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.Designer.cs
similarity index 100%
rename from SAV/SAV_PokeBlockORAS.Designer.cs
rename to Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.Designer.cs
diff --git a/SAV/SAV_PokeBlockORAS.cs b/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.cs
similarity index 100%
rename from SAV/SAV_PokeBlockORAS.cs
rename to Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.cs
diff --git a/SAV/SAV_PokeBlockORAS.resx b/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.resx
similarity index 100%
rename from SAV/SAV_PokeBlockORAS.resx
rename to Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.resx
diff --git a/SAV/SAV_PokedexORAS.Designer.cs b/Subforms/Save Editors/Gen6/SAV_PokedexORAS.Designer.cs
similarity index 100%
rename from SAV/SAV_PokedexORAS.Designer.cs
rename to Subforms/Save Editors/Gen6/SAV_PokedexORAS.Designer.cs
diff --git a/SAV/SAV_PokedexORAS.cs b/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs
similarity index 100%
rename from SAV/SAV_PokedexORAS.cs
rename to Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs
diff --git a/SAV/SAV_PokedexORAS.resx b/Subforms/Save Editors/Gen6/SAV_PokedexORAS.resx
similarity index 100%
rename from SAV/SAV_PokedexORAS.resx
rename to Subforms/Save Editors/Gen6/SAV_PokedexORAS.resx
diff --git a/SAV/SAV_PokedexXY.Designer.cs b/Subforms/Save Editors/Gen6/SAV_PokedexXY.Designer.cs
similarity index 100%
rename from SAV/SAV_PokedexXY.Designer.cs
rename to Subforms/Save Editors/Gen6/SAV_PokedexXY.Designer.cs
diff --git a/SAV/SAV_PokedexXY.cs b/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs
similarity index 100%
rename from SAV/SAV_PokedexXY.cs
rename to Subforms/Save Editors/Gen6/SAV_PokedexXY.cs
diff --git a/SAV/SAV_PokedexXY.resx b/Subforms/Save Editors/Gen6/SAV_PokedexXY.resx
similarity index 100%
rename from SAV/SAV_PokedexXY.resx
rename to Subforms/Save Editors/Gen6/SAV_PokedexXY.resx
diff --git a/SAV/SAV_Pokepuff.Designer.cs b/Subforms/Save Editors/Gen6/SAV_Pokepuff.Designer.cs
similarity index 100%
rename from SAV/SAV_Pokepuff.Designer.cs
rename to Subforms/Save Editors/Gen6/SAV_Pokepuff.Designer.cs
diff --git a/SAV/SAV_Pokepuff.cs b/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs
similarity index 100%
rename from SAV/SAV_Pokepuff.cs
rename to Subforms/Save Editors/Gen6/SAV_Pokepuff.cs
diff --git a/SAV/SAV_Pokepuff.resx b/Subforms/Save Editors/Gen6/SAV_Pokepuff.resx
similarity index 100%
rename from SAV/SAV_Pokepuff.resx
rename to Subforms/Save Editors/Gen6/SAV_Pokepuff.resx
diff --git a/SAV/SAV_SecretBase.Designer.cs b/Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs
similarity index 100%
rename from SAV/SAV_SecretBase.Designer.cs
rename to Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs
diff --git a/SAV/SAV_SecretBase.cs b/Subforms/Save Editors/Gen6/SAV_SecretBase.cs
similarity index 100%
rename from SAV/SAV_SecretBase.cs
rename to Subforms/Save Editors/Gen6/SAV_SecretBase.cs
diff --git a/SAV/SAV_SecretBase.resx b/Subforms/Save Editors/Gen6/SAV_SecretBase.resx
similarity index 100%
rename from SAV/SAV_SecretBase.resx
rename to Subforms/Save Editors/Gen6/SAV_SecretBase.resx
diff --git a/SAV/SAV_SuperTrain.Designer.cs b/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs
similarity index 100%
rename from SAV/SAV_SuperTrain.Designer.cs
rename to Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs
diff --git a/SAV/SAV_SuperTrain.cs b/Subforms/Save Editors/Gen6/SAV_SuperTrain.cs
similarity index 100%
rename from SAV/SAV_SuperTrain.cs
rename to Subforms/Save Editors/Gen6/SAV_SuperTrain.cs
diff --git a/SAV/SAV_SuperTrain.resx b/Subforms/Save Editors/Gen6/SAV_SuperTrain.resx
similarity index 100%
rename from SAV/SAV_SuperTrain.resx
rename to Subforms/Save Editors/Gen6/SAV_SuperTrain.resx
diff --git a/SAV/SAV_Trainer.Designer.cs b/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs
similarity index 100%
rename from SAV/SAV_Trainer.Designer.cs
rename to Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs
diff --git a/SAV/SAV_Trainer.cs b/Subforms/Save Editors/Gen6/SAV_Trainer.cs
similarity index 100%
rename from SAV/SAV_Trainer.cs
rename to Subforms/Save Editors/Gen6/SAV_Trainer.cs
diff --git a/SAV/SAV_Trainer.resx b/Subforms/Save Editors/Gen6/SAV_Trainer.resx
similarity index 100%
rename from SAV/SAV_Trainer.resx
rename to Subforms/Save Editors/Gen6/SAV_Trainer.resx
diff --git a/SAV/SAV_EventFlags.Designer.cs b/Subforms/Save Editors/SAV_EventFlags.Designer.cs
similarity index 100%
rename from SAV/SAV_EventFlags.Designer.cs
rename to Subforms/Save Editors/SAV_EventFlags.Designer.cs
diff --git a/SAV/SAV_EventFlags.cs b/Subforms/Save Editors/SAV_EventFlags.cs
similarity index 100%
rename from SAV/SAV_EventFlags.cs
rename to Subforms/Save Editors/SAV_EventFlags.cs
diff --git a/SAV/SAV_EventFlags.resx b/Subforms/Save Editors/SAV_EventFlags.resx
similarity index 100%
rename from SAV/SAV_EventFlags.resx
rename to Subforms/Save Editors/SAV_EventFlags.resx
diff --git a/SAV/SAV_Inventory.Designer.cs b/Subforms/Save Editors/SAV_Inventory.Designer.cs
similarity index 100%
rename from SAV/SAV_Inventory.Designer.cs
rename to Subforms/Save Editors/SAV_Inventory.Designer.cs
diff --git a/SAV/SAV_Inventory.cs b/Subforms/Save Editors/SAV_Inventory.cs
similarity index 100%
rename from SAV/SAV_Inventory.cs
rename to Subforms/Save Editors/SAV_Inventory.cs
diff --git a/SAV/SAV_Inventory.resx b/Subforms/Save Editors/SAV_Inventory.resx
similarity index 100%
rename from SAV/SAV_Inventory.resx
rename to Subforms/Save Editors/SAV_Inventory.resx
diff --git a/SAV/SAV_SimpleTrainer.Designer.cs b/Subforms/Save Editors/SAV_SimpleTrainer.Designer.cs
similarity index 100%
rename from SAV/SAV_SimpleTrainer.Designer.cs
rename to Subforms/Save Editors/SAV_SimpleTrainer.Designer.cs
diff --git a/SAV/SAV_SimpleTrainer.cs b/Subforms/Save Editors/SAV_SimpleTrainer.cs
similarity index 100%
rename from SAV/SAV_SimpleTrainer.cs
rename to Subforms/Save Editors/SAV_SimpleTrainer.cs
diff --git a/SAV/SAV_SimpleTrainer.resx b/Subforms/Save Editors/SAV_SimpleTrainer.resx
similarity index 100%
rename from SAV/SAV_SimpleTrainer.resx
rename to Subforms/Save Editors/SAV_SimpleTrainer.resx
diff --git a/SAV/SAV_Wondercard.Designer.cs b/Subforms/Save Editors/SAV_Wondercard.Designer.cs
similarity index 100%
rename from SAV/SAV_Wondercard.Designer.cs
rename to Subforms/Save Editors/SAV_Wondercard.Designer.cs
diff --git a/SAV/SAV_Wondercard.cs b/Subforms/Save Editors/SAV_Wondercard.cs
similarity index 100%
rename from SAV/SAV_Wondercard.cs
rename to Subforms/Save Editors/SAV_Wondercard.cs
diff --git a/SAV/SAV_Wondercard.resx b/Subforms/Save Editors/SAV_Wondercard.resx
similarity index 100%
rename from SAV/SAV_Wondercard.resx
rename to Subforms/Save Editors/SAV_Wondercard.resx
diff --git a/SAV/frmReport.Designer.cs b/Subforms/frmReport.Designer.cs
similarity index 100%
rename from SAV/frmReport.Designer.cs
rename to Subforms/frmReport.Designer.cs
diff --git a/SAV/frmReport.cs b/Subforms/frmReport.cs
similarity index 100%
rename from SAV/frmReport.cs
rename to Subforms/frmReport.cs
diff --git a/SAV/frmReport.resx b/Subforms/frmReport.resx
similarity index 100%
rename from SAV/frmReport.resx
rename to Subforms/frmReport.resx