diff --git a/SabreTools.Core/Enums.cs b/SabreTools.Core/Enums.cs
index 8c1590db..e60af2b4 100644
--- a/SabreTools.Core/Enums.cs
+++ b/SabreTools.Core/Enums.cs
@@ -3,91 +3,6 @@
 // TODO: Figure out the best way to put these back in their libraries
 namespace SabreTools.Core
 {
-    #region DatFiles
-
-    /// <summary>
-    /// Determines merging tag handling for DAT output
-    /// </summary>
-    public enum MergingFlag
-    {
-        [Mapping("none")]
-        None = 0,
-
-        [Mapping("split")]
-        Split,
-
-        [Mapping("merged")]
-        Merged,
-
-        [Mapping("nonmerged", "unmerged")]
-        NonMerged,
-
-        /// <remarks>This is not usually defined for Merging flags</remarks>
-        [Mapping("fullmerged")]
-        FullMerged,
-
-        /// <remarks>This is not usually defined for Merging flags</remarks>
-        [Mapping("device", "deviceunmerged", "devicenonmerged")]
-        DeviceNonMerged,
-
-        /// <remarks>This is not usually defined for Merging flags</remarks>
-        [Mapping("full", "fullunmerged", "fullnonmerged")]
-        FullNonMerged,
-    }
-
-    /// <summary>
-    /// Determines nodump tag handling for DAT output
-    /// </summary>
-    public enum NodumpFlag
-    {
-        [Mapping("none")]
-        None = 0,
-
-        [Mapping("obsolete")]
-        Obsolete,
-
-        [Mapping("required")]
-        Required,
-
-        [Mapping("ignore")]
-        Ignore,
-    }
-
-    /// <summary>
-    /// Determines packing tag handling for DAT output
-    /// </summary>
-    public enum PackingFlag
-    {
-        [Mapping("none")]
-        None = 0,
-
-        /// <summary>
-        /// Force all sets to be in archives, except disk and media
-        /// </summary>
-        [Mapping("zip", "yes")]
-        Zip,
-
-        /// <summary>
-        /// Force all sets to be extracted into subfolders
-        /// </summary>
-        [Mapping("unzip", "no")]
-        Unzip,
-
-        /// <summary>
-        /// Force sets with single items to be extracted to the parent folder
-        /// </summary>
-        [Mapping("partial")]
-        Partial,
-
-        /// <summary>
-        /// Force all sets to be extracted to the parent folder
-        /// </summary>
-        [Mapping("flat")]
-        Flat,
-    }
-
-    #endregion
-
     #region DatItems
 
     /// <summary>
diff --git a/SabreTools.DatFiles/DatFile.ToMetadata.cs b/SabreTools.DatFiles/DatFile.ToMetadata.cs
index e81c1c2f..549c9e86 100644
--- a/SabreTools.DatFiles/DatFile.ToMetadata.cs
+++ b/SabreTools.DatFiles/DatFile.ToMetadata.cs
@@ -47,11 +47,11 @@ namespace SabreTools.DatFiles
             var header = Header.GetInternalClone();
 
             // Remove fields with default values
-            if (header.Read<Core.MergingFlag>(Models.Metadata.Header.ForceMergingKey) == Core.MergingFlag.None)
+            if (header.Read<MergingFlag>(Models.Metadata.Header.ForceMergingKey) == MergingFlag.None)
                 header.Remove(Models.Metadata.Header.ForceMergingKey);
-            if (header.Read<Core.NodumpFlag>(Models.Metadata.Header.ForceNodumpKey) == Core.NodumpFlag.None)
+            if (header.Read<NodumpFlag>(Models.Metadata.Header.ForceNodumpKey) == NodumpFlag.None)
                 header.Remove(Models.Metadata.Header.ForceNodumpKey);
-            if (header.Read<Core.PackingFlag>(Models.Metadata.Header.ForcePackingKey) == Core.PackingFlag.None)
+            if (header.Read<PackingFlag>(Models.Metadata.Header.ForcePackingKey) == PackingFlag.None)
                 header.Remove(Models.Metadata.Header.ForcePackingKey);
 
             // Convert subheader values
diff --git a/SabreTools.DatFiles/Enums.cs b/SabreTools.DatFiles/Enums.cs
index 1ce78bf3..24b2613f 100644
--- a/SabreTools.DatFiles/Enums.cs
+++ b/SabreTools.DatFiles/Enums.cs
@@ -1,4 +1,5 @@
 using System;
+using SabreTools.Core;
 
 namespace SabreTools.DatFiles
 {
@@ -175,4 +176,85 @@ namespace SabreTools.DatFiles
         SHA384,
         SHA512,
     }
+
+    /// <summary>
+    /// Determines merging tag handling for DAT output
+    /// </summary>
+    public enum MergingFlag
+    {
+        [Mapping("none")]
+        None = 0,
+
+        [Mapping("split")]
+        Split,
+
+        [Mapping("merged")]
+        Merged,
+
+        [Mapping("nonmerged", "unmerged")]
+        NonMerged,
+
+        /// <remarks>This is not usually defined for Merging flags</remarks>
+        [Mapping("fullmerged")]
+        FullMerged,
+
+        /// <remarks>This is not usually defined for Merging flags</remarks>
+        [Mapping("device", "deviceunmerged", "devicenonmerged")]
+        DeviceNonMerged,
+
+        /// <remarks>This is not usually defined for Merging flags</remarks>
+        [Mapping("full", "fullunmerged", "fullnonmerged")]
+        FullNonMerged,
+    }
+
+    /// <summary>
+    /// Determines nodump tag handling for DAT output
+    /// </summary>
+    public enum NodumpFlag
+    {
+        [Mapping("none")]
+        None = 0,
+
+        [Mapping("obsolete")]
+        Obsolete,
+
+        [Mapping("required")]
+        Required,
+
+        [Mapping("ignore")]
+        Ignore,
+    }
+
+    /// <summary>
+    /// Determines packing tag handling for DAT output
+    /// </summary>
+    public enum PackingFlag
+    {
+        [Mapping("none")]
+        None = 0,
+
+        /// <summary>
+        /// Force all sets to be in archives, except disk and media
+        /// </summary>
+        [Mapping("zip", "yes")]
+        Zip,
+
+        /// <summary>
+        /// Force all sets to be extracted into subfolders
+        /// </summary>
+        [Mapping("unzip", "no")]
+        Unzip,
+
+        /// <summary>
+        /// Force sets with single items to be extracted to the parent folder
+        /// </summary>
+        [Mapping("partial")]
+        Partial,
+
+        /// <summary>
+        /// Force all sets to be extracted to the parent folder
+        /// </summary>
+        [Mapping("flat")]
+        Flat,
+    }
 }
\ No newline at end of file
diff --git a/SabreTools.Test/Core/ConvertersTests.cs b/SabreTools.Test/Core/ConvertersTests.cs
index 99a10ae9..f76dfc46 100644
--- a/SabreTools.Test/Core/ConvertersTests.cs
+++ b/SabreTools.Test/Core/ConvertersTests.cs
@@ -1,5 +1,6 @@
 using SabreTools.Core;
 using SabreTools.Core.Tools;
+using SabreTools.DatFiles;
 using Xunit;
 
 namespace SabreTools.Test.Core