diff --git a/SabreTools.Helper/Objects/Dats/Archive.cs b/SabreTools.Helper/Dats/Archive.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dats/Archive.cs
rename to SabreTools.Helper/Dats/Archive.cs
diff --git a/SabreTools.Helper/Objects/Dats/BiosSet.cs b/SabreTools.Helper/Dats/BiosSet.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dats/BiosSet.cs
rename to SabreTools.Helper/Dats/BiosSet.cs
diff --git a/SabreTools.Helper/Objects/Dats/DatFile.cs b/SabreTools.Helper/Dats/DatFile.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dats/DatFile.cs
rename to SabreTools.Helper/Dats/DatFile.cs
diff --git a/SabreTools.Helper/Objects/Dats/DatItem.cs b/SabreTools.Helper/Dats/DatItem.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dats/DatItem.cs
rename to SabreTools.Helper/Dats/DatItem.cs
diff --git a/SabreTools.Helper/Objects/Dats/DatItemKV.cs b/SabreTools.Helper/Dats/DatItemKV.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dats/DatItemKV.cs
rename to SabreTools.Helper/Dats/DatItemKV.cs
diff --git a/SabreTools.Helper/Objects/Dats/Disk.cs b/SabreTools.Helper/Dats/Disk.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dats/Disk.cs
rename to SabreTools.Helper/Dats/Disk.cs
diff --git a/SabreTools.Helper/Objects/Dats/Machine.cs b/SabreTools.Helper/Dats/Machine.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dats/Machine.cs
rename to SabreTools.Helper/Dats/Machine.cs
diff --git a/SabreTools.Helper/Objects/Dats/Release.cs b/SabreTools.Helper/Dats/Release.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dats/Release.cs
rename to SabreTools.Helper/Dats/Release.cs
diff --git a/SabreTools.Helper/Objects/Dats/Rom.cs b/SabreTools.Helper/Dats/Rom.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dats/Rom.cs
rename to SabreTools.Helper/Dats/Rom.cs
diff --git a/SabreTools.Helper/Objects/Dats/Sample.cs b/SabreTools.Helper/Dats/Sample.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dats/Sample.cs
rename to SabreTools.Helper/Dats/Sample.cs
diff --git a/SabreTools.Helper/Objects/Logger.cs b/SabreTools.Helper/Logger.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Logger.cs
rename to SabreTools.Helper/Logger.cs
diff --git a/SabreTools.Helper/SabreTools.Helper.csproj b/SabreTools.Helper/SabreTools.Helper.csproj
index d1dc19bd..7e5d3a51 100644
--- a/SabreTools.Helper/SabreTools.Helper.csproj
+++ b/SabreTools.Helper/SabreTools.Helper.csproj
@@ -102,20 +102,20 @@
     <Compile Include="External\Zlib\ZlibCodec.cs" />
     <Compile Include="External\Zlib\ZlibConstants.cs" />
     <Compile Include="External\Zlib\ZlibStream.cs" />
-    <Compile Include="Objects\Dats\Archive.cs" />
-    <Compile Include="Objects\Dats\BiosSet.cs" />
-    <Compile Include="Objects\Dats\DatFile.cs" />
-    <Compile Include="Objects\Dats\DatItem.cs" />
-    <Compile Include="Objects\Dats\DatItemKV.cs" />
-    <Compile Include="Objects\Dats\Disk.cs" />
-    <Compile Include="Objects\Dats\Machine.cs" />
-    <Compile Include="Objects\Dats\Release.cs" />
-    <Compile Include="Objects\Dats\Sample.cs" />
-    <Compile Include="Objects\Dats\Rom.cs" />
+    <Compile Include="Dats\Archive.cs" />
+    <Compile Include="Dats\BiosSet.cs" />
+    <Compile Include="Dats\DatFile.cs" />
+    <Compile Include="Dats\DatItem.cs" />
+    <Compile Include="Dats\DatItemKV.cs" />
+    <Compile Include="Dats\Disk.cs" />
+    <Compile Include="Dats\Machine.cs" />
+    <Compile Include="Dats\Release.cs" />
+    <Compile Include="Dats\Sample.cs" />
+    <Compile Include="Dats\Rom.cs" />
     <Compile Include="External\SupportedFiles\ZipFileEntry.cs" />
     <Compile Include="External\SupportedFiles\ZipFile.cs" />
-    <Compile Include="Objects\Skippers\Skipper.cs" />
-    <Compile Include="Objects\Skippers\SkipperRule.cs" />
+    <Compile Include="Skippers\Skipper.cs" />
+    <Compile Include="Skippers\SkipperRule.cs" />
     <Compile Include="Resources\Resources.de-DE.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -140,7 +140,7 @@
     <Compile Include="Tools\FileTools.cs" />
     <Compile Include="Tools\DatabaseTools.cs" />
     <Compile Include="Data\Enums.cs" />
-    <Compile Include="Objects\Logger.cs" />
+    <Compile Include="Logger.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tools\Style.cs" />
     <Compile Include="Data\Build.cs" />
diff --git a/SabreTools.Helper/Objects/Skippers/Skipper.cs b/SabreTools.Helper/Skippers/Skipper.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Skippers/Skipper.cs
rename to SabreTools.Helper/Skippers/Skipper.cs
diff --git a/SabreTools.Helper/Objects/Skippers/SkipperRule.cs b/SabreTools.Helper/Skippers/SkipperRule.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Skippers/SkipperRule.cs
rename to SabreTools.Helper/Skippers/SkipperRule.cs