diff --git a/SabreTools.Helper/Objects/Dat/Archive.cs b/SabreTools.Helper/Objects/Dats/Archive.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dat/Archive.cs
rename to SabreTools.Helper/Objects/Dats/Archive.cs
diff --git a/SabreTools.Helper/Objects/Dat/BiosSet.cs b/SabreTools.Helper/Objects/Dats/BiosSet.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dat/BiosSet.cs
rename to SabreTools.Helper/Objects/Dats/BiosSet.cs
diff --git a/SabreTools.Helper/Objects/Dat/DatFile.cs b/SabreTools.Helper/Objects/Dats/DatFile.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dat/DatFile.cs
rename to SabreTools.Helper/Objects/Dats/DatFile.cs
diff --git a/SabreTools.Helper/Objects/Dat/DatItem.cs b/SabreTools.Helper/Objects/Dats/DatItem.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dat/DatItem.cs
rename to SabreTools.Helper/Objects/Dats/DatItem.cs
diff --git a/SabreTools.Helper/Objects/Dat/DatItemKV.cs b/SabreTools.Helper/Objects/Dats/DatItemKV.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dat/DatItemKV.cs
rename to SabreTools.Helper/Objects/Dats/DatItemKV.cs
diff --git a/SabreTools.Helper/Objects/Dat/Disk.cs b/SabreTools.Helper/Objects/Dats/Disk.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dat/Disk.cs
rename to SabreTools.Helper/Objects/Dats/Disk.cs
diff --git a/SabreTools.Helper/Objects/Dat/Machine.cs b/SabreTools.Helper/Objects/Dats/Machine.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dat/Machine.cs
rename to SabreTools.Helper/Objects/Dats/Machine.cs
diff --git a/SabreTools.Helper/Objects/Dat/Release.cs b/SabreTools.Helper/Objects/Dats/Release.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dat/Release.cs
rename to SabreTools.Helper/Objects/Dats/Release.cs
diff --git a/SabreTools.Helper/Objects/Dat/Rom.cs b/SabreTools.Helper/Objects/Dats/Rom.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dat/Rom.cs
rename to SabreTools.Helper/Objects/Dats/Rom.cs
diff --git a/SabreTools.Helper/Objects/Dat/Sample.cs b/SabreTools.Helper/Objects/Dats/Sample.cs
similarity index 100%
rename from SabreTools.Helper/Objects/Dat/Sample.cs
rename to SabreTools.Helper/Objects/Dats/Sample.cs
diff --git a/SabreTools.Helper/Objects/Skippers/Skipper.cs b/SabreTools.Helper/Objects/Skippers/Skipper.cs
index d265548d..7259d56f 100644
--- a/SabreTools.Helper/Objects/Skippers/Skipper.cs
+++ b/SabreTools.Helper/Objects/Skippers/Skipper.cs
@@ -6,7 +6,7 @@ using System.Xml;
 using SabreTools.Helper.Data;
 using SabreTools.Helper.Tools;
 
-namespace SabreTools.Helper
+namespace SabreTools.Helper.Skippers
 {
 	public class Skipper
 	{
diff --git a/SabreTools.Helper/Objects/Skippers/SkipperRule.cs b/SabreTools.Helper/Objects/Skippers/SkipperRule.cs
index 6d0c4442..004e0b22 100644
--- a/SabreTools.Helper/Objects/Skippers/SkipperRule.cs
+++ b/SabreTools.Helper/Objects/Skippers/SkipperRule.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using SabreTools.Helper.Data;
 
-namespace SabreTools.Helper
+namespace SabreTools.Helper.Skippers
 {
 	public class SkipperRule
 	{
diff --git a/SabreTools.Helper/SabreTools.Helper.csproj b/SabreTools.Helper/SabreTools.Helper.csproj
index 734a8196..d1dc19bd 100644
--- a/SabreTools.Helper/SabreTools.Helper.csproj
+++ b/SabreTools.Helper/SabreTools.Helper.csproj
@@ -102,16 +102,16 @@
     <Compile Include="External\Zlib\ZlibCodec.cs" />
     <Compile Include="External\Zlib\ZlibConstants.cs" />
     <Compile Include="External\Zlib\ZlibStream.cs" />
-    <Compile Include="Objects\Dat\Archive.cs" />
-    <Compile Include="Objects\Dat\BiosSet.cs" />
-    <Compile Include="Objects\Dat\DatFile.cs" />
-    <Compile Include="Objects\Dat\DatItem.cs" />
-    <Compile Include="Objects\Dat\DatItemKV.cs" />
-    <Compile Include="Objects\Dat\Disk.cs" />
-    <Compile Include="Objects\Dat\Machine.cs" />
-    <Compile Include="Objects\Dat\Release.cs" />
-    <Compile Include="Objects\Dat\Sample.cs" />
-    <Compile Include="Objects\Dat\Rom.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="External\SupportedFiles\ZipFileEntry.cs" />
     <Compile Include="External\SupportedFiles\ZipFile.cs" />
     <Compile Include="Objects\Skippers\Skipper.cs" />
diff --git a/SabreTools.Helper/Tools/FileTools.cs b/SabreTools.Helper/Tools/FileTools.cs
index bd763c15..60e68bbd 100644
--- a/SabreTools.Helper/Tools/FileTools.cs
+++ b/SabreTools.Helper/Tools/FileTools.cs
@@ -8,6 +8,7 @@ using System.Xml;
 using System.Xml.Schema;
 using SabreTools.Helper.Data;
 using SabreTools.Helper.Dats;
+using SabreTools.Helper.Skippers;
 using Mono.Data.Sqlite;
 using NaturalSort;
 using OCRC;