diff --git a/SabreTools.DatFiles/DatFileTool.cs b/SabreTools.DatFiles/DatFileTool.cs
deleted file mode 100644
index b3774de4..00000000
--- a/SabreTools.DatFiles/DatFileTool.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System.Collections.Generic;
-using SabreTools.Core.Tools;
-using SabreTools.DatItems;
-using SabreTools.DatItems.Formats;
-using SabreTools.IO.Logging;
-
-namespace SabreTools.DatFiles
-{
-    /// <summary>
-    /// Helper methods for updating and converting DatFiles
-    /// </summary>
-    public static class DatFileTool
-    {
-        #region Logging
-
-        /// <summary>
-        /// Logging object
-        /// </summary>
-        private static readonly Logger _staticLogger = new();
-
-        #endregion
-
-        #region Sorting and Merging
-
-        /// <summary>
-        /// Merge an arbitrary set of DatItems based on the supplied information
-        /// </summary>
-        /// <param name="items">List of DatItem objects representing the items to be merged</param>
-        /// <returns>A List of DatItem objects representing the merged items</returns>
-        public static List<DatItem> Merge(List<DatItem>? items)
-        {
-            // Check for null or blank inputs first
-            if (items == null || items.Count == 0)
-                return [];
-
-            // Create output list
-            List<DatItem> output = [];
-
-            // Then deduplicate them by checking to see if data matches previous saved roms
-            int nodumpCount = 0;
-            foreach (DatItem datItem in items)
-            {
-                // If we don't have a Disk, File, Media, or Rom, we skip checking for duplicates
-                if (datItem is not Disk && datItem is not DatItems.Formats.File && datItem is not Media && datItem is not Rom)
-                    continue;
-
-                // If it's a nodump, add and skip
-                if (datItem is Rom rom && rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump)
-                {
-                    output.Add(datItem);
-                    nodumpCount++;
-                    continue;
-                }
-                else if (datItem is Disk disk && disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump)
-                {
-                    output.Add(datItem);
-                    nodumpCount++;
-                    continue;
-                }
-
-                // If it's the first non-nodump item in the list, don't touch it
-                if (output.Count == nodumpCount)
-                {
-                    output.Add(datItem);
-                    continue;
-                }
-
-                // Find the index of the first duplicate, if one exists
-                int pos = output.FindIndex(lastItem => datItem.GetDuplicateStatus(lastItem) != 0x00);
-                if (pos < 0)
-                {
-                    output.Add(datItem);
-                    continue;
-                }
-
-                // Get the duplicate item
-                DatItem savedItem = output[pos];
-                DupeType dupetype = datItem.GetDuplicateStatus(savedItem);
-
-                // Disks, File, Media, and Roms have more information to fill
-                if (datItem is Disk diskItem && savedItem is Disk savedDisk)
-                    savedDisk.FillMissingInformation(diskItem);
-                else if (datItem is DatItems.Formats.File fileItem && savedItem is DatItems.Formats.File savedFile)
-                    savedFile.FillMissingInformation(fileItem);
-                else if (datItem is Media mediaItem && savedItem is Media savedMedia)
-                    savedMedia.FillMissingInformation(mediaItem);
-                else if (datItem is Rom romItem && savedItem is Rom savedRom)
-                    savedRom.FillMissingInformation(romItem);
-
-                // Set the duplicate type on the saved item
-                savedItem.SetFieldValue<DupeType>(DatItem.DupeTypeKey, dupetype);
-
-                // Get the sources associated with the items
-                var savedSource = savedItem.GetFieldValue<Source?>(DatItem.SourceKey);
-                var itemSource = datItem.GetFieldValue<Source?>(DatItem.SourceKey);
-
-                // Get the machines associated with the items
-                var savedMachine = savedItem.GetFieldValue<Machine>(DatItem.MachineKey);
-                var itemMachine = datItem.GetFieldValue<Machine>(DatItem.MachineKey);
-
-                // If the current source has a lower ID than the saved, use the saved source
-                if (itemSource?.Index < savedSource?.Index)
-                {
-                    datItem.SetFieldValue<Source?>(DatItem.SourceKey, savedSource.Clone() as Source);
-                    savedItem.CopyMachineInformation(datItem);
-                    savedItem.SetName(datItem.GetName());
-                }
-
-                // If the saved machine is a child of the current machine, use the current machine instead
-                if (savedMachine?.GetStringFieldValue(Models.Metadata.Machine.CloneOfKey) == itemMachine?.GetStringFieldValue(Models.Metadata.Machine.NameKey)
-                    || savedMachine?.GetStringFieldValue(Models.Metadata.Machine.RomOfKey) == itemMachine?.GetStringFieldValue(Models.Metadata.Machine.NameKey))
-                {
-                    savedItem.CopyMachineInformation(datItem);
-                    savedItem.SetName(datItem.GetName());
-                }
-
-                // Replace the original item in the list
-                output.RemoveAt(pos);
-                output.Insert(pos, savedItem);
-            }
-
-            // Then return the result
-            return output;
-        }
-
-        #endregion
-    }
-}
diff --git a/SabreTools.DatFiles/ItemDictionary.cs b/SabreTools.DatFiles/ItemDictionary.cs
index 11dad452..5fb399d1 100644
--- a/SabreTools.DatFiles/ItemDictionary.cs
+++ b/SabreTools.DatFiles/ItemDictionary.cs
@@ -393,7 +393,7 @@ namespace SabreTools.DatFiles
 
                 // Sort and merge the list
                 Sort(ref sortedList, false);
-                sortedList = DatFileTool.Merge(sortedList);
+                sortedList = Merge(sortedList);
 
                 // Add the list back to the dictionary
                 RemoveBucket(key);
@@ -405,6 +405,108 @@ namespace SabreTools.DatFiles
 #endif
         }
 
+        /// <summary>
+        /// Merge an arbitrary set of DatItems based on the supplied information
+        /// </summary>
+        /// <param name="items">List of DatItem objects representing the items to be merged</param>
+        /// <returns>A List of DatItem objects representing the merged items</returns>
+        /// TODO: Make this internal like the DB counterpart
+        public static List<DatItem> Merge(List<DatItem>? items)
+        {
+            // Check for null or blank inputs first
+            if (items == null || items.Count == 0)
+                return [];
+
+            // Create output list
+            List<DatItem> output = [];
+
+            // Then deduplicate them by checking to see if data matches previous saved roms
+            int nodumpCount = 0;
+            foreach (DatItem datItem in items)
+            {
+                // If we don't have a Disk, File, Media, or Rom, we skip checking for duplicates
+                if (datItem is not Disk && datItem is not DatItems.Formats.File && datItem is not Media && datItem is not Rom)
+                    continue;
+
+                // If it's a nodump, add and skip
+                if (datItem is Rom rom && rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump)
+                {
+                    output.Add(datItem);
+                    nodumpCount++;
+                    continue;
+                }
+                else if (datItem is Disk disk && disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump)
+                {
+                    output.Add(datItem);
+                    nodumpCount++;
+                    continue;
+                }
+
+                // If it's the first non-nodump item in the list, don't touch it
+                if (output.Count == nodumpCount)
+                {
+                    output.Add(datItem);
+                    continue;
+                }
+
+                // Find the index of the first duplicate, if one exists
+                int pos = output.FindIndex(lastItem => datItem.GetDuplicateStatus(lastItem) != 0x00);
+                if (pos < 0)
+                {
+                    output.Add(datItem);
+                    continue;
+                }
+
+                // Get the duplicate item
+                DatItem savedItem = output[pos];
+                DupeType dupetype = datItem.GetDuplicateStatus(savedItem);
+
+                // Disks, File, Media, and Roms have more information to fill
+                if (datItem is Disk diskItem && savedItem is Disk savedDisk)
+                    savedDisk.FillMissingInformation(diskItem);
+                else if (datItem is DatItems.Formats.File fileItem && savedItem is DatItems.Formats.File savedFile)
+                    savedFile.FillMissingInformation(fileItem);
+                else if (datItem is Media mediaItem && savedItem is Media savedMedia)
+                    savedMedia.FillMissingInformation(mediaItem);
+                else if (datItem is Rom romItem && savedItem is Rom savedRom)
+                    savedRom.FillMissingInformation(romItem);
+
+                // Set the duplicate type on the saved item
+                savedItem.SetFieldValue<DupeType>(DatItem.DupeTypeKey, dupetype);
+
+                // Get the sources associated with the items
+                var savedSource = savedItem.GetFieldValue<Source?>(DatItem.SourceKey);
+                var itemSource = datItem.GetFieldValue<Source?>(DatItem.SourceKey);
+
+                // Get the machines associated with the items
+                var savedMachine = savedItem.GetFieldValue<Machine>(DatItem.MachineKey);
+                var itemMachine = datItem.GetFieldValue<Machine>(DatItem.MachineKey);
+
+                // If the current source has a lower ID than the saved, use the saved source
+                if (itemSource?.Index < savedSource?.Index)
+                {
+                    datItem.SetFieldValue<Source?>(DatItem.SourceKey, savedSource.Clone() as Source);
+                    savedItem.CopyMachineInformation(datItem);
+                    savedItem.SetName(datItem.GetName());
+                }
+
+                // If the saved machine is a child of the current machine, use the current machine instead
+                if (savedMachine?.GetStringFieldValue(Models.Metadata.Machine.CloneOfKey) == itemMachine?.GetStringFieldValue(Models.Metadata.Machine.NameKey)
+                    || savedMachine?.GetStringFieldValue(Models.Metadata.Machine.RomOfKey) == itemMachine?.GetStringFieldValue(Models.Metadata.Machine.NameKey))
+                {
+                    savedItem.CopyMachineInformation(datItem);
+                    savedItem.SetName(datItem.GetName());
+                }
+
+                // Replace the original item in the list
+                output.RemoveAt(pos);
+                output.Insert(pos, savedItem);
+            }
+
+            // Then return the result
+            return output;
+        }
+
         /// <summary>
         /// List all duplicates found in a DAT based on a DatItem
         /// </summary>
diff --git a/SabreTools.DatTools/Diffing.cs b/SabreTools.DatTools/Diffing.cs
index 0b4b1508..7be8bd17 100644
--- a/SabreTools.DatTools/Diffing.cs
+++ b/SabreTools.DatTools/Diffing.cs
@@ -217,7 +217,7 @@ namespace SabreTools.DatTools
             foreach (var key in datFile.Items.SortedKeys)
 #endif
             {
-                List<DatItem> items = DatFileTool.Merge(datFile.GetItemsForBucket(key));
+                List<DatItem> items = ItemDictionary.Merge(datFile.GetItemsForBucket(key));
 
                 // If the rom list is empty or null, just skip it
                 if (items == null || items.Count == 0)
@@ -440,7 +440,7 @@ namespace SabreTools.DatTools
             foreach (var key in datFile.Items.SortedKeys)
 #endif
             {
-                List<DatItem> items = DatFileTool.Merge(datFile.GetItemsForBucket(key));
+                List<DatItem> items = ItemDictionary.Merge(datFile.GetItemsForBucket(key));
 
                 // If the rom list is empty or null, just skip it
                 if (items == null || items.Count == 0)
@@ -648,7 +648,7 @@ namespace SabreTools.DatTools
             foreach (var key in datFile.Items.SortedKeys)
 #endif
             {
-                List<DatItem> items = DatFileTool.Merge(datFile.GetItemsForBucket(key));
+                List<DatItem> items = ItemDictionary.Merge(datFile.GetItemsForBucket(key));
 
                 // If the rom list is empty or null, just skip it
                 if (items == null || items.Count == 0)
@@ -816,7 +816,7 @@ namespace SabreTools.DatTools
             foreach (var key in datFile.Items.SortedKeys)
 #endif
             {
-                List<DatItem> items = DatFileTool.Merge(datFile.GetItemsForBucket(key));
+                List<DatItem> items = ItemDictionary.Merge(datFile.GetItemsForBucket(key));
 
                 // If the rom list is empty or null, just skip it
                 if (items == null || items.Count == 0)
diff --git a/SabreTools.DatTools/Splitter.cs b/SabreTools.DatTools/Splitter.cs
index 417b7302..a31d81c2 100644
--- a/SabreTools.DatTools/Splitter.cs
+++ b/SabreTools.DatTools/Splitter.cs
@@ -914,7 +914,7 @@ namespace SabreTools.DatTools
             foreach (var key in datFile.Items.SortedKeys)
 #endif
             {
-                List<DatItem> items = DatFileTool.Merge(datFile.GetItemsForBucket(key));
+                List<DatItem> items = ItemDictionary.Merge(datFile.GetItemsForBucket(key));
 
                 // If the rom list is empty or null, just skip it
                 if (items == null || items.Count == 0)