diff --git a/SabreTools.Test/ParserTests.cs b/SabreTools.DatTools.Test/ParserTests.cs
similarity index 99%
rename from SabreTools.Test/ParserTests.cs
rename to SabreTools.DatTools.Test/ParserTests.cs
index c4aac729..d62e032e 100644
--- a/SabreTools.Test/ParserTests.cs
+++ b/SabreTools.DatTools.Test/ParserTests.cs
@@ -1,11 +1,10 @@
 using System;
 using System.IO;
 using SabreTools.DatFiles;
-using SabreTools.DatTools;
 using SabreTools.Reports;
 using Xunit;
 
-namespace SabreTools.Test
+namespace SabreTools.DatTools.Test
 {
     public class ParserTests
     {
@@ -131,7 +130,7 @@ namespace SabreTools.Test
         public void CreateDatFile_Format_FromHeader(DatFormat datFormat, DatFormat expected)
         {
             DatHeader datHeader = new DatHeader();
-            datHeader.SetFieldValue<DatFormat>(DatHeader.DatFormatKey, datFormat);
+            datHeader.SetFieldValue(DatHeader.DatFormatKey, datFormat);
             datHeader.SetFieldValue<string?>(DatHeader.FileNameKey, "filename");
 
             DatModifiers datModifiers = new DatModifiers();
diff --git a/SabreTools.Test/TestData/test-archivedotorg.xml b/SabreTools.DatTools.Test/TestData/test-archivedotorg.xml
similarity index 100%
rename from SabreTools.Test/TestData/test-archivedotorg.xml
rename to SabreTools.DatTools.Test/TestData/test-archivedotorg.xml
diff --git a/SabreTools.Test/TestData/test-attractmode.txt b/SabreTools.DatTools.Test/TestData/test-attractmode.txt
similarity index 100%
rename from SabreTools.Test/TestData/test-attractmode.txt
rename to SabreTools.DatTools.Test/TestData/test-attractmode.txt
diff --git a/SabreTools.Test/TestData/test-cmp.dat b/SabreTools.DatTools.Test/TestData/test-cmp.dat
similarity index 100%
rename from SabreTools.Test/TestData/test-cmp.dat
rename to SabreTools.DatTools.Test/TestData/test-cmp.dat
diff --git a/SabreTools.Test/TestData/test-doscenter.dat b/SabreTools.DatTools.Test/TestData/test-doscenter.dat
similarity index 100%
rename from SabreTools.Test/TestData/test-doscenter.dat
rename to SabreTools.DatTools.Test/TestData/test-doscenter.dat
diff --git a/SabreTools.Test/TestData/test-listrom.txt b/SabreTools.DatTools.Test/TestData/test-listrom.txt
similarity index 100%
rename from SabreTools.Test/TestData/test-listrom.txt
rename to SabreTools.DatTools.Test/TestData/test-listrom.txt
diff --git a/SabreTools.Test/TestData/test-listxml.xml b/SabreTools.DatTools.Test/TestData/test-listxml.xml
similarity index 100%
rename from SabreTools.Test/TestData/test-listxml.xml
rename to SabreTools.DatTools.Test/TestData/test-listxml.xml
diff --git a/SabreTools.Test/TestData/test-logiqx.xml b/SabreTools.DatTools.Test/TestData/test-logiqx.xml
similarity index 100%
rename from SabreTools.Test/TestData/test-logiqx.xml
rename to SabreTools.DatTools.Test/TestData/test-logiqx.xml
diff --git a/SabreTools.Test/TestData/test-md2.md2 b/SabreTools.DatTools.Test/TestData/test-md2.md2
similarity index 100%
rename from SabreTools.Test/TestData/test-md2.md2
rename to SabreTools.DatTools.Test/TestData/test-md2.md2
diff --git a/SabreTools.Test/TestData/test-md4.md4 b/SabreTools.DatTools.Test/TestData/test-md4.md4
similarity index 100%
rename from SabreTools.Test/TestData/test-md4.md4
rename to SabreTools.DatTools.Test/TestData/test-md4.md4
diff --git a/SabreTools.Test/TestData/test-md5.md5 b/SabreTools.DatTools.Test/TestData/test-md5.md5
similarity index 100%
rename from SabreTools.Test/TestData/test-md5.md5
rename to SabreTools.DatTools.Test/TestData/test-md5.md5
diff --git a/SabreTools.Test/TestData/test-offlinelist.xml b/SabreTools.DatTools.Test/TestData/test-offlinelist.xml
similarity index 100%
rename from SabreTools.Test/TestData/test-offlinelist.xml
rename to SabreTools.DatTools.Test/TestData/test-offlinelist.xml
diff --git a/SabreTools.Test/TestData/test-openmsx.xml b/SabreTools.DatTools.Test/TestData/test-openmsx.xml
similarity index 100%
rename from SabreTools.Test/TestData/test-openmsx.xml
rename to SabreTools.DatTools.Test/TestData/test-openmsx.xml
diff --git a/SabreTools.Test/TestData/test-romcenter.dat b/SabreTools.DatTools.Test/TestData/test-romcenter.dat
similarity index 100%
rename from SabreTools.Test/TestData/test-romcenter.dat
rename to SabreTools.DatTools.Test/TestData/test-romcenter.dat
diff --git a/SabreTools.Test/TestData/test-sfv.sfv b/SabreTools.DatTools.Test/TestData/test-sfv.sfv
similarity index 100%
rename from SabreTools.Test/TestData/test-sfv.sfv
rename to SabreTools.DatTools.Test/TestData/test-sfv.sfv
diff --git a/SabreTools.Test/TestData/test-sha1.sha1 b/SabreTools.DatTools.Test/TestData/test-sha1.sha1
similarity index 100%
rename from SabreTools.Test/TestData/test-sha1.sha1
rename to SabreTools.DatTools.Test/TestData/test-sha1.sha1
diff --git a/SabreTools.Test/TestData/test-sha256.sha256 b/SabreTools.DatTools.Test/TestData/test-sha256.sha256
similarity index 100%
rename from SabreTools.Test/TestData/test-sha256.sha256
rename to SabreTools.DatTools.Test/TestData/test-sha256.sha256
diff --git a/SabreTools.Test/TestData/test-sha384.sha384 b/SabreTools.DatTools.Test/TestData/test-sha384.sha384
similarity index 100%
rename from SabreTools.Test/TestData/test-sha384.sha384
rename to SabreTools.DatTools.Test/TestData/test-sha384.sha384
diff --git a/SabreTools.Test/TestData/test-sha512.sha512 b/SabreTools.DatTools.Test/TestData/test-sha512.sha512
similarity index 100%
rename from SabreTools.Test/TestData/test-sha512.sha512
rename to SabreTools.DatTools.Test/TestData/test-sha512.sha512
diff --git a/SabreTools.Test/TestData/test-smdb.txt b/SabreTools.DatTools.Test/TestData/test-smdb.txt
similarity index 100%
rename from SabreTools.Test/TestData/test-smdb.txt
rename to SabreTools.DatTools.Test/TestData/test-smdb.txt
diff --git a/SabreTools.Test/TestData/test-softwarelist.xml b/SabreTools.DatTools.Test/TestData/test-softwarelist.xml
similarity index 100%
rename from SabreTools.Test/TestData/test-softwarelist.xml
rename to SabreTools.DatTools.Test/TestData/test-softwarelist.xml
diff --git a/SabreTools.Test/TestData/test-spamsum.spamsum b/SabreTools.DatTools.Test/TestData/test-spamsum.spamsum
similarity index 100%
rename from SabreTools.Test/TestData/test-spamsum.spamsum
rename to SabreTools.DatTools.Test/TestData/test-spamsum.spamsum