diff --git a/SabreTools.DatItems/Enums.cs b/SabreTools.DatItems/Enums.cs
index 0ba1f426..c0498c4c 100644
--- a/SabreTools.DatItems/Enums.cs
+++ b/SabreTools.DatItems/Enums.cs
@@ -3,21 +3,6 @@ using SabreTools.Core;
 
 namespace SabreTools.DatItems
 {
-    /// <summary>
-    /// Determines what sort of files only use external hashes
-    /// </summary>
-    /// TODO: Can FileType be used instead?
-    [Flags]
-    public enum TreatAsFile
-    {
-        CHD = 1 << 0,
-        Archive = 1 << 1,
-        AaruFormat = 1 << 2,
-
-        NonArchive = CHD | AaruFormat,
-        All = CHD | Archive | AaruFormat,
-    }
-
     /// <summary>
     /// Determine the chip type
     /// </summary>
diff --git a/SabreTools.DatItems.Test/DatItemToolTests.cs b/SabreTools.DatTools.Test/DatItemToolTests.cs
similarity index 99%
rename from SabreTools.DatItems.Test/DatItemToolTests.cs
rename to SabreTools.DatTools.Test/DatItemToolTests.cs
index 8ffccaef..cf9dddad 100644
--- a/SabreTools.DatItems.Test/DatItemToolTests.cs
+++ b/SabreTools.DatTools.Test/DatItemToolTests.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using SabreTools.Core.Tools;
+using SabreTools.DatItems;
 using SabreTools.DatItems.Formats;
 using SabreTools.FileTypes;
 using SabreTools.FileTypes.Aaru;
@@ -8,7 +9,7 @@ using SabreTools.FileTypes.CHD;
 using SabreTools.IO.Extensions;
 using Xunit;
 
-namespace SabreTools.DatItems.Test
+namespace SabreTools.DatTools.Test
 {
     public class DatItemToolTests
     {
@@ -275,7 +276,7 @@ namespace SabreTools.DatItems.Test
             string sha1 = TextHelper.NormalizeSHA1("1234abcd")!;
             string sha256 = TextHelper.NormalizeSHA256("1234abcd")!;
 
-            File file = new File
+            DatItems.Formats.File file = new DatItems.Formats.File
             {
                 CRC = crc,
                 MD5 = md5,
diff --git a/SabreTools.DatItems/DatItemTool.cs b/SabreTools.DatTools/DatItemTool.cs
similarity index 97%
rename from SabreTools.DatItems/DatItemTool.cs
rename to SabreTools.DatTools/DatItemTool.cs
index 2ecc3428..e104133f 100644
--- a/SabreTools.DatItems/DatItemTool.cs
+++ b/SabreTools.DatTools/DatItemTool.cs
@@ -1,11 +1,12 @@
 using SabreTools.Core.Tools;
+using SabreTools.DatItems;
 using SabreTools.DatItems.Formats;
 using SabreTools.FileTypes;
 using SabreTools.FileTypes.Aaru;
 using SabreTools.FileTypes.CHD;
 using SabreTools.IO.Extensions;
 
-namespace SabreTools.DatItems
+namespace SabreTools.DatTools
 {
     public static class DatItemTool
     {
@@ -80,9 +81,9 @@ namespace SabreTools.DatItems
         /// </summary>
         /// <param name="baseFile">BaseFile to convert</param>
         /// <returns>File containing original BaseFile information</returns>
-        public static Formats.File ConvertToFile(this BaseFile baseFile)
+        public static DatItems.Formats.File ConvertToFile(this BaseFile baseFile)
         {
-            var file = new Formats.File();
+            var file = new DatItems.Formats.File();
 
             file.CRC = baseFile.CRC.ToHexString();
             file.MD5 = baseFile.MD5.ToHexString();
@@ -181,7 +182,7 @@ namespace SabreTools.DatItems
         /// </summary>
         /// <param name="file">File to convert</param>
         /// <returns>BaseFile containing original File information</returns>
-        public static BaseFile ConvertToBaseFile(this Formats.File file)
+        public static BaseFile ConvertToBaseFile(this DatItems.Formats.File file)
         {
             string? machineName = null;
             var machine = file.GetFieldValue<Machine>(DatItem.MachineKey);
diff --git a/SabreTools.DatTools/Enums.cs b/SabreTools.DatTools/Enums.cs
index f93a6365..3060efa4 100644
--- a/SabreTools.DatTools/Enums.cs
+++ b/SabreTools.DatTools/Enums.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace SabreTools.DatTools
 {
     /// <summary>
@@ -32,4 +34,19 @@ namespace SabreTools.DatTools
         Archive,
         File,
     }
+
+    /// <summary>
+    /// Determines what sort of files only use external hashes
+    /// </summary>
+    /// TODO: Can FileType be used instead?
+    [Flags]
+    public enum TreatAsFile
+    {
+        CHD = 1 << 0,
+        Archive = 1 << 1,
+        AaruFormat = 1 << 2,
+
+        NonArchive = CHD | AaruFormat,
+        All = CHD | Archive | AaruFormat,
+    }
 }