diff --git a/RombaSharp/Features/Archive.cs b/RombaSharp/Features/Archive.cs
index 22e6a7e2..6e258f22 100644
--- a/RombaSharp/Features/Archive.cs
+++ b/RombaSharp/Features/Archive.cs
@@ -2,9 +2,9 @@
 using System.IO;
 using System.Linq;
 
-using SabreTools.Library.Data;
 using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
+using SabreTools.Library.FileTypes;
 using SabreTools.Library.Help;
 using Microsoft.Data.Sqlite;
 
diff --git a/RombaSharp/Features/Build.cs b/RombaSharp/Features/Build.cs
index 78ea5028..1793c814 100644
--- a/RombaSharp/Features/Build.cs
+++ b/RombaSharp/Features/Build.cs
@@ -2,8 +2,8 @@
 using System.IO;
 using System.Linq;
 
-using SabreTools.Library.Data;
 using SabreTools.Library.DatFiles;
+using SabreTools.Library.FileTypes;
 using SabreTools.Library.Help;
 using SabreTools.Library.Tools;
 
diff --git a/SabreTools.Library/Data/Enums.cs b/SabreTools.Library/Data/Enums.cs
index 1125b46a..3babdac7 100644
--- a/SabreTools.Library/Data/Enums.cs
+++ b/SabreTools.Library/Data/Enums.cs
@@ -2,56 +2,6 @@
 {
     #region Archival
 
-    /// <summary>
-    /// Compression being used in CHD
-    /// </summary>
-    public enum CHDCompression : uint
-    {
-        CHDCOMPRESSION_NONE = 0,
-        CHDCOMPRESSION_ZLIB = 1,
-        CHDCOMPRESSION_ZLIB_PLUS = 2,
-        CHDCOMPRESSION_AV = 3,
-    }
-
-    /// <summary>
-    /// Availible CHD codec formats
-    /// </summary>
-    public enum CHD_CODEC : uint
-    {
-        NONE = 0,
-
-        #region General Codecs
-
-        ZLIB = 0x7a6c6962, // zlib
-        LZMA = 0x6c7a6d61, // lzma
-        HUFFMAN = 0x68756666, // huff
-        FLAC = 0x666c6163, // flac
-
-        #endregion
-
-        #region General Codecs with CD Frontend
-
-        CD_ZLIB = 0x63647a6c, // cdzl
-        CD_LZMA = 0x63646c7a, // cdlz
-        CD_FLAC = 0x6364666c, // cdfl
-
-        #endregion
-
-        #region A/V Codecs
-
-        AVHUFF = 0x61766875, // avhu
-
-        #endregion
-
-        #region Pseudo-Codecs Returned by hunk_info
-
-        SELF = 1,  // copy of another hunk
-        PARENT = 2,  // copy of a parent's hunk
-        MINI = 3,  // legacy "mini" 8-byte repeat
-
-        #endregion
-    }
-
     /// <summary>
     /// Compression method based on flag
     /// </summary>
@@ -81,52 +31,6 @@
         PPMdVersionIRev1 = 98,
     }
 
-    /// <summary>
-    /// Type of file that is being looked at
-    /// </summary>
-    public enum FileType
-    {
-        // Singleton
-        None = 0,
-        CHD,
-
-        // Can contain children
-        Folder,
-        SevenZipArchive,
-        GZipArchive,
-        LRZipArchive,
-        LZ4Archive,
-        RarArchive,
-        TapeArchive,
-        XZArchive,
-        ZipArchive,
-        ZPAQArchive,
-        ZstdArchive,
-    }
-
-    /// <summary>
-    /// Output format for rebuilt files
-    /// </summary>
-    public enum OutputFormat
-    {
-        // Currently implemented
-        Folder,
-        TorrentZip,
-        TorrentGzip,
-        TorrentGzipRomba,
-        TorrentXZ,
-        TorrentXZRomba,
-        TapeArchive,
-
-        // Currently unimplemented fully
-        Torrent7Zip,
-        TorrentRar,
-        TorrentLRZip,
-        TorrentLZ4,
-        TorrentZstd,
-        TorrentZPAQ,
-    }
-
     #endregion
 
     #region Reader related
diff --git a/SabreTools.Library/FileTypes/Enums.cs b/SabreTools.Library/FileTypes/Enums.cs
new file mode 100644
index 00000000..7972af23
--- /dev/null
+++ b/SabreTools.Library/FileTypes/Enums.cs
@@ -0,0 +1,98 @@
+namespace SabreTools.Library.FileTypes
+{
+    /// <summary>
+    /// Compression being used in CHD
+    /// </summary>
+    public enum CHDCompression : uint
+    {
+        CHDCOMPRESSION_NONE = 0,
+        CHDCOMPRESSION_ZLIB = 1,
+        CHDCOMPRESSION_ZLIB_PLUS = 2,
+        CHDCOMPRESSION_AV = 3,
+    }
+
+    /// <summary>
+    /// Availible CHD codec formats
+    /// </summary>
+    public enum CHD_CODEC : uint
+    {
+        NONE = 0,
+
+        #region General Codecs
+
+        ZLIB = 0x7a6c6962, // zlib
+        LZMA = 0x6c7a6d61, // lzma
+        HUFFMAN = 0x68756666, // huff
+        FLAC = 0x666c6163, // flac
+
+        #endregion
+
+        #region General Codecs with CD Frontend
+
+        CD_ZLIB = 0x63647a6c, // cdzl
+        CD_LZMA = 0x63646c7a, // cdlz
+        CD_FLAC = 0x6364666c, // cdfl
+
+        #endregion
+
+        #region A/V Codecs
+
+        AVHUFF = 0x61766875, // avhu
+
+        #endregion
+
+        #region Pseudo-Codecs Returned by hunk_info
+
+        SELF = 1,  // copy of another hunk
+        PARENT = 2,  // copy of a parent's hunk
+        MINI = 3,  // legacy "mini" 8-byte repeat
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Type of file that is being looked at
+    /// </summary>
+    public enum FileType
+    {
+        // Singleton
+        None = 0,
+        CHD,
+
+        // Can contain children
+        Folder,
+        SevenZipArchive,
+        GZipArchive,
+        LRZipArchive,
+        LZ4Archive,
+        RarArchive,
+        TapeArchive,
+        XZArchive,
+        ZipArchive,
+        ZPAQArchive,
+        ZstdArchive,
+    }
+
+    /// <summary>
+    /// Output format for rebuilt files
+    /// </summary>
+    public enum OutputFormat
+    {
+        // Currently implemented
+        Folder,
+        TorrentZip,
+        TorrentGzip,
+        TorrentGzipRomba,
+        TorrentXZ,
+        TorrentXZRomba,
+        TapeArchive,
+
+        // Currently unimplemented fully
+        Torrent7Zip,
+        TorrentRar,
+        TorrentLRZip,
+        TorrentLZ4,
+        TorrentZstd,
+        TorrentZPAQ,
+    }
+}
diff --git a/SabreTools/Features/BaseFeature.cs b/SabreTools/Features/BaseFeature.cs
index a8ad74f3..e7519007 100644
--- a/SabreTools/Features/BaseFeature.cs
+++ b/SabreTools/Features/BaseFeature.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using SabreTools.Library.Data;
 using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
+using SabreTools.Library.FileTypes;
 using SabreTools.Library.Filtering;
 using SabreTools.Library.Help;
 using SabreTools.Library.Reports;
diff --git a/SabreTools/Features/Sort.cs b/SabreTools/Features/Sort.cs
index 0af5522d..4f3a00a5 100644
--- a/SabreTools/Features/Sort.cs
+++ b/SabreTools/Features/Sort.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.IO;
 
-using SabreTools.Library.Data;
 using SabreTools.Library.DatFiles;
+using SabreTools.Library.FileTypes;
 using SabreTools.Library.Help;
 using SabreTools.Library.Tools;