diff --git a/.gitignore b/.gitignore
index 68dfeca8..90df7a71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@
 /SabreTools/SabreTools.csproj.user
 /SabreTools.Core/bin/
 /SabreTools.Core/obj/
+/SabreTools.DatFiles/bin/
+/SabreTools.DatFiles/obj/
 /SabreTools.DatItems/bin/
 /SabreTools.DatItems/obj/
 /SabreTools.FileTypes/bin/
@@ -20,8 +22,6 @@
 /SabreTools.Help/obj/
 /SabreTools.IO/bin/
 /SabreTools.IO/obj/
-/SabreTools.Library/bin/
-/SabreTools.Library/obj/
 /SabreTools.Logging/bin/
 /SabreTools.Logging/obj/
 /SabreTools.Skippers/bin/
diff --git a/README.MD b/README.MD
index c19368d5..e09392fb 100644
--- a/README.MD
+++ b/README.MD
@@ -10,11 +10,11 @@ The SabreTools project started as a desktop port of some core features of Wizard
 
 ## Features
 
-For the most complete set of information, see the the [Wiki](https://github.com/SabreTools/SabreTools/wiki) or the [README.1ST](https://raw.githubusercontent.com/SabreTools/SabreTools/main/SabreTools.Library/README.1ST) file. Currently, the SabreTools suite consists of the following programs:
+For the most complete set of information, see the the [Wiki](https://github.com/SabreTools/SabreTools/wiki) or the [README.1ST](https://raw.githubusercontent.com/SabreTools/SabreTools/main//README.1ST) file. Currently, the SabreTools suite consists of the following programs:
 
-### SabreTools / SabreTools.Library
+### SabreTools / SabreTools Libraries
 
-As the core of the SabreTools suite, the C# library provides nearly all of the functionality, while the main executable acts as a reference implementation. Below is a list of features included in the library and exposed though the executable:
+As the core of the SabreTools suite, the C# libraries provide nearly all of the functionality, while the main executable acts as a reference implementation. Below is a list of features included in the libraries and exposed though the executable:
 
 * **Dir2DAT / DATFromDir** - Create a DAT from a file, folder, or mix of both
 	* Archives and files can be filtered selectively
diff --git a/RombaSharp/Features/Archive.cs b/RombaSharp/Features/Archive.cs
index bb24ad84..010215c8 100644
--- a/RombaSharp/Features/Archive.cs
+++ b/RombaSharp/Features/Archive.cs
@@ -3,9 +3,9 @@ using System.IO;
 using System.Linq;
 
 using SabreTools.Core;
+using SabreTools.DatFiles;
 using SabreTools.DatItems;
 using SabreTools.Help;
-using SabreTools.Library.DatFiles;
 using Microsoft.Data.Sqlite;
 
 namespace RombaSharp.Features
diff --git a/RombaSharp/Features/BaseFeature.cs b/RombaSharp/Features/BaseFeature.cs
index 6b21ca55..3d7f56a3 100644
--- a/RombaSharp/Features/BaseFeature.cs
+++ b/RombaSharp/Features/BaseFeature.cs
@@ -6,11 +6,12 @@ using System.Xml;
 using System.Xml.Schema;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
+using SabreTools.DatFiles;
 using SabreTools.DatItems;
 using SabreTools.FileTypes;
 using SabreTools.Help;
 using SabreTools.Logging;
-using SabreTools.Library.DatFiles;
 using Microsoft.Data.Sqlite;
 
 namespace RombaSharp.Features
diff --git a/RombaSharp/Features/Build.cs b/RombaSharp/Features/Build.cs
index abedbd7a..41b73c0a 100644
--- a/RombaSharp/Features/Build.cs
+++ b/RombaSharp/Features/Build.cs
@@ -3,9 +3,9 @@ using System.IO;
 using System.Linq;
 
 using SabreTools.Core;
+using SabreTools.DatFiles;
 using SabreTools.Help;
 using SabreTools.IO;
-using SabreTools.Library.DatFiles;
 
 namespace RombaSharp.Features
 {
diff --git a/RombaSharp/Features/DatStats.cs b/RombaSharp/Features/DatStats.cs
index 59bbfbfa..8afe98ab 100644
--- a/RombaSharp/Features/DatStats.cs
+++ b/RombaSharp/Features/DatStats.cs
@@ -2,8 +2,8 @@
 using System.IO;
 
 using SabreTools.Core;
+using SabreTools.DatFiles;
 using SabreTools.Help;
-using SabreTools.Library.DatFiles;
 
 namespace RombaSharp.Features
 {
diff --git a/RombaSharp/Features/Diffdat.cs b/RombaSharp/Features/Diffdat.cs
index d61a4f0b..c3df4841 100644
--- a/RombaSharp/Features/Diffdat.cs
+++ b/RombaSharp/Features/Diffdat.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.IO;
 
+using SabreTools.DatFiles;
 using SabreTools.Help;
 using SabreTools.IO;
-using SabreTools.Library.DatFiles;
 
 namespace RombaSharp.Features
 {
diff --git a/RombaSharp/Features/Dir2Dat.cs b/RombaSharp/Features/Dir2Dat.cs
index dc73d7bb..013ec8f9 100644
--- a/RombaSharp/Features/Dir2Dat.cs
+++ b/RombaSharp/Features/Dir2Dat.cs
@@ -2,10 +2,11 @@
 using System.IO;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
+using SabreTools.DatFiles;
 using SabreTools.Filtering;
 using SabreTools.Help;
 using SabreTools.IO;
-using SabreTools.Library.DatFiles;
 
 namespace RombaSharp.Features
 {
diff --git a/RombaSharp/Features/EDiffdat.cs b/RombaSharp/Features/EDiffdat.cs
index 5193db52..fdb14018 100644
--- a/RombaSharp/Features/EDiffdat.cs
+++ b/RombaSharp/Features/EDiffdat.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.IO;
 
+using SabreTools.DatFiles;
 using SabreTools.Help;
 using SabreTools.IO;
-using SabreTools.Library.DatFiles;
 
 namespace RombaSharp.Features
 {
diff --git a/RombaSharp/Features/Lookup.cs b/RombaSharp/Features/Lookup.cs
index 71f3851d..c23e1ad7 100644
--- a/RombaSharp/Features/Lookup.cs
+++ b/RombaSharp/Features/Lookup.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Help;
 using Microsoft.Data.Sqlite;
 
diff --git a/RombaSharp/Features/Miss.cs b/RombaSharp/Features/Miss.cs
index ba0f8226..36bd8a88 100644
--- a/RombaSharp/Features/Miss.cs
+++ b/RombaSharp/Features/Miss.cs
@@ -2,9 +2,9 @@
 using System.IO;
 
 using SabreTools.Core;
+using SabreTools.DatFiles;
 using SabreTools.Help;
 using SabreTools.IO;
-using SabreTools.Library.DatFiles;
 
 namespace RombaSharp.Features
 {
diff --git a/RombaSharp/Features/RefreshDats.cs b/RombaSharp/Features/RefreshDats.cs
index ae25cb79..d633cb4b 100644
--- a/RombaSharp/Features/RefreshDats.cs
+++ b/RombaSharp/Features/RefreshDats.cs
@@ -2,9 +2,9 @@
 using System.IO;
 
 using SabreTools.Core;
+using SabreTools.DatFiles;
 using SabreTools.DatItems;
 using SabreTools.Help;
-using SabreTools.Library.DatFiles;
 using SabreTools.Logging;
 using Microsoft.Data.Sqlite;
 
diff --git a/RombaSharp/Features/RescanDepots.cs b/RombaSharp/Features/RescanDepots.cs
index 5026c276..67312bb9 100644
--- a/RombaSharp/Features/RescanDepots.cs
+++ b/RombaSharp/Features/RescanDepots.cs
@@ -2,9 +2,9 @@
 using System.IO;
 
 using SabreTools.Core;
+using SabreTools.DatFiles;
 using SabreTools.DatItems;
 using SabreTools.Help;
-using SabreTools.Library.DatFiles;
 using Microsoft.Data.Sqlite;
 
 namespace RombaSharp.Features
diff --git a/RombaSharp/RombaSharp.csproj b/RombaSharp/RombaSharp.csproj
index 2dc4f76e..2b4b0e7c 100644
--- a/RombaSharp/RombaSharp.csproj
+++ b/RombaSharp/RombaSharp.csproj
@@ -17,11 +17,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\SabreTools.DatFiles\SabreTools.DatFiles.csproj" />
     <ProjectReference Include="..\SabreTools.DatItems\SabreTools.DatItems.csproj" />
     <ProjectReference Include="..\SabreTools.FileTypes\SabreTools.FileTypes.csproj" />
     <ProjectReference Include="..\SabreTools.Filtering\SabreTools.Filtering.csproj" />
     <ProjectReference Include="..\SabreTools.Help\SabreTools.Help.csproj" />
-    <ProjectReference Include="..\SabreTools.Library\SabreTools.Library.csproj" />
     <ProjectReference Include="..\SabreTools.Logging\SabreTools.Logging.csproj" />
   </ItemGroup>
 
diff --git a/SabreTools.Core/Converters.cs b/SabreTools.Core/Tools/Converters.cs
similarity index 99%
rename from SabreTools.Core/Converters.cs
rename to SabreTools.Core/Tools/Converters.cs
index da8fec5f..c5dc93ef 100644
--- a/SabreTools.Core/Converters.cs
+++ b/SabreTools.Core/Tools/Converters.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-namespace SabreTools.Core
+namespace SabreTools.Core.Tools
 {
     public static class Converters
     {
diff --git a/SabreTools.Core/Sanitizer.cs b/SabreTools.Core/Tools/Sanitizer.cs
similarity index 99%
rename from SabreTools.Core/Sanitizer.cs
rename to SabreTools.Core/Tools/Sanitizer.cs
index 49adda00..1e0863b4 100644
--- a/SabreTools.Core/Sanitizer.cs
+++ b/SabreTools.Core/Tools/Sanitizer.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace SabreTools.Core
+namespace SabreTools.Core.Tools
 {
     public static class Sanitizer
     {
diff --git a/SabreTools.Core/Utilities.cs b/SabreTools.Core/Tools/Utilities.cs
similarity index 99%
rename from SabreTools.Core/Utilities.cs
rename to SabreTools.Core/Tools/Utilities.cs
index bc5608e5..bedd9dd6 100644
--- a/SabreTools.Core/Utilities.cs
+++ b/SabreTools.Core/Tools/Utilities.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Core
+namespace SabreTools.Core.Tools
 {
     /// <summary>
     /// Static utility functions used throughout the library
diff --git a/SabreTools.Library/DatFiles/AttractMode.cs b/SabreTools.DatFiles/DatFiles/AttractMode.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/AttractMode.cs
rename to SabreTools.DatFiles/DatFiles/AttractMode.cs
index 71befa64..ac57a552 100644
--- a/SabreTools.Library/DatFiles/AttractMode.cs
+++ b/SabreTools.DatFiles/DatFiles/AttractMode.cs
@@ -7,7 +7,7 @@ using SabreTools.Core;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of an AttractMode DAT
diff --git a/SabreTools.Library/DatFiles/Auxiliary.cs b/SabreTools.DatFiles/DatFiles/Auxiliary.cs
similarity index 92%
rename from SabreTools.Library/DatFiles/Auxiliary.cs
rename to SabreTools.DatFiles/DatFiles/Auxiliary.cs
index 94d66c4f..9f2cf06b 100644
--- a/SabreTools.Library/DatFiles/Auxiliary.cs
+++ b/SabreTools.DatFiles/DatFiles/Auxiliary.cs
@@ -1,7 +1,7 @@
 /// <summary>
 /// This holds all of the auxiliary types needed for proper parsing
 /// </summary>
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     #region DatHeader
 
diff --git a/SabreTools.Library/DatFiles/ClrMamePro.cs b/SabreTools.DatFiles/DatFiles/ClrMamePro.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/ClrMamePro.cs
rename to SabreTools.DatFiles/DatFiles/ClrMamePro.cs
index e40def14..5f18ae2c 100644
--- a/SabreTools.Library/DatFiles/ClrMamePro.cs
+++ b/SabreTools.DatFiles/DatFiles/ClrMamePro.cs
@@ -4,10 +4,11 @@ using System.IO;
 using System.Text;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of a ClrMamePro DAT
diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.DatFiles/DatFiles/DatFile.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/DatFile.cs
rename to SabreTools.DatFiles/DatFiles/DatFile.cs
index 8b6f0522..1cf22a41 100644
--- a/SabreTools.Library/DatFiles/DatFile.cs
+++ b/SabreTools.DatFiles/DatFiles/DatFile.cs
@@ -10,17 +10,18 @@ using System.Threading.Tasks;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
+using SabreTools.DatFiles.Reports;
 using SabreTools.DatItems;
 using SabreTools.FileTypes;
 using SabreTools.Filtering;
 using SabreTools.IO;
 using SabreTools.Logging;
-using SabreTools.Library.Reports;
 using SabreTools.Skippers;
 using NaturalSort;
 using Newtonsoft.Json;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents a format-agnostic DAT
diff --git a/SabreTools.Library/DatFiles/DatHeader.cs b/SabreTools.DatFiles/DatFiles/DatHeader.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/DatHeader.cs
rename to SabreTools.DatFiles/DatFiles/DatHeader.cs
index 16d2c365..63a50c08 100644
--- a/SabreTools.Library/DatFiles/DatHeader.cs
+++ b/SabreTools.DatFiles/DatFiles/DatHeader.cs
@@ -5,10 +5,11 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.IO;
 using Newtonsoft.Json;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents all possible DAT header information
diff --git a/SabreTools.Library/DatFiles/DepotInformation.cs b/SabreTools.DatFiles/DatFiles/DepotInformation.cs
similarity index 97%
rename from SabreTools.Library/DatFiles/DepotInformation.cs
rename to SabreTools.DatFiles/DatFiles/DepotInformation.cs
index f0c7b72b..170cd8c1 100644
--- a/SabreTools.Library/DatFiles/DepotInformation.cs
+++ b/SabreTools.DatFiles/DatFiles/DepotInformation.cs
@@ -2,7 +2,7 @@
 
 using SabreTools.Core;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Depot information wrapper
diff --git a/SabreTools.Library/DatFiles/DosCenter.cs b/SabreTools.DatFiles/DatFiles/DosCenter.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/DosCenter.cs
rename to SabreTools.DatFiles/DatFiles/DosCenter.cs
index 28e0a15d..bfa18118 100644
--- a/SabreTools.Library/DatFiles/DosCenter.cs
+++ b/SabreTools.DatFiles/DatFiles/DosCenter.cs
@@ -5,10 +5,11 @@ using System.Linq;
 using System.Text;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of a DosCenter DAT
diff --git a/SabreTools.Library/DatFiles/EverdriveSmdb.cs b/SabreTools.DatFiles/DatFiles/EverdriveSmdb.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/EverdriveSmdb.cs
rename to SabreTools.DatFiles/DatFiles/EverdriveSmdb.cs
index 060e9e80..0c34357b 100644
--- a/SabreTools.Library/DatFiles/EverdriveSmdb.cs
+++ b/SabreTools.DatFiles/DatFiles/EverdriveSmdb.cs
@@ -7,7 +7,7 @@ using SabreTools.Core;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of an Everdrive SMDB file
diff --git a/SabreTools.Library/DatFiles/Hashfile.cs b/SabreTools.DatFiles/DatFiles/Hashfile.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/Hashfile.cs
rename to SabreTools.DatFiles/DatFiles/Hashfile.cs
index 8b60be36..a99790a6 100644
--- a/SabreTools.Library/DatFiles/Hashfile.cs
+++ b/SabreTools.DatFiles/DatFiles/Hashfile.cs
@@ -7,7 +7,7 @@ using SabreTools.Core;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of a hashfile such as an SFV, MD5, or SHA-1 file
diff --git a/SabreTools.Library/DatFiles/ItemDictionary.cs b/SabreTools.DatFiles/DatFiles/ItemDictionary.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/ItemDictionary.cs
rename to SabreTools.DatFiles/DatFiles/ItemDictionary.cs
index ecefe9df..1adf7849 100644
--- a/SabreTools.Library/DatFiles/ItemDictionary.cs
+++ b/SabreTools.DatFiles/DatFiles/ItemDictionary.cs
@@ -12,11 +12,11 @@ using SabreTools.Core;
 using SabreTools.DatItems;
 using SabreTools.IO;
 using SabreTools.Logging;
-using SabreTools.Library.Reports;
+using SabreTools.DatFiles.Reports;
 using NaturalSort;
 using Newtonsoft.Json;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Item dictionary with statistics, bucketing, and sorting
diff --git a/SabreTools.Library/DatFiles/Listrom.cs b/SabreTools.DatFiles/DatFiles/Listrom.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/Listrom.cs
rename to SabreTools.DatFiles/DatFiles/Listrom.cs
index 58106fd3..702b2e5f 100644
--- a/SabreTools.Library/DatFiles/Listrom.cs
+++ b/SabreTools.DatFiles/DatFiles/Listrom.cs
@@ -5,10 +5,11 @@ using System.Text;
 using System.Text.RegularExpressions;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of a MAME Listrom DAT
diff --git a/SabreTools.Library/DatFiles/Listxml.cs b/SabreTools.DatFiles/DatFiles/Listxml.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/Listxml.cs
rename to SabreTools.DatFiles/DatFiles/Listxml.cs
index 55d83e11..56aea1cc 100644
--- a/SabreTools.Library/DatFiles/Listxml.cs
+++ b/SabreTools.DatFiles/DatFiles/Listxml.cs
@@ -7,10 +7,11 @@ using System.Xml;
 using System.Xml.Schema;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of a MAME XML DAT
diff --git a/SabreTools.Library/DatFiles/Logiqx.cs b/SabreTools.DatFiles/DatFiles/Logiqx.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/Logiqx.cs
rename to SabreTools.DatFiles/DatFiles/Logiqx.cs
index a86200d7..2ad4b9e2 100644
--- a/SabreTools.Library/DatFiles/Logiqx.cs
+++ b/SabreTools.DatFiles/DatFiles/Logiqx.cs
@@ -8,10 +8,11 @@ using System.Xml;
 using System.Xml.Schema;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of a Logiqx-derived DAT
diff --git a/SabreTools.Library/DatFiles/Missfile.cs b/SabreTools.DatFiles/DatFiles/Missfile.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/Missfile.cs
rename to SabreTools.DatFiles/DatFiles/Missfile.cs
index b182dfdd..515c3813 100644
--- a/SabreTools.Library/DatFiles/Missfile.cs
+++ b/SabreTools.DatFiles/DatFiles/Missfile.cs
@@ -5,7 +5,7 @@ using System.Text;
 
 using SabreTools.DatItems;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of a Missfile
diff --git a/SabreTools.Library/DatFiles/OfflineList.cs b/SabreTools.DatFiles/DatFiles/OfflineList.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/OfflineList.cs
rename to SabreTools.DatFiles/DatFiles/OfflineList.cs
index 32d96bb3..ce2a4791 100644
--- a/SabreTools.Library/DatFiles/OfflineList.cs
+++ b/SabreTools.DatFiles/DatFiles/OfflineList.cs
@@ -6,10 +6,11 @@ using System.Xml;
 using System.Xml.Schema;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of an OfflineList XML DAT
diff --git a/SabreTools.Library/DatFiles/OpenMSX.cs b/SabreTools.DatFiles/DatFiles/OpenMSX.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/OpenMSX.cs
rename to SabreTools.DatFiles/DatFiles/OpenMSX.cs
index 1e279b03..8b8dfed7 100644
--- a/SabreTools.Library/DatFiles/OpenMSX.cs
+++ b/SabreTools.DatFiles/DatFiles/OpenMSX.cs
@@ -6,10 +6,11 @@ using System.Xml;
 using System.Xml.Schema;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of a openMSX softawre list XML DAT
diff --git a/SabreTools.Library/Reports/BaseReport.cs b/SabreTools.DatFiles/DatFiles/Reports/BaseReport.cs
similarity index 99%
rename from SabreTools.Library/Reports/BaseReport.cs
rename to SabreTools.DatFiles/DatFiles/Reports/BaseReport.cs
index c7c8630c..f45dd6de 100644
--- a/SabreTools.Library/Reports/BaseReport.cs
+++ b/SabreTools.DatFiles/DatFiles/Reports/BaseReport.cs
@@ -2,9 +2,9 @@
 using System.IO;
 
 using SabreTools.Core;
-using SabreTools.Library.DatFiles;
+using SabreTools.DatFiles;
 
-namespace SabreTools.Library.Reports
+namespace SabreTools.DatFiles.Reports
 {
     /// <summary>
     /// Base class for a report output format
diff --git a/SabreTools.Library/Reports/Html.cs b/SabreTools.DatFiles/DatFiles/Reports/Html.cs
similarity index 99%
rename from SabreTools.Library/Reports/Html.cs
rename to SabreTools.DatFiles/DatFiles/Reports/Html.cs
index 4e1aee47..7a5dc2ef 100644
--- a/SabreTools.Library/Reports/Html.cs
+++ b/SabreTools.DatFiles/DatFiles/Reports/Html.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Net;
 
-namespace SabreTools.Library.Reports
+namespace SabreTools.DatFiles.Reports
 {
     /// <summary>
     /// HTML report format
diff --git a/SabreTools.Library/Reports/SeparatedValue.cs b/SabreTools.DatFiles/DatFiles/Reports/SeparatedValue.cs
similarity index 99%
rename from SabreTools.Library/Reports/SeparatedValue.cs
rename to SabreTools.DatFiles/DatFiles/Reports/SeparatedValue.cs
index f4a79f55..de703995 100644
--- a/SabreTools.Library/Reports/SeparatedValue.cs
+++ b/SabreTools.DatFiles/DatFiles/Reports/SeparatedValue.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace SabreTools.Library.Reports
+namespace SabreTools.DatFiles.Reports
 {
     /// <summary>
     /// Separated-Value report format
diff --git a/SabreTools.Library/Reports/Textfile.cs b/SabreTools.DatFiles/DatFiles/Reports/Textfile.cs
similarity index 98%
rename from SabreTools.Library/Reports/Textfile.cs
rename to SabreTools.DatFiles/DatFiles/Reports/Textfile.cs
index 7ebe0568..e04a699e 100644
--- a/SabreTools.Library/Reports/Textfile.cs
+++ b/SabreTools.DatFiles/DatFiles/Reports/Textfile.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace SabreTools.Library.Reports
+namespace SabreTools.DatFiles.Reports
 {
     /// <summary>
     /// Textfile report format
diff --git a/SabreTools.Library/DatFiles/RomCenter.cs b/SabreTools.DatFiles/DatFiles/RomCenter.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/RomCenter.cs
rename to SabreTools.DatFiles/DatFiles/RomCenter.cs
index 37caef06..3b6a96a3 100644
--- a/SabreTools.Library/DatFiles/RomCenter.cs
+++ b/SabreTools.DatFiles/DatFiles/RomCenter.cs
@@ -4,10 +4,11 @@ using System.IO;
 using System.Text;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of a RomCenter DAT
diff --git a/SabreTools.Library/DatFiles/SabreJSON.cs b/SabreTools.DatFiles/DatFiles/SabreJSON.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/SabreJSON.cs
rename to SabreTools.DatFiles/DatFiles/SabreJSON.cs
index 947aaf8b..cebf6e72 100644
--- a/SabreTools.Library/DatFiles/SabreJSON.cs
+++ b/SabreTools.DatFiles/DatFiles/SabreJSON.cs
@@ -4,11 +4,12 @@ using System.IO;
 using System.Text;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of a reference SabreDAT JSON
diff --git a/SabreTools.Library/DatFiles/SabreXML.cs b/SabreTools.DatFiles/DatFiles/SabreXML.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/SabreXML.cs
rename to SabreTools.DatFiles/DatFiles/SabreXML.cs
index 78b45bcf..8aa4a026 100644
--- a/SabreTools.Library/DatFiles/SabreXML.cs
+++ b/SabreTools.DatFiles/DatFiles/SabreXML.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 using SabreTools.DatItems;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of a SabreDAT XML
diff --git a/SabreTools.Library/DatFiles/SeparatedValue.cs b/SabreTools.DatFiles/DatFiles/SeparatedValue.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/SeparatedValue.cs
rename to SabreTools.DatFiles/DatFiles/SeparatedValue.cs
index b0032183..2eaf22a3 100644
--- a/SabreTools.Library/DatFiles/SeparatedValue.cs
+++ b/SabreTools.DatFiles/DatFiles/SeparatedValue.cs
@@ -4,10 +4,11 @@ using System.IO;
 using System.Text;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of a value-separated DAT
diff --git a/SabreTools.Library/DatFiles/SoftwareList.cs b/SabreTools.DatFiles/DatFiles/SoftwareList.cs
similarity index 99%
rename from SabreTools.Library/DatFiles/SoftwareList.cs
rename to SabreTools.DatFiles/DatFiles/SoftwareList.cs
index 8c69080f..d2b3dfb0 100644
--- a/SabreTools.Library/DatFiles/SoftwareList.cs
+++ b/SabreTools.DatFiles/DatFiles/SoftwareList.cs
@@ -7,11 +7,12 @@ using System.Xml;
 using System.Xml.Schema;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.IO;
 
 // TODO: Use softwarelist.dtd and *try* to make this write more correctly
-namespace SabreTools.Library.DatFiles
+namespace SabreTools.DatFiles
 {
     /// <summary>
     /// Represents parsing and writing of a SoftwareList
diff --git a/SabreTools.Library/SabreTools.Library.csproj b/SabreTools.DatFiles/SabreTools.DatFiles.csproj
similarity index 100%
rename from SabreTools.Library/SabreTools.Library.csproj
rename to SabreTools.DatFiles/SabreTools.DatFiles.csproj
diff --git a/SabreTools.DatItems/Adjuster.cs b/SabreTools.DatItems/Adjuster.cs
index 55e3c914..295dcccb 100644
--- a/SabreTools.DatItems/Adjuster.cs
+++ b/SabreTools.DatItems/Adjuster.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/Archive.cs b/SabreTools.DatItems/Archive.cs
index 1e01b66e..b8d3bb61 100644
--- a/SabreTools.DatItems/Archive.cs
+++ b/SabreTools.DatItems/Archive.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/BiosSet.cs b/SabreTools.DatItems/BiosSet.cs
index 34e2ff8a..9ec30226 100644
--- a/SabreTools.DatItems/BiosSet.cs
+++ b/SabreTools.DatItems/BiosSet.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/Chip.cs b/SabreTools.DatItems/Chip.cs
index 029a4d88..d7ea5c13 100644
--- a/SabreTools.DatItems/Chip.cs
+++ b/SabreTools.DatItems/Chip.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
diff --git a/SabreTools.DatItems/Condition.cs b/SabreTools.DatItems/Condition.cs
index 364c9eb4..d39db0e8 100644
--- a/SabreTools.DatItems/Condition.cs
+++ b/SabreTools.DatItems/Condition.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
diff --git a/SabreTools.DatItems/Configuration.cs b/SabreTools.DatItems/Configuration.cs
index 923bf2fa..5c06cbe6 100644
--- a/SabreTools.DatItems/Configuration.cs
+++ b/SabreTools.DatItems/Configuration.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/Control.cs b/SabreTools.DatItems/Control.cs
index 88bc40ba..a031630f 100644
--- a/SabreTools.DatItems/Control.cs
+++ b/SabreTools.DatItems/Control.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
diff --git a/SabreTools.DatItems/DatItem.cs b/SabreTools.DatItems/DatItem.cs
index 15a817f3..613a70a1 100644
--- a/SabreTools.DatItems/DatItem.cs
+++ b/SabreTools.DatItems/DatItem.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.FileTypes;
 using SabreTools.Filtering;
 using SabreTools.Logging;
diff --git a/SabreTools.DatItems/DataArea.cs b/SabreTools.DatItems/DataArea.cs
index 7ee9bf2c..a29a7408 100644
--- a/SabreTools.DatItems/DataArea.cs
+++ b/SabreTools.DatItems/DataArea.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/Device.cs b/SabreTools.DatItems/Device.cs
index 7996f603..2de4caca 100644
--- a/SabreTools.DatItems/Device.cs
+++ b/SabreTools.DatItems/Device.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
diff --git a/SabreTools.DatItems/DeviceReference.cs b/SabreTools.DatItems/DeviceReference.cs
index f400d764..1956f13d 100644
--- a/SabreTools.DatItems/DeviceReference.cs
+++ b/SabreTools.DatItems/DeviceReference.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/DipSwitch.cs b/SabreTools.DatItems/DipSwitch.cs
index 0f4d2669..5181c417 100644
--- a/SabreTools.DatItems/DipSwitch.cs
+++ b/SabreTools.DatItems/DipSwitch.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/Disk.cs b/SabreTools.DatItems/Disk.cs
index 2b65251c..1831ae06 100644
--- a/SabreTools.DatItems/Disk.cs
+++ b/SabreTools.DatItems/Disk.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.FileTypes;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
diff --git a/SabreTools.DatItems/DiskArea.cs b/SabreTools.DatItems/DiskArea.cs
index 43f3e8ec..0ff4ce59 100644
--- a/SabreTools.DatItems/DiskArea.cs
+++ b/SabreTools.DatItems/DiskArea.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/Display.cs b/SabreTools.DatItems/Display.cs
index 2891a5ea..99d3b15a 100644
--- a/SabreTools.DatItems/Display.cs
+++ b/SabreTools.DatItems/Display.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
diff --git a/SabreTools.DatItems/Driver.cs b/SabreTools.DatItems/Driver.cs
index 86913075..061407f3 100644
--- a/SabreTools.DatItems/Driver.cs
+++ b/SabreTools.DatItems/Driver.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
diff --git a/SabreTools.DatItems/Extension.cs b/SabreTools.DatItems/Extension.cs
index 03cf30db..645cee48 100644
--- a/SabreTools.DatItems/Extension.cs
+++ b/SabreTools.DatItems/Extension.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/Feature.cs b/SabreTools.DatItems/Feature.cs
index 6cab84d2..92a74e27 100644
--- a/SabreTools.DatItems/Feature.cs
+++ b/SabreTools.DatItems/Feature.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
diff --git a/SabreTools.DatItems/Info.cs b/SabreTools.DatItems/Info.cs
index e8889a77..55360322 100644
--- a/SabreTools.DatItems/Info.cs
+++ b/SabreTools.DatItems/Info.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/Input.cs b/SabreTools.DatItems/Input.cs
index bafd4db9..f51a1800 100644
--- a/SabreTools.DatItems/Input.cs
+++ b/SabreTools.DatItems/Input.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/Instance.cs b/SabreTools.DatItems/Instance.cs
index 1393359c..735510d4 100644
--- a/SabreTools.DatItems/Instance.cs
+++ b/SabreTools.DatItems/Instance.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/Location.cs b/SabreTools.DatItems/Location.cs
index 197f8ae0..2583a427 100644
--- a/SabreTools.DatItems/Location.cs
+++ b/SabreTools.DatItems/Location.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/Machine.cs b/SabreTools.DatItems/Machine.cs
index e1fef421..be194b03 100644
--- a/SabreTools.DatItems/Machine.cs
+++ b/SabreTools.DatItems/Machine.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
diff --git a/SabreTools.DatItems/Media.cs b/SabreTools.DatItems/Media.cs
index 81a666fe..3c27a8f1 100644
--- a/SabreTools.DatItems/Media.cs
+++ b/SabreTools.DatItems/Media.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.FileTypes;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
diff --git a/SabreTools.DatItems/Part.cs b/SabreTools.DatItems/Part.cs
index 8c65332a..93fede04 100644
--- a/SabreTools.DatItems/Part.cs
+++ b/SabreTools.DatItems/Part.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/PartFeature.cs b/SabreTools.DatItems/PartFeature.cs
index 28b17be2..6bcfdd1c 100644
--- a/SabreTools.DatItems/PartFeature.cs
+++ b/SabreTools.DatItems/PartFeature.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/RamOption.cs b/SabreTools.DatItems/RamOption.cs
index d666cf30..cbe1078c 100644
--- a/SabreTools.DatItems/RamOption.cs
+++ b/SabreTools.DatItems/RamOption.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/Release.cs b/SabreTools.DatItems/Release.cs
index b6133dd1..a5f204e4 100644
--- a/SabreTools.DatItems/Release.cs
+++ b/SabreTools.DatItems/Release.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/Rom.cs b/SabreTools.DatItems/Rom.cs
index ad3ba1be..ad415b85 100644
--- a/SabreTools.DatItems/Rom.cs
+++ b/SabreTools.DatItems/Rom.cs
@@ -6,6 +6,7 @@ using System.Text;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.FileTypes;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
diff --git a/SabreTools.DatItems/Sample.cs b/SabreTools.DatItems/Sample.cs
index 851227ef..4642ced6 100644
--- a/SabreTools.DatItems/Sample.cs
+++ b/SabreTools.DatItems/Sample.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/Setting.cs b/SabreTools.DatItems/Setting.cs
index 03ed2fe8..1b5af86e 100644
--- a/SabreTools.DatItems/Setting.cs
+++ b/SabreTools.DatItems/Setting.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/SharedFeature.cs b/SabreTools.DatItems/SharedFeature.cs
index 5ef80d82..9d43c182 100644
--- a/SabreTools.DatItems/SharedFeature.cs
+++ b/SabreTools.DatItems/SharedFeature.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/Slot.cs b/SabreTools.DatItems/Slot.cs
index 4c44e5b0..02e59ff2 100644
--- a/SabreTools.DatItems/Slot.cs
+++ b/SabreTools.DatItems/Slot.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/SlotOption.cs b/SabreTools.DatItems/SlotOption.cs
index 985c30ee..d1c2f290 100644
--- a/SabreTools.DatItems/SlotOption.cs
+++ b/SabreTools.DatItems/SlotOption.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.DatItems/SoftwareList.cs b/SabreTools.DatItems/SoftwareList.cs
index ca23f234..55d83128 100644
--- a/SabreTools.DatItems/SoftwareList.cs
+++ b/SabreTools.DatItems/SoftwareList.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
diff --git a/SabreTools.DatItems/Sound.cs b/SabreTools.DatItems/Sound.cs
index 4262919c..fcf4eb85 100644
--- a/SabreTools.DatItems/Sound.cs
+++ b/SabreTools.DatItems/Sound.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Filtering;
 using Newtonsoft.Json;
 
diff --git a/SabreTools.FileTypes/Compress/ZipFile/zipFile.cs b/SabreTools.FileTypes/Compress/ZipFile/zipFile.cs
index 1c53eb2a..32eb1a86 100644
--- a/SabreTools.FileTypes/Compress/ZipFile/zipFile.cs
+++ b/SabreTools.FileTypes/Compress/ZipFile/zipFile.cs
@@ -1145,7 +1145,7 @@ namespace Compress.ZipFile
                         }
                         else
                         {
-                            return SabreTools.Core.Utilities.ConvertMsDosTimeFormatToDateTime(_lastModFileDateTime.Value);
+                            return SabreTools.Core.Tools.Utilities.ConvertMsDosTimeFormatToDateTime(_lastModFileDateTime.Value);
                         }
                     }
                     catch
diff --git a/SabreTools.FileTypes/Folder.cs b/SabreTools.FileTypes/Folder.cs
index 8228cd79..869498c8 100644
--- a/SabreTools.FileTypes/Folder.cs
+++ b/SabreTools.FileTypes/Folder.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.IO;
 using SabreTools.Logging;
 
@@ -65,7 +66,7 @@ namespace SabreTools.FileTypes
         /// <summary>
         /// Create an folder object of the specified type, if possible
         /// </summary>
-        /// <param name="outputFormat">SabreTools.Library.Data.OutputFormat representing the archive to create</param>
+        /// <param name="outputFormat">OutputFormat representing the archive to create</param>
         /// <returns>Archive object representing the inputs</returns>
         public static Folder Create(OutputFormat outputFormat)
         {
diff --git a/SabreTools.FileTypes/GZipArchive.cs b/SabreTools.FileTypes/GZipArchive.cs
index bf953f5c..f739ec07 100644
--- a/SabreTools.FileTypes/GZipArchive.cs
+++ b/SabreTools.FileTypes/GZipArchive.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.IO;
 using Compress;
 using Compress.gZip;
diff --git a/SabreTools.FileTypes/SevenZipArchive.cs b/SabreTools.FileTypes/SevenZipArchive.cs
index caa66747..23ec5bff 100644
--- a/SabreTools.FileTypes/SevenZipArchive.cs
+++ b/SabreTools.FileTypes/SevenZipArchive.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using Compress;
 using Compress.SevenZip;
 using Compress.ZipFile;
diff --git a/SabreTools.FileTypes/TapeArchive.cs b/SabreTools.FileTypes/TapeArchive.cs
index f3df421c..cfacd353 100644
--- a/SabreTools.FileTypes/TapeArchive.cs
+++ b/SabreTools.FileTypes/TapeArchive.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using Compress.ZipFile;
 using SharpCompress.Archives;
 using SharpCompress.Archives.Tar;
diff --git a/SabreTools.FileTypes/XZArchive.cs b/SabreTools.FileTypes/XZArchive.cs
index 23d3d22e..beb8df05 100644
--- a/SabreTools.FileTypes/XZArchive.cs
+++ b/SabreTools.FileTypes/XZArchive.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Text.RegularExpressions;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.IO;
 using SharpCompress.Compressors.Xz;
 
diff --git a/SabreTools.FileTypes/ZipArchive.cs b/SabreTools.FileTypes/ZipArchive.cs
index d2925b3c..fa866c2d 100644
--- a/SabreTools.FileTypes/ZipArchive.cs
+++ b/SabreTools.FileTypes/ZipArchive.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using Compress;
 using Compress.ZipFile;
 using NaturalSort;
diff --git a/SabreTools.Filtering/ExtraIni.cs b/SabreTools.Filtering/ExtraIni.cs
index 2224f18c..04a5359a 100644
--- a/SabreTools.Filtering/ExtraIni.cs
+++ b/SabreTools.Filtering/ExtraIni.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Logging;
 
 namespace SabreTools.Filtering
diff --git a/SabreTools.Filtering/Filter.cs b/SabreTools.Filtering/Filter.cs
index e71b126c..6104e98b 100644
--- a/SabreTools.Filtering/Filter.cs
+++ b/SabreTools.Filtering/Filter.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.Logging;
 
 namespace SabreTools.Filtering
diff --git a/SabreTools.sln b/SabreTools.sln
index 0b5bf0fa..e54f6b58 100644
--- a/SabreTools.sln
+++ b/SabreTools.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30128.74
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SabreTools.Library", "SabreTools.Library\SabreTools.Library.csproj", "{CA54EDF8-100F-46E7-933C-0E081C7FCBD3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SabreTools.DatFiles", "SabreTools.DatFiles\SabreTools.DatFiles.csproj", "{CA54EDF8-100F-46E7-933C-0E081C7FCBD3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RombaSharp", "RombaSharp\RombaSharp.csproj", "{99B5AAC0-A92C-4FD8-82B6-F82B44D7279D}"
 EndProject
diff --git a/SabreTools/Features/BaseFeature.cs b/SabreTools/Features/BaseFeature.cs
index bda34e01..46d2f1aa 100644
--- a/SabreTools/Features/BaseFeature.cs
+++ b/SabreTools/Features/BaseFeature.cs
@@ -3,10 +3,11 @@ using System.Collections.Generic;
 using System.IO;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
+using SabreTools.DatFiles;
 using SabreTools.Filtering;
 using SabreTools.Help;
 using SabreTools.Logging;
-using SabreTools.Library.DatFiles;
 using Microsoft.Data.Sqlite;
 
 namespace SabreTools.Features
diff --git a/SabreTools/Features/Batch.cs b/SabreTools/Features/Batch.cs
index 5aa75975..7168dfec 100644
--- a/SabreTools/Features/Batch.cs
+++ b/SabreTools/Features/Batch.cs
@@ -5,10 +5,11 @@ using System.Linq;
 using System.Text.RegularExpressions;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
+using SabreTools.DatFiles;
 using SabreTools.Filtering;
 using SabreTools.Help;
 using SabreTools.IO;
-using SabreTools.Library.DatFiles;
 
 namespace SabreTools.Features
 {
diff --git a/SabreTools/Features/DatFromDir.cs b/SabreTools/Features/DatFromDir.cs
index c7ef3670..58cf903f 100644
--- a/SabreTools/Features/DatFromDir.cs
+++ b/SabreTools/Features/DatFromDir.cs
@@ -3,9 +3,8 @@ using System.Collections.Generic;
 using System.IO;
 
 using SabreTools.Core;
+using SabreTools.DatFiles;
 using SabreTools.Help;
-using SabreTools.Library.DatFiles;
-
 namespace SabreTools.Features
 {
     internal class DatFromDir : BaseFeature
diff --git a/SabreTools/Features/Extract.cs b/SabreTools/Features/Extract.cs
index 1fdf9a81..74d8baf9 100644
--- a/SabreTools/Features/Extract.cs
+++ b/SabreTools/Features/Extract.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.FileTypes;
 using SabreTools.Help;
 using SabreTools.IO;
diff --git a/SabreTools/Features/Restore.cs b/SabreTools/Features/Restore.cs
index 1917bd22..39b42cb8 100644
--- a/SabreTools/Features/Restore.cs
+++ b/SabreTools/Features/Restore.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 
 using SabreTools.Core;
+using SabreTools.Core.Tools;
 using SabreTools.FileTypes;
 using SabreTools.Help;
 using SabreTools.IO;
diff --git a/SabreTools/Features/Sort.cs b/SabreTools/Features/Sort.cs
index 7bba5e98..fb54c8a8 100644
--- a/SabreTools/Features/Sort.cs
+++ b/SabreTools/Features/Sort.cs
@@ -2,9 +2,9 @@
 using System.IO;
 
 using SabreTools.Core;
+using SabreTools.DatFiles;
 using SabreTools.Help;
 using SabreTools.IO;
-using SabreTools.Library.DatFiles;
 using SabreTools.Logging;
 
 namespace SabreTools.Features
diff --git a/SabreTools/Features/Split.cs b/SabreTools/Features/Split.cs
index 1fcc743b..c5c532dd 100644
--- a/SabreTools/Features/Split.cs
+++ b/SabreTools/Features/Split.cs
@@ -2,9 +2,9 @@
 using System.Threading.Tasks;
 
 using SabreTools.Core;
+using SabreTools.DatFiles;
 using SabreTools.Help;
 using SabreTools.IO;
-using SabreTools.Library.DatFiles;
 using SabreTools.Logging;
 
 namespace SabreTools.Features
diff --git a/SabreTools/Features/Stats.cs b/SabreTools/Features/Stats.cs
index 81db1958..3c73d582 100644
--- a/SabreTools/Features/Stats.cs
+++ b/SabreTools/Features/Stats.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.IO;
 
+using SabreTools.DatFiles;
 using SabreTools.Help;
-using SabreTools.Library.DatFiles;
 
 namespace SabreTools.Features
 {
diff --git a/SabreTools/Features/Update.cs b/SabreTools/Features/Update.cs
index 72ad5a3a..887f5875 100644
--- a/SabreTools/Features/Update.cs
+++ b/SabreTools/Features/Update.cs
@@ -4,9 +4,9 @@ using System.IO;
 using System.Threading.Tasks;
 
 using SabreTools.Core;
+using SabreTools.DatFiles;
 using SabreTools.Help;
 using SabreTools.IO;
-using SabreTools.Library.DatFiles;
 using SabreTools.Logging;
 
 namespace SabreTools.Features
diff --git a/SabreTools/Features/Verify.cs b/SabreTools/Features/Verify.cs
index 598a3991..379eb7fe 100644
--- a/SabreTools/Features/Verify.cs
+++ b/SabreTools/Features/Verify.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 
 using SabreTools.Core;
+using SabreTools.DatFiles;
 using SabreTools.Help;
 using SabreTools.IO;
-using SabreTools.Library.DatFiles;
 using SabreTools.Logging;
 
 namespace SabreTools.Features
diff --git a/SabreTools/SabreTools.csproj b/SabreTools/SabreTools.csproj
index b6633824..8991fabb 100644
--- a/SabreTools/SabreTools.csproj
+++ b/SabreTools/SabreTools.csproj
@@ -17,9 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\SabreTools.DatFiles\SabreTools.DatFiles.csproj" />
     <ProjectReference Include="..\SabreTools.Filtering\SabreTools.Filtering.csproj" />
     <ProjectReference Include="..\SabreTools.Help\SabreTools.Help.csproj" />
-    <ProjectReference Include="..\SabreTools.Library\SabreTools.Library.csproj" />
     <ProjectReference Include="..\SabreTools.Logging\SabreTools.Logging.csproj" />
   </ItemGroup>