diff --git a/SabreTools.Data.Extensions.Test/SabreTools.Data.Extensions.Test.csproj b/SabreTools.Data.Extensions.Test/SabreTools.Data.Extensions.Test.csproj
index 69a04dc7..d18dcf28 100644
--- a/SabreTools.Data.Extensions.Test/SabreTools.Data.Extensions.Test.csproj
+++ b/SabreTools.Data.Extensions.Test/SabreTools.Data.Extensions.Test.csproj
@@ -8,20 +8,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\SabreTools.Serialization\SabreTools.Serialization.csproj" />
+        <PackageReference Include="coverlet.collector" Version="8.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="8.0.0">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-        <PackageReference Include="xunit" Version="2.9.3" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
+        <ProjectReference Include="..\SabreTools.Data.Extensions\SabreTools.Data.Extensions.csproj" />
     </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/SabreTools.Data.Extensions.Test/TypeLengthValueTests.cs b/SabreTools.Data.Extensions.Test/TypeLengthValueTests.cs
index eb689fbd..2340735e 100644
--- a/SabreTools.Data.Extensions.Test/TypeLengthValueTests.cs
+++ b/SabreTools.Data.Extensions.Test/TypeLengthValueTests.cs
@@ -13,7 +13,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_EOC()
         {
             string expected = "Type: V_ASN1_EOC";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_EOC, Length = 0, Value = null };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_EOC, Length = 0, Value = null };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -22,7 +22,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_ZeroLength()
         {
             string expected = "Type: V_ASN1_NULL, Length: 0";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_NULL, Length = 0, Value = null };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_NULL, Length = 0, Value = null };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -31,7 +31,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_InvalidConstructed()
         {
             string expected = "Type: V_ASN1_OBJECT, V_ASN1_CONSTRUCTED, Length: 1, Value: [INVALID DATA TYPE]";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT | ASN1Type.V_ASN1_CONSTRUCTED, Length = 1, Value = false };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT | ASN1Type.V_ASN1_CONSTRUCTED, Length = 1, Value = false };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -40,8 +40,8 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_ValidConstructed()
         {
             string expected = "Type: V_ASN1_OBJECT, V_ASN1_CONSTRUCTED, Length: 3, Value:\n Type: V_ASN1_BOOLEAN, Length: 1, Value: True";
-            var boolTlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 1, Value = new byte[] { 0x01 } };
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT | ASN1Type.V_ASN1_CONSTRUCTED, Length = 3, Value = new Data.Models.ASN1.TypeLengthValue[] { boolTlv } };
+            var boolTlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 1, Value = new byte[] { 0x01 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT | ASN1Type.V_ASN1_CONSTRUCTED, Length = 3, Value = new TypeLengthValue[] { boolTlv } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -50,7 +50,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_InvalidDataType()
         {
             string expected = "Type: V_ASN1_OBJECT, Length: 1, Value: [INVALID DATA TYPE]";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT, Length = 1, Value = false };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT, Length = 1, Value = false };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -59,7 +59,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_InvalidLength()
         {
             string expected = "Type: V_ASN1_NULL, Length: 1, Value: [NO DATA]";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_NULL, Length = 1, Value = Array.Empty<byte>() };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_NULL, Length = 1, Value = Array.Empty<byte>() };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -68,7 +68,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_InvalidBooleanLength()
         {
             string expected = "Type: V_ASN1_BOOLEAN, Length: 2 [Expected length of 1], Value: True";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 2, Value = new byte[] { 0x01 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 2, Value = new byte[] { 0x01 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -77,7 +77,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_InvalidBooleanArrayLength()
         {
             string expected = "Type: V_ASN1_BOOLEAN, Length: 1 [Expected value length of 1], Value: True";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 1, Value = new byte[] { 0x01, 0x00 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 1, Value = new byte[] { 0x01, 0x00 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -86,7 +86,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_ValidBoolean()
         {
             string expected = "Type: V_ASN1_BOOLEAN, Length: 1, Value: True";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 1, Value = new byte[] { 0x01 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 1, Value = new byte[] { 0x01 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -95,7 +95,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_ValidInteger()
         {
             string expected = "Type: V_ASN1_INTEGER, Length: 1, Value: 1";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_INTEGER, Length = 1, Value = new byte[] { 0x01 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_INTEGER, Length = 1, Value = new byte[] { 0x01 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -104,7 +104,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_ValidBitString_NoBits()
         {
             string expected = "Type: V_ASN1_BIT_STRING, Length: 1, Value with 0 unused bits";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_BIT_STRING, Length = 1, Value = new byte[] { 0x00 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_BIT_STRING, Length = 1, Value = new byte[] { 0x00 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -113,7 +113,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_ValidBitString_Bits()
         {
             string expected = "Type: V_ASN1_BIT_STRING, Length: 1, Value with 1 unused bits: 01";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_BIT_STRING, Length = 1, Value = new byte[] { 0x01, 0x01 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_BIT_STRING, Length = 1, Value = new byte[] { 0x01, 0x01 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -122,7 +122,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_ValidOctetString()
         {
             string expected = "Type: V_ASN1_OCTET_STRING, Length: 1, Value: 01";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_OCTET_STRING, Length = 1, Value = new byte[] { 0x01 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_OCTET_STRING, Length = 1, Value = new byte[] { 0x01 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -131,7 +131,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_ValidObject()
         {
             string expected = "Type: V_ASN1_OBJECT, Length: 3, Value: 0.1.2.3 (/ITU-T/1/2/3)";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT, Length = 3, Value = new byte[] { 0x01, 0x02, 0x03 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT, Length = 3, Value = new byte[] { 0x01, 0x02, 0x03 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -140,7 +140,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_ValidUTF8String()
         {
             string expected = "Type: V_ASN1_UTF8STRING, Length: 3, Value: ABC";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_UTF8STRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_UTF8STRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -149,7 +149,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_ValidPrintableString()
         {
             string expected = "Type: V_ASN1_PRINTABLESTRING, Length: 3, Value: ABC";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_PRINTABLESTRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_PRINTABLESTRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -158,7 +158,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_ValidTeletexString()
         {
             string expected = "Type: V_ASN1_TELETEXSTRING, Length: 3, Value: ABC";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_TELETEXSTRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_TELETEXSTRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -167,7 +167,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_ValidIA5String()
         {
             string expected = "Type: V_ASN1_IA5STRING, Length: 3, Value: ABC";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_IA5STRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_IA5STRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -176,7 +176,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_InvalidUTCTime()
         {
             string expected = "Type: V_ASN1_UTCTIME, Length: 3, Value: ABC";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_UTCTIME, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_UTCTIME, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -185,7 +185,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_ValidUTCTime()
         {
             string expected = "Type: V_ASN1_UTCTIME, Length: 3, Value: 1980-01-01 00:00:00";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_UTCTIME, Length = 3, Value = new byte[] { 0x31, 0x39, 0x38, 0x30, 0x2D, 0x30, 0x31, 0x2D, 0x30, 0x31, 0x20, 0x30, 0x30, 0x3A, 0x30, 0x30, 0x3A, 0x30, 0x30 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_UTCTIME, Length = 3, Value = new byte[] { 0x31, 0x39, 0x38, 0x30, 0x2D, 0x30, 0x31, 0x2D, 0x30, 0x31, 0x20, 0x30, 0x30, 0x3A, 0x30, 0x30, 0x3A, 0x30, 0x30 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -194,7 +194,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_ValidBmpString()
         {
             string expected = "Type: V_ASN1_BMPSTRING, Length: 6, Value: ABC";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_BMPSTRING, Length = 6, Value = new byte[] { 0x41, 0x00, 0x42, 0x00, 0x43, 0x00 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_BMPSTRING, Length = 6, Value = new byte[] { 0x41, 0x00, 0x42, 0x00, 0x43, 0x00 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -203,7 +203,7 @@ namespace SabreTools.Data.Extensions.Test
         public void Format_ValidUnformatted()
         {
             string expected = "Type: V_ASN1_OBJECT_DESCRIPTOR, Length: 1, Value: 01";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT_DESCRIPTOR, Length = 1, Value = new byte[] { 0x01 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT_DESCRIPTOR, Length = 1, Value = new byte[] { 0x01 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/Atari7800CartExtensions.cs b/SabreTools.Data.Extensions/Atari7800CartExtensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/Atari7800CartExtensions.cs
rename to SabreTools.Data.Extensions/Atari7800CartExtensions.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/AtariLynxCartExtensions.cs b/SabreTools.Data.Extensions/AtariLynxCartExtensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/AtariLynxCartExtensions.cs
rename to SabreTools.Data.Extensions/AtariLynxCartExtensions.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/CDROMExtensions.cs b/SabreTools.Data.Extensions/CDROMExtensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/CDROMExtensions.cs
rename to SabreTools.Data.Extensions/CDROMExtensions.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/CFBExtensions.cs b/SabreTools.Data.Extensions/CFBExtensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/CFBExtensions.cs
rename to SabreTools.Data.Extensions/CFBExtensions.cs
diff --git a/SabreTools.Serialization/ExtensionAttribute.cs b/SabreTools.Data.Extensions/ExtensionAttribute.cs
similarity index 100%
rename from SabreTools.Serialization/ExtensionAttribute.cs
rename to SabreTools.Data.Extensions/ExtensionAttribute.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/ISO9660Extensions.cs b/SabreTools.Data.Extensions/ISO9660Extensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/ISO9660Extensions.cs
rename to SabreTools.Data.Extensions/ISO9660Extensions.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/InstallShieldCabinetExtensions.cs b/SabreTools.Data.Extensions/InstallShieldCabinetExtensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/InstallShieldCabinetExtensions.cs
rename to SabreTools.Data.Extensions/InstallShieldCabinetExtensions.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/NESCartExtensions.cs b/SabreTools.Data.Extensions/NESCartExtensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/NESCartExtensions.cs
rename to SabreTools.Data.Extensions/NESCartExtensions.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/NewExecutableExtensions.cs b/SabreTools.Data.Extensions/NewExecutableExtensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/NewExecutableExtensions.cs
rename to SabreTools.Data.Extensions/NewExecutableExtensions.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/PortableExecutableExtensions.cs b/SabreTools.Data.Extensions/PortableExecutableExtensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/PortableExecutableExtensions.cs
rename to SabreTools.Data.Extensions/PortableExecutableExtensions.cs
diff --git a/SabreTools.Data.Extensions/README.MD b/SabreTools.Data.Extensions/README.MD
new file mode 100644
index 00000000..52d5fc04
--- /dev/null
+++ b/SabreTools.Data.Extensions/README.MD
@@ -0,0 +1,3 @@
+# SabreTools.Data.Extensions
+
+This library contains extension methods related to models. These extensions are used in both reader and wrapper code.
diff --git a/SabreTools.Data.Extensions/SabreTools.Data.Extensions.csproj b/SabreTools.Data.Extensions/SabreTools.Data.Extensions.csproj
new file mode 100644
index 00000000..16da5b0b
--- /dev/null
+++ b/SabreTools.Data.Extensions/SabreTools.Data.Extensions.csproj
@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <!-- Assembly Properties -->
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <CheckEolTargetFramework>false</CheckEolTargetFramework>
+        <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+        <IncludeSymbols>true</IncludeSymbols>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <Version>2.3.0</Version>
+
+        <!-- Package Properties -->
+        <Authors>Matt Nadareski</Authors>
+        <Description>Extension methods related to models</Description>
+        <Copyright>Copyright (c) Matt Nadareski 2019-2026</Copyright>
+        <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <RepositoryUrl>https://github.com/SabreTools/SabreTools.Serialization</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>models extensions conversion</PackageTags>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="README.md" Pack="true" PackagePath="" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <InternalsVisibleTo Include="SabreTools.Wrappers" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="NetLegacySupport.Numerics" Version="1.0.1" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))" />
+        <PackageReference Include="SabreTools.IO" Version="[1.9.1]" />
+     </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\SabreTools.Data.Models\SabreTools.Data.Models.csproj" />
+      <ProjectReference Include="..\SabreTools.ObjectIdentifier\SabreTools.ObjectIdentifier.csproj" />
+    </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/StringBuilderExtensions.cs b/SabreTools.Data.Extensions/StringBuilderExtensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/StringBuilderExtensions.cs
rename to SabreTools.Data.Extensions/StringBuilderExtensions.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/TypeLengthValueExtensions.cs b/SabreTools.Data.Extensions/TypeLengthValueExtensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/TypeLengthValueExtensions.cs
rename to SabreTools.Data.Extensions/TypeLengthValueExtensions.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/WiseScriptExtensions.cs b/SabreTools.Data.Extensions/WiseScriptExtensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/WiseScriptExtensions.cs
rename to SabreTools.Data.Extensions/WiseScriptExtensions.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/XZExtensions.cs b/SabreTools.Data.Extensions/XZExtensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/XZExtensions.cs
rename to SabreTools.Data.Extensions/XZExtensions.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/XboxExecutableExtensions.cs b/SabreTools.Data.Extensions/XboxExecutableExtensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/XboxExecutableExtensions.cs
rename to SabreTools.Data.Extensions/XboxExecutableExtensions.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/CopyrightRecord.cs b/SabreTools.Data.Models/AACS/CopyrightRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/CopyrightRecord.cs
rename to SabreTools.Data.Models/AACS/CopyrightRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/DriveRevocationListEntry.cs b/SabreTools.Data.Models/AACS/DriveRevocationListEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/DriveRevocationListEntry.cs
rename to SabreTools.Data.Models/AACS/DriveRevocationListEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/DriveRevocationListRecord.cs b/SabreTools.Data.Models/AACS/DriveRevocationListRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/DriveRevocationListRecord.cs
rename to SabreTools.Data.Models/AACS/DriveRevocationListRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/DriveRevocationSignatureBlock.cs b/SabreTools.Data.Models/AACS/DriveRevocationSignatureBlock.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/DriveRevocationSignatureBlock.cs
rename to SabreTools.Data.Models/AACS/DriveRevocationSignatureBlock.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/EndOfMediaKeyBlockRecord.cs b/SabreTools.Data.Models/AACS/EndOfMediaKeyBlockRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/EndOfMediaKeyBlockRecord.cs
rename to SabreTools.Data.Models/AACS/EndOfMediaKeyBlockRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/Enums.cs b/SabreTools.Data.Models/AACS/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/Enums.cs
rename to SabreTools.Data.Models/AACS/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/ExplicitSubsetDifferenceRecord.cs b/SabreTools.Data.Models/AACS/ExplicitSubsetDifferenceRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/ExplicitSubsetDifferenceRecord.cs
rename to SabreTools.Data.Models/AACS/ExplicitSubsetDifferenceRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/GenericRecord.cs b/SabreTools.Data.Models/AACS/GenericRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/GenericRecord.cs
rename to SabreTools.Data.Models/AACS/GenericRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/HostRevocationListEntry.cs b/SabreTools.Data.Models/AACS/HostRevocationListEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/HostRevocationListEntry.cs
rename to SabreTools.Data.Models/AACS/HostRevocationListEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/HostRevocationListRecord.cs b/SabreTools.Data.Models/AACS/HostRevocationListRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/HostRevocationListRecord.cs
rename to SabreTools.Data.Models/AACS/HostRevocationListRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/HostRevocationSignatureBlock.cs b/SabreTools.Data.Models/AACS/HostRevocationSignatureBlock.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/HostRevocationSignatureBlock.cs
rename to SabreTools.Data.Models/AACS/HostRevocationSignatureBlock.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/MediaKeyBlock.cs b/SabreTools.Data.Models/AACS/MediaKeyBlock.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/MediaKeyBlock.cs
rename to SabreTools.Data.Models/AACS/MediaKeyBlock.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/MediaKeyDataRecord.cs b/SabreTools.Data.Models/AACS/MediaKeyDataRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/MediaKeyDataRecord.cs
rename to SabreTools.Data.Models/AACS/MediaKeyDataRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/Record.cs b/SabreTools.Data.Models/AACS/Record.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/Record.cs
rename to SabreTools.Data.Models/AACS/Record.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/SubsetDifference.cs b/SabreTools.Data.Models/AACS/SubsetDifference.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/SubsetDifference.cs
rename to SabreTools.Data.Models/AACS/SubsetDifference.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/SubsetDifferenceIndexRecord.cs b/SabreTools.Data.Models/AACS/SubsetDifferenceIndexRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/SubsetDifferenceIndexRecord.cs
rename to SabreTools.Data.Models/AACS/SubsetDifferenceIndexRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/TypeAndVersionRecord.cs b/SabreTools.Data.Models/AACS/TypeAndVersionRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/TypeAndVersionRecord.cs
rename to SabreTools.Data.Models/AACS/TypeAndVersionRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AACS/VerifyMediaKeyRecord.cs b/SabreTools.Data.Models/AACS/VerifyMediaKeyRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AACS/VerifyMediaKeyRecord.cs
rename to SabreTools.Data.Models/AACS/VerifyMediaKeyRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ASN1/ASN1Type.cs b/SabreTools.Data.Models/ASN1/ASN1Type.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ASN1/ASN1Type.cs
rename to SabreTools.Data.Models/ASN1/ASN1Type.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ASN1/TypeLengthValue.cs b/SabreTools.Data.Models/ASN1/TypeLengthValue.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ASN1/TypeLengthValue.cs
rename to SabreTools.Data.Models/ASN1/TypeLengthValue.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AdvancedInstaller/Constants.cs b/SabreTools.Data.Models/AdvancedInstaller/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AdvancedInstaller/Constants.cs
rename to SabreTools.Data.Models/AdvancedInstaller/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AdvancedInstaller/FileEntry.cs b/SabreTools.Data.Models/AdvancedInstaller/FileEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AdvancedInstaller/FileEntry.cs
rename to SabreTools.Data.Models/AdvancedInstaller/FileEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AdvancedInstaller/Footer.cs b/SabreTools.Data.Models/AdvancedInstaller/Footer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AdvancedInstaller/Footer.cs
rename to SabreTools.Data.Models/AdvancedInstaller/Footer.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AdvancedInstaller/SFX.cs b/SabreTools.Data.Models/AdvancedInstaller/SFX.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AdvancedInstaller/SFX.cs
rename to SabreTools.Data.Models/AdvancedInstaller/SFX.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ArchiveDotOrg/File.cs b/SabreTools.Data.Models/ArchiveDotOrg/File.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ArchiveDotOrg/File.cs
rename to SabreTools.Data.Models/ArchiveDotOrg/File.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ArchiveDotOrg/Files.cs b/SabreTools.Data.Models/ArchiveDotOrg/Files.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ArchiveDotOrg/Files.cs
rename to SabreTools.Data.Models/ArchiveDotOrg/Files.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Atari7800/Cart.cs b/SabreTools.Data.Models/Atari7800/Cart.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Atari7800/Cart.cs
rename to SabreTools.Data.Models/Atari7800/Cart.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Atari7800/Constants.cs b/SabreTools.Data.Models/Atari7800/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Atari7800/Constants.cs
rename to SabreTools.Data.Models/Atari7800/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Atari7800/Enums.cs b/SabreTools.Data.Models/Atari7800/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Atari7800/Enums.cs
rename to SabreTools.Data.Models/Atari7800/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Atari7800/Header.cs b/SabreTools.Data.Models/Atari7800/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Atari7800/Header.cs
rename to SabreTools.Data.Models/Atari7800/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AtariLynx/Cart.cs b/SabreTools.Data.Models/AtariLynx/Cart.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AtariLynx/Cart.cs
rename to SabreTools.Data.Models/AtariLynx/Cart.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AtariLynx/Constants.cs b/SabreTools.Data.Models/AtariLynx/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AtariLynx/Constants.cs
rename to SabreTools.Data.Models/AtariLynx/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AtariLynx/Enums.cs b/SabreTools.Data.Models/AtariLynx/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AtariLynx/Enums.cs
rename to SabreTools.Data.Models/AtariLynx/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AtariLynx/Header.cs b/SabreTools.Data.Models/AtariLynx/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AtariLynx/Header.cs
rename to SabreTools.Data.Models/AtariLynx/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AttractMode/MetadataFile.cs b/SabreTools.Data.Models/AttractMode/MetadataFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AttractMode/MetadataFile.cs
rename to SabreTools.Data.Models/AttractMode/MetadataFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/AttractMode/Row.cs b/SabreTools.Data.Models/AttractMode/Row.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/AttractMode/Row.cs
rename to SabreTools.Data.Models/AttractMode/Row.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BDPlus/Constants.cs b/SabreTools.Data.Models/BDPlus/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BDPlus/Constants.cs
rename to SabreTools.Data.Models/BDPlus/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BDPlus/SVM.cs b/SabreTools.Data.Models/BDPlus/SVM.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BDPlus/SVM.cs
rename to SabreTools.Data.Models/BDPlus/SVM.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BFPK/Archive.cs b/SabreTools.Data.Models/BFPK/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BFPK/Archive.cs
rename to SabreTools.Data.Models/BFPK/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BFPK/Constants.cs b/SabreTools.Data.Models/BFPK/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BFPK/Constants.cs
rename to SabreTools.Data.Models/BFPK/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BFPK/FileEntry.cs b/SabreTools.Data.Models/BFPK/FileEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BFPK/FileEntry.cs
rename to SabreTools.Data.Models/BFPK/FileEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BFPK/Header.cs b/SabreTools.Data.Models/BFPK/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BFPK/Header.cs
rename to SabreTools.Data.Models/BFPK/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/AmbientIndexLump.cs b/SabreTools.Data.Models/BSP/AmbientIndexLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/AmbientIndexLump.cs
rename to SabreTools.Data.Models/BSP/AmbientIndexLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/AmbientLightingLump.cs b/SabreTools.Data.Models/BSP/AmbientLightingLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/AmbientLightingLump.cs
rename to SabreTools.Data.Models/BSP/AmbientLightingLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/Brush.cs b/SabreTools.Data.Models/BSP/Brush.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/Brush.cs
rename to SabreTools.Data.Models/BSP/Brush.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/BrushesLump.cs b/SabreTools.Data.Models/BSP/BrushesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/BrushesLump.cs
rename to SabreTools.Data.Models/BSP/BrushesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/Brushside.cs b/SabreTools.Data.Models/BSP/Brushside.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/Brushside.cs
rename to SabreTools.Data.Models/BSP/Brushside.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/BrushsidesLump.cs b/SabreTools.Data.Models/BSP/BrushsidesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/BrushsidesLump.cs
rename to SabreTools.Data.Models/BSP/BrushsidesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/BspFace.cs b/SabreTools.Data.Models/BSP/BspFace.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/BspFace.cs
rename to SabreTools.Data.Models/BSP/BspFace.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/BspFacesLump.cs b/SabreTools.Data.Models/BSP/BspFacesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/BspFacesLump.cs
rename to SabreTools.Data.Models/BSP/BspFacesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/BspFile.cs b/SabreTools.Data.Models/BSP/BspFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/BspFile.cs
rename to SabreTools.Data.Models/BSP/BspFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/BspHeader.cs b/SabreTools.Data.Models/BSP/BspHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/BspHeader.cs
rename to SabreTools.Data.Models/BSP/BspHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/BspLeaf.cs b/SabreTools.Data.Models/BSP/BspLeaf.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/BspLeaf.cs
rename to SabreTools.Data.Models/BSP/BspLeaf.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/BspLeavesLump.cs b/SabreTools.Data.Models/BSP/BspLeavesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/BspLeavesLump.cs
rename to SabreTools.Data.Models/BSP/BspLeavesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/BspLumpEntry.cs b/SabreTools.Data.Models/BSP/BspLumpEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/BspLumpEntry.cs
rename to SabreTools.Data.Models/BSP/BspLumpEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/BspModel.cs b/SabreTools.Data.Models/BSP/BspModel.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/BspModel.cs
rename to SabreTools.Data.Models/BSP/BspModel.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/BspModelsLump.cs b/SabreTools.Data.Models/BSP/BspModelsLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/BspModelsLump.cs
rename to SabreTools.Data.Models/BSP/BspModelsLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/BspNode.cs b/SabreTools.Data.Models/BSP/BspNode.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/BspNode.cs
rename to SabreTools.Data.Models/BSP/BspNode.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/BspNodesLump.cs b/SabreTools.Data.Models/BSP/BspNodesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/BspNodesLump.cs
rename to SabreTools.Data.Models/BSP/BspNodesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/BspTexinfo.cs b/SabreTools.Data.Models/BSP/BspTexinfo.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/BspTexinfo.cs
rename to SabreTools.Data.Models/BSP/BspTexinfo.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/BspTexinfoLump.cs b/SabreTools.Data.Models/BSP/BspTexinfoLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/BspTexinfoLump.cs
rename to SabreTools.Data.Models/BSP/BspTexinfoLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/CDispCornerNeighbors.cs b/SabreTools.Data.Models/BSP/CDispCornerNeighbors.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/CDispCornerNeighbors.cs
rename to SabreTools.Data.Models/BSP/CDispCornerNeighbors.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/CDispNeighbor.cs b/SabreTools.Data.Models/BSP/CDispNeighbor.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/CDispNeighbor.cs
rename to SabreTools.Data.Models/BSP/CDispNeighbor.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/CDispSubNeighbor.cs b/SabreTools.Data.Models/BSP/CDispSubNeighbor.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/CDispSubNeighbor.cs
rename to SabreTools.Data.Models/BSP/CDispSubNeighbor.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/Clipnode.cs b/SabreTools.Data.Models/BSP/Clipnode.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/Clipnode.cs
rename to SabreTools.Data.Models/BSP/Clipnode.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/ClipnodesLump.cs b/SabreTools.Data.Models/BSP/ClipnodesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/ClipnodesLump.cs
rename to SabreTools.Data.Models/BSP/ClipnodesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/ColorRGBExp32.cs b/SabreTools.Data.Models/BSP/ColorRGBExp32.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/ColorRGBExp32.cs
rename to SabreTools.Data.Models/BSP/ColorRGBExp32.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/CompressedLightCube.cs b/SabreTools.Data.Models/BSP/CompressedLightCube.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/CompressedLightCube.cs
rename to SabreTools.Data.Models/BSP/CompressedLightCube.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/Constants.cs b/SabreTools.Data.Models/BSP/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/Constants.cs
rename to SabreTools.Data.Models/BSP/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/Cubemap.cs b/SabreTools.Data.Models/BSP/Cubemap.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/Cubemap.cs
rename to SabreTools.Data.Models/BSP/Cubemap.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/CubemapsLump.cs b/SabreTools.Data.Models/BSP/CubemapsLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/CubemapsLump.cs
rename to SabreTools.Data.Models/BSP/CubemapsLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/DispInfo.cs b/SabreTools.Data.Models/BSP/DispInfo.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/DispInfo.cs
rename to SabreTools.Data.Models/BSP/DispInfo.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/DispInfosLump.cs b/SabreTools.Data.Models/BSP/DispInfosLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/DispInfosLump.cs
rename to SabreTools.Data.Models/BSP/DispInfosLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/DispTri.cs b/SabreTools.Data.Models/BSP/DispTri.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/DispTri.cs
rename to SabreTools.Data.Models/BSP/DispTri.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/DispTrisLump.cs b/SabreTools.Data.Models/BSP/DispTrisLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/DispTrisLump.cs
rename to SabreTools.Data.Models/BSP/DispTrisLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/DispVert.cs b/SabreTools.Data.Models/BSP/DispVert.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/DispVert.cs
rename to SabreTools.Data.Models/BSP/DispVert.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/DispVertsLump.cs b/SabreTools.Data.Models/BSP/DispVertsLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/DispVertsLump.cs
rename to SabreTools.Data.Models/BSP/DispVertsLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/Edge.cs b/SabreTools.Data.Models/BSP/Edge.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/Edge.cs
rename to SabreTools.Data.Models/BSP/Edge.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/EdgesLump.cs b/SabreTools.Data.Models/BSP/EdgesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/EdgesLump.cs
rename to SabreTools.Data.Models/BSP/EdgesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/EntitiesLump.cs b/SabreTools.Data.Models/BSP/EntitiesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/EntitiesLump.cs
rename to SabreTools.Data.Models/BSP/EntitiesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/Entity.cs b/SabreTools.Data.Models/BSP/Entity.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/Entity.cs
rename to SabreTools.Data.Models/BSP/Entity.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/Enums.cs b/SabreTools.Data.Models/BSP/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/Enums.cs
rename to SabreTools.Data.Models/BSP/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/GameLump.cs b/SabreTools.Data.Models/BSP/GameLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/GameLump.cs
rename to SabreTools.Data.Models/BSP/GameLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/GameLumpDirectory.cs b/SabreTools.Data.Models/BSP/GameLumpDirectory.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/GameLumpDirectory.cs
rename to SabreTools.Data.Models/BSP/GameLumpDirectory.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/LeafAmbientIndex.cs b/SabreTools.Data.Models/BSP/LeafAmbientIndex.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/LeafAmbientIndex.cs
rename to SabreTools.Data.Models/BSP/LeafAmbientIndex.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/LeafAmbientLighting.cs b/SabreTools.Data.Models/BSP/LeafAmbientLighting.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/LeafAmbientLighting.cs
rename to SabreTools.Data.Models/BSP/LeafAmbientLighting.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/LeafBrushesLump.cs b/SabreTools.Data.Models/BSP/LeafBrushesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/LeafBrushesLump.cs
rename to SabreTools.Data.Models/BSP/LeafBrushesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/LeafFacesLump.cs b/SabreTools.Data.Models/BSP/LeafFacesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/LeafFacesLump.cs
rename to SabreTools.Data.Models/BSP/LeafFacesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/LightmapLump.cs b/SabreTools.Data.Models/BSP/LightmapLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/LightmapLump.cs
rename to SabreTools.Data.Models/BSP/LightmapLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/Lump.cs b/SabreTools.Data.Models/BSP/Lump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/Lump.cs
rename to SabreTools.Data.Models/BSP/Lump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/LzmaHeader.cs b/SabreTools.Data.Models/BSP/LzmaHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/LzmaHeader.cs
rename to SabreTools.Data.Models/BSP/LzmaHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/MarksurfacesLump.cs b/SabreTools.Data.Models/BSP/MarksurfacesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/MarksurfacesLump.cs
rename to SabreTools.Data.Models/BSP/MarksurfacesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/MipTexture.cs b/SabreTools.Data.Models/BSP/MipTexture.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/MipTexture.cs
rename to SabreTools.Data.Models/BSP/MipTexture.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/OccluderData.cs b/SabreTools.Data.Models/BSP/OccluderData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/OccluderData.cs
rename to SabreTools.Data.Models/BSP/OccluderData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/OccluderPolyData.cs b/SabreTools.Data.Models/BSP/OccluderPolyData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/OccluderPolyData.cs
rename to SabreTools.Data.Models/BSP/OccluderPolyData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/OcclusionLump.cs b/SabreTools.Data.Models/BSP/OcclusionLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/OcclusionLump.cs
rename to SabreTools.Data.Models/BSP/OcclusionLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/Overlay.cs b/SabreTools.Data.Models/BSP/Overlay.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/Overlay.cs
rename to SabreTools.Data.Models/BSP/Overlay.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/OverlaysLump.cs b/SabreTools.Data.Models/BSP/OverlaysLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/OverlaysLump.cs
rename to SabreTools.Data.Models/BSP/OverlaysLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/PakfileLump.cs b/SabreTools.Data.Models/BSP/PakfileLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/PakfileLump.cs
rename to SabreTools.Data.Models/BSP/PakfileLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/PhysCollideLump.cs b/SabreTools.Data.Models/BSP/PhysCollideLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/PhysCollideLump.cs
rename to SabreTools.Data.Models/BSP/PhysCollideLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/PhysModel.cs b/SabreTools.Data.Models/BSP/PhysModel.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/PhysModel.cs
rename to SabreTools.Data.Models/BSP/PhysModel.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/PhysSolid.cs b/SabreTools.Data.Models/BSP/PhysSolid.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/PhysSolid.cs
rename to SabreTools.Data.Models/BSP/PhysSolid.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/Plane.cs b/SabreTools.Data.Models/BSP/Plane.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/Plane.cs
rename to SabreTools.Data.Models/BSP/Plane.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/PlanesLump.cs b/SabreTools.Data.Models/BSP/PlanesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/PlanesLump.cs
rename to SabreTools.Data.Models/BSP/PlanesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/QAngle.cs b/SabreTools.Data.Models/BSP/QAngle.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/QAngle.cs
rename to SabreTools.Data.Models/BSP/QAngle.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/StaticPropDictLump.cs b/SabreTools.Data.Models/BSP/StaticPropDictLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/StaticPropDictLump.cs
rename to SabreTools.Data.Models/BSP/StaticPropDictLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/StaticPropLeafLump.cs b/SabreTools.Data.Models/BSP/StaticPropLeafLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/StaticPropLeafLump.cs
rename to SabreTools.Data.Models/BSP/StaticPropLeafLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/StaticPropLump.cs b/SabreTools.Data.Models/BSP/StaticPropLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/StaticPropLump.cs
rename to SabreTools.Data.Models/BSP/StaticPropLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/SurfedgesLump.cs b/SabreTools.Data.Models/BSP/SurfedgesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/SurfedgesLump.cs
rename to SabreTools.Data.Models/BSP/SurfedgesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/Texdata.cs b/SabreTools.Data.Models/BSP/Texdata.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/Texdata.cs
rename to SabreTools.Data.Models/BSP/Texdata.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/TexdataLump.cs b/SabreTools.Data.Models/BSP/TexdataLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/TexdataLump.cs
rename to SabreTools.Data.Models/BSP/TexdataLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/TexdataStringData.cs b/SabreTools.Data.Models/BSP/TexdataStringData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/TexdataStringData.cs
rename to SabreTools.Data.Models/BSP/TexdataStringData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/TexdataStringTable.cs b/SabreTools.Data.Models/BSP/TexdataStringTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/TexdataStringTable.cs
rename to SabreTools.Data.Models/BSP/TexdataStringTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/TextureHeader.cs b/SabreTools.Data.Models/BSP/TextureHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/TextureHeader.cs
rename to SabreTools.Data.Models/BSP/TextureHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/TextureLump.cs b/SabreTools.Data.Models/BSP/TextureLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/TextureLump.cs
rename to SabreTools.Data.Models/BSP/TextureLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspFace.cs b/SabreTools.Data.Models/BSP/VbspFace.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspFace.cs
rename to SabreTools.Data.Models/BSP/VbspFace.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspFacesLump.cs b/SabreTools.Data.Models/BSP/VbspFacesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspFacesLump.cs
rename to SabreTools.Data.Models/BSP/VbspFacesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspFile.cs b/SabreTools.Data.Models/BSP/VbspFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspFile.cs
rename to SabreTools.Data.Models/BSP/VbspFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspHeader.cs b/SabreTools.Data.Models/BSP/VbspHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspHeader.cs
rename to SabreTools.Data.Models/BSP/VbspHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspLeaf.cs b/SabreTools.Data.Models/BSP/VbspLeaf.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspLeaf.cs
rename to SabreTools.Data.Models/BSP/VbspLeaf.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspLeavesLump.cs b/SabreTools.Data.Models/BSP/VbspLeavesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspLeavesLump.cs
rename to SabreTools.Data.Models/BSP/VbspLeavesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspLumpEntry.cs b/SabreTools.Data.Models/BSP/VbspLumpEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspLumpEntry.cs
rename to SabreTools.Data.Models/BSP/VbspLumpEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspModel.cs b/SabreTools.Data.Models/BSP/VbspModel.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspModel.cs
rename to SabreTools.Data.Models/BSP/VbspModel.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspModelsLump.cs b/SabreTools.Data.Models/BSP/VbspModelsLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspModelsLump.cs
rename to SabreTools.Data.Models/BSP/VbspModelsLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspNode.cs b/SabreTools.Data.Models/BSP/VbspNode.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspNode.cs
rename to SabreTools.Data.Models/BSP/VbspNode.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspNodesLump.cs b/SabreTools.Data.Models/BSP/VbspNodesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspNodesLump.cs
rename to SabreTools.Data.Models/BSP/VbspNodesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspTexinfo.cs b/SabreTools.Data.Models/BSP/VbspTexinfo.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspTexinfo.cs
rename to SabreTools.Data.Models/BSP/VbspTexinfo.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspTexinfoLump.cs b/SabreTools.Data.Models/BSP/VbspTexinfoLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/VbspTexinfoLump.cs
rename to SabreTools.Data.Models/BSP/VbspTexinfoLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/Vector3D.cs b/SabreTools.Data.Models/BSP/Vector3D.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/Vector3D.cs
rename to SabreTools.Data.Models/BSP/Vector3D.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/VerticesLump.cs b/SabreTools.Data.Models/BSP/VerticesLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/VerticesLump.cs
rename to SabreTools.Data.Models/BSP/VerticesLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/VisibilityLump.cs b/SabreTools.Data.Models/BSP/VisibilityLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/VisibilityLump.cs
rename to SabreTools.Data.Models/BSP/VisibilityLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/WorldLight.cs b/SabreTools.Data.Models/BSP/WorldLight.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/WorldLight.cs
rename to SabreTools.Data.Models/BSP/WorldLight.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BSP/WorldLightsLump.cs b/SabreTools.Data.Models/BSP/WorldLightsLump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BSP/WorldLightsLump.cs
rename to SabreTools.Data.Models/BSP/WorldLightsLump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BZip2/Archive.cs b/SabreTools.Data.Models/BZip2/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BZip2/Archive.cs
rename to SabreTools.Data.Models/BZip2/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BZip2/Block.cs b/SabreTools.Data.Models/BZip2/Block.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BZip2/Block.cs
rename to SabreTools.Data.Models/BZip2/Block.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BZip2/BlockHeader.cs b/SabreTools.Data.Models/BZip2/BlockHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BZip2/BlockHeader.cs
rename to SabreTools.Data.Models/BZip2/BlockHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BZip2/BlockTrees.cs b/SabreTools.Data.Models/BZip2/BlockTrees.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BZip2/BlockTrees.cs
rename to SabreTools.Data.Models/BZip2/BlockTrees.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BZip2/Constants.cs b/SabreTools.Data.Models/BZip2/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BZip2/Constants.cs
rename to SabreTools.Data.Models/BZip2/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BZip2/Footer.cs b/SabreTools.Data.Models/BZip2/Footer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BZip2/Footer.cs
rename to SabreTools.Data.Models/BZip2/Footer.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/BZip2/Header.cs b/SabreTools.Data.Models/BZip2/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/BZip2/Header.cs
rename to SabreTools.Data.Models/BZip2/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Bitmap/BITMAPFILEHEADER.cs b/SabreTools.Data.Models/Bitmap/BITMAPFILEHEADER.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Bitmap/BITMAPFILEHEADER.cs
rename to SabreTools.Data.Models/Bitmap/BITMAPFILEHEADER.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Bitmap/BITMAPINFOHEADER.cs b/SabreTools.Data.Models/Bitmap/BITMAPINFOHEADER.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Bitmap/BITMAPINFOHEADER.cs
rename to SabreTools.Data.Models/Bitmap/BITMAPINFOHEADER.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CDROM/CDROM.cs b/SabreTools.Data.Models/CDROM/CDROM.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CDROM/CDROM.cs
rename to SabreTools.Data.Models/CDROM/CDROM.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CDROM/Constants.cs b/SabreTools.Data.Models/CDROM/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CDROM/Constants.cs
rename to SabreTools.Data.Models/CDROM/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CDROM/DataSector.cs b/SabreTools.Data.Models/CDROM/DataSector.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CDROM/DataSector.cs
rename to SabreTools.Data.Models/CDROM/DataSector.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CDROM/Enums.cs b/SabreTools.Data.Models/CDROM/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CDROM/Enums.cs
rename to SabreTools.Data.Models/CDROM/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CDROM/Mode0.cs b/SabreTools.Data.Models/CDROM/Mode0.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CDROM/Mode0.cs
rename to SabreTools.Data.Models/CDROM/Mode0.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CDROM/Mode1.cs b/SabreTools.Data.Models/CDROM/Mode1.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CDROM/Mode1.cs
rename to SabreTools.Data.Models/CDROM/Mode1.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CDROM/Mode2Form1.cs b/SabreTools.Data.Models/CDROM/Mode2Form1.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CDROM/Mode2Form1.cs
rename to SabreTools.Data.Models/CDROM/Mode2Form1.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CDROM/Mode2Form2.cs b/SabreTools.Data.Models/CDROM/Mode2Form2.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CDROM/Mode2Form2.cs
rename to SabreTools.Data.Models/CDROM/Mode2Form2.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CDROM/Mode2Formless.cs b/SabreTools.Data.Models/CDROM/Mode2Formless.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CDROM/Mode2Formless.cs
rename to SabreTools.Data.Models/CDROM/Mode2Formless.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CFB/Binary.cs b/SabreTools.Data.Models/CFB/Binary.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CFB/Binary.cs
rename to SabreTools.Data.Models/CFB/Binary.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CFB/Constants.cs b/SabreTools.Data.Models/CFB/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CFB/Constants.cs
rename to SabreTools.Data.Models/CFB/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CFB/DirectoryEntry.cs b/SabreTools.Data.Models/CFB/DirectoryEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CFB/DirectoryEntry.cs
rename to SabreTools.Data.Models/CFB/DirectoryEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CFB/Enums.cs b/SabreTools.Data.Models/CFB/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CFB/Enums.cs
rename to SabreTools.Data.Models/CFB/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CFB/FileHeader.cs b/SabreTools.Data.Models/CFB/FileHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CFB/FileHeader.cs
rename to SabreTools.Data.Models/CFB/FileHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CFB/SummaryInformation.cs b/SabreTools.Data.Models/CFB/SummaryInformation.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CFB/SummaryInformation.cs
rename to SabreTools.Data.Models/CFB/SummaryInformation.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CFB/Variant.cs b/SabreTools.Data.Models/CFB/Variant.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CFB/Variant.cs
rename to SabreTools.Data.Models/CFB/Variant.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CHD/CompressedMapEntryV5.cs b/SabreTools.Data.Models/CHD/CompressedMapEntryV5.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CHD/CompressedMapEntryV5.cs
rename to SabreTools.Data.Models/CHD/CompressedMapEntryV5.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CHD/CompressedMapHeaderV5.cs b/SabreTools.Data.Models/CHD/CompressedMapHeaderV5.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CHD/CompressedMapHeaderV5.cs
rename to SabreTools.Data.Models/CHD/CompressedMapHeaderV5.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CHD/Constants.cs b/SabreTools.Data.Models/CHD/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CHD/Constants.cs
rename to SabreTools.Data.Models/CHD/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CHD/Enums.cs b/SabreTools.Data.Models/CHD/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CHD/Enums.cs
rename to SabreTools.Data.Models/CHD/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CHD/Header.cs b/SabreTools.Data.Models/CHD/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CHD/Header.cs
rename to SabreTools.Data.Models/CHD/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CHD/HeaderV1.cs b/SabreTools.Data.Models/CHD/HeaderV1.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CHD/HeaderV1.cs
rename to SabreTools.Data.Models/CHD/HeaderV1.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CHD/HeaderV2.cs b/SabreTools.Data.Models/CHD/HeaderV2.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CHD/HeaderV2.cs
rename to SabreTools.Data.Models/CHD/HeaderV2.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CHD/HeaderV3.cs b/SabreTools.Data.Models/CHD/HeaderV3.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CHD/HeaderV3.cs
rename to SabreTools.Data.Models/CHD/HeaderV3.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CHD/HeaderV4.cs b/SabreTools.Data.Models/CHD/HeaderV4.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CHD/HeaderV4.cs
rename to SabreTools.Data.Models/CHD/HeaderV4.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CHD/HeaderV5.cs b/SabreTools.Data.Models/CHD/HeaderV5.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CHD/HeaderV5.cs
rename to SabreTools.Data.Models/CHD/HeaderV5.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CHD/MapV1.cs b/SabreTools.Data.Models/CHD/MapV1.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CHD/MapV1.cs
rename to SabreTools.Data.Models/CHD/MapV1.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CHD/MapV3.cs b/SabreTools.Data.Models/CHD/MapV3.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CHD/MapV3.cs
rename to SabreTools.Data.Models/CHD/MapV3.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CHD/MetadataEntry.cs b/SabreTools.Data.Models/CHD/MetadataEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CHD/MetadataEntry.cs
rename to SabreTools.Data.Models/CHD/MetadataEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CHD/MetadataHash.cs b/SabreTools.Data.Models/CHD/MetadataHash.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CHD/MetadataHash.cs
rename to SabreTools.Data.Models/CHD/MetadataHash.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CHD/UncompressedMapV5.cs b/SabreTools.Data.Models/CHD/UncompressedMapV5.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CHD/UncompressedMapV5.cs
rename to SabreTools.Data.Models/CHD/UncompressedMapV5.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/Constants.cs b/SabreTools.Data.Models/COFF/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/Constants.cs
rename to SabreTools.Data.Models/COFF/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/Enums.cs b/SabreTools.Data.Models/COFF/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/Enums.cs
rename to SabreTools.Data.Models/COFF/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/FileHeader.cs b/SabreTools.Data.Models/COFF/FileHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/FileHeader.cs
rename to SabreTools.Data.Models/COFF/FileHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/LineNumber.cs b/SabreTools.Data.Models/COFF/LineNumber.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/LineNumber.cs
rename to SabreTools.Data.Models/COFF/LineNumber.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/OptionalHeader.cs b/SabreTools.Data.Models/COFF/OptionalHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/OptionalHeader.cs
rename to SabreTools.Data.Models/COFF/OptionalHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/Relocation.cs b/SabreTools.Data.Models/COFF/Relocation.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/Relocation.cs
rename to SabreTools.Data.Models/COFF/Relocation.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/SectionHeader.cs b/SabreTools.Data.Models/COFF/SectionHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/SectionHeader.cs
rename to SabreTools.Data.Models/COFF/SectionHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/StringTable.cs b/SabreTools.Data.Models/COFF/StringTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/StringTable.cs
rename to SabreTools.Data.Models/COFF/StringTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/BaseEntry.cs b/SabreTools.Data.Models/COFF/SymbolTableEntries/BaseEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/BaseEntry.cs
rename to SabreTools.Data.Models/COFF/SymbolTableEntries/BaseEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/CLRTokenDefinition.cs b/SabreTools.Data.Models/COFF/SymbolTableEntries/CLRTokenDefinition.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/CLRTokenDefinition.cs
rename to SabreTools.Data.Models/COFF/SymbolTableEntries/CLRTokenDefinition.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/Descriptor.cs b/SabreTools.Data.Models/COFF/SymbolTableEntries/Descriptor.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/Descriptor.cs
rename to SabreTools.Data.Models/COFF/SymbolTableEntries/Descriptor.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/FileRecord.cs b/SabreTools.Data.Models/COFF/SymbolTableEntries/FileRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/FileRecord.cs
rename to SabreTools.Data.Models/COFF/SymbolTableEntries/FileRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/FunctionDefinition.cs b/SabreTools.Data.Models/COFF/SymbolTableEntries/FunctionDefinition.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/FunctionDefinition.cs
rename to SabreTools.Data.Models/COFF/SymbolTableEntries/FunctionDefinition.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/SectionDefinition.cs b/SabreTools.Data.Models/COFF/SymbolTableEntries/SectionDefinition.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/SectionDefinition.cs
rename to SabreTools.Data.Models/COFF/SymbolTableEntries/SectionDefinition.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/StandardRecord.cs b/SabreTools.Data.Models/COFF/SymbolTableEntries/StandardRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/StandardRecord.cs
rename to SabreTools.Data.Models/COFF/SymbolTableEntries/StandardRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/WeakExternal.cs b/SabreTools.Data.Models/COFF/SymbolTableEntries/WeakExternal.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/COFF/SymbolTableEntries/WeakExternal.cs
rename to SabreTools.Data.Models/COFF/SymbolTableEntries/WeakExternal.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Charts/SongIni.cs b/SabreTools.Data.Models/Charts/SongIni.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Charts/SongIni.cs
rename to SabreTools.Data.Models/Charts/SongIni.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Charts/Tier.cs b/SabreTools.Data.Models/Charts/Tier.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Charts/Tier.cs
rename to SabreTools.Data.Models/Charts/Tier.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Charts/TitlesIni.cs b/SabreTools.Data.Models/Charts/TitlesIni.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Charts/TitlesIni.cs
rename to SabreTools.Data.Models/Charts/TitlesIni.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Archive.cs b/SabreTools.Data.Models/ClrMamePro/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Archive.cs
rename to SabreTools.Data.Models/ClrMamePro/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/BiosSet.cs b/SabreTools.Data.Models/ClrMamePro/BiosSet.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/BiosSet.cs
rename to SabreTools.Data.Models/ClrMamePro/BiosSet.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Chip.cs b/SabreTools.Data.Models/ClrMamePro/Chip.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Chip.cs
rename to SabreTools.Data.Models/ClrMamePro/Chip.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/ClrMamePro.cs b/SabreTools.Data.Models/ClrMamePro/ClrMamePro.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/ClrMamePro.cs
rename to SabreTools.Data.Models/ClrMamePro/ClrMamePro.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/DipSwitch.cs b/SabreTools.Data.Models/ClrMamePro/DipSwitch.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/DipSwitch.cs
rename to SabreTools.Data.Models/ClrMamePro/DipSwitch.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Disk.cs b/SabreTools.Data.Models/ClrMamePro/Disk.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Disk.cs
rename to SabreTools.Data.Models/ClrMamePro/Disk.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Driver.cs b/SabreTools.Data.Models/ClrMamePro/Driver.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Driver.cs
rename to SabreTools.Data.Models/ClrMamePro/Driver.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Game.cs b/SabreTools.Data.Models/ClrMamePro/Game.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Game.cs
rename to SabreTools.Data.Models/ClrMamePro/Game.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/GameBase.cs b/SabreTools.Data.Models/ClrMamePro/GameBase.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/GameBase.cs
rename to SabreTools.Data.Models/ClrMamePro/GameBase.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Info.cs b/SabreTools.Data.Models/ClrMamePro/Info.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Info.cs
rename to SabreTools.Data.Models/ClrMamePro/Info.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Input.cs b/SabreTools.Data.Models/ClrMamePro/Input.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Input.cs
rename to SabreTools.Data.Models/ClrMamePro/Input.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Machine.cs b/SabreTools.Data.Models/ClrMamePro/Machine.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Machine.cs
rename to SabreTools.Data.Models/ClrMamePro/Machine.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Media.cs b/SabreTools.Data.Models/ClrMamePro/Media.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Media.cs
rename to SabreTools.Data.Models/ClrMamePro/Media.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/MetadataFile.cs b/SabreTools.Data.Models/ClrMamePro/MetadataFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/MetadataFile.cs
rename to SabreTools.Data.Models/ClrMamePro/MetadataFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Release.cs b/SabreTools.Data.Models/ClrMamePro/Release.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Release.cs
rename to SabreTools.Data.Models/ClrMamePro/Release.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Resource.cs b/SabreTools.Data.Models/ClrMamePro/Resource.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Resource.cs
rename to SabreTools.Data.Models/ClrMamePro/Resource.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Rom.cs b/SabreTools.Data.Models/ClrMamePro/Rom.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Rom.cs
rename to SabreTools.Data.Models/ClrMamePro/Rom.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/RomVault.cs b/SabreTools.Data.Models/ClrMamePro/RomVault.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/RomVault.cs
rename to SabreTools.Data.Models/ClrMamePro/RomVault.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Sample.cs b/SabreTools.Data.Models/ClrMamePro/Sample.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Sample.cs
rename to SabreTools.Data.Models/ClrMamePro/Sample.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Set.cs b/SabreTools.Data.Models/ClrMamePro/Set.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Set.cs
rename to SabreTools.Data.Models/ClrMamePro/Set.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Sound.cs b/SabreTools.Data.Models/ClrMamePro/Sound.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Sound.cs
rename to SabreTools.Data.Models/ClrMamePro/Sound.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Video.cs b/SabreTools.Data.Models/ClrMamePro/Video.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ClrMamePro/Video.cs
rename to SabreTools.Data.Models/ClrMamePro/Video.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CueSheets/CueFile.cs b/SabreTools.Data.Models/CueSheets/CueFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CueSheets/CueFile.cs
rename to SabreTools.Data.Models/CueSheets/CueFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CueSheets/CueIndex.cs b/SabreTools.Data.Models/CueSheets/CueIndex.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CueSheets/CueIndex.cs
rename to SabreTools.Data.Models/CueSheets/CueIndex.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CueSheets/CueSheet.cs b/SabreTools.Data.Models/CueSheets/CueSheet.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CueSheets/CueSheet.cs
rename to SabreTools.Data.Models/CueSheets/CueSheet.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CueSheets/CueTrack.cs b/SabreTools.Data.Models/CueSheets/CueTrack.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CueSheets/CueTrack.cs
rename to SabreTools.Data.Models/CueSheets/CueTrack.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CueSheets/Enums.cs b/SabreTools.Data.Models/CueSheets/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CueSheets/Enums.cs
rename to SabreTools.Data.Models/CueSheets/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CueSheets/PostGap.cs b/SabreTools.Data.Models/CueSheets/PostGap.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CueSheets/PostGap.cs
rename to SabreTools.Data.Models/CueSheets/PostGap.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/CueSheets/PreGap.cs b/SabreTools.Data.Models/CueSheets/PreGap.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/CueSheets/PreGap.cs
rename to SabreTools.Data.Models/CueSheets/PreGap.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/AudioSubPictureAttributesTable.cs b/SabreTools.Data.Models/DVD/AudioSubPictureAttributesTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/AudioSubPictureAttributesTable.cs
rename to SabreTools.Data.Models/DVD/AudioSubPictureAttributesTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/AudioSubPictureAttributesTableEntry.cs b/SabreTools.Data.Models/DVD/AudioSubPictureAttributesTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/AudioSubPictureAttributesTableEntry.cs
rename to SabreTools.Data.Models/DVD/AudioSubPictureAttributesTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/CellAddressTable.cs b/SabreTools.Data.Models/DVD/CellAddressTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/CellAddressTable.cs
rename to SabreTools.Data.Models/DVD/CellAddressTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/CellAddressTableEntry.cs b/SabreTools.Data.Models/DVD/CellAddressTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/CellAddressTableEntry.cs
rename to SabreTools.Data.Models/DVD/CellAddressTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/Constants.cs b/SabreTools.Data.Models/DVD/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/Constants.cs
rename to SabreTools.Data.Models/DVD/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/Enums.cs b/SabreTools.Data.Models/DVD/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/Enums.cs
rename to SabreTools.Data.Models/DVD/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/LanguageUnitTable.cs b/SabreTools.Data.Models/DVD/LanguageUnitTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/LanguageUnitTable.cs
rename to SabreTools.Data.Models/DVD/LanguageUnitTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/LanguageUnitTableEntry.cs b/SabreTools.Data.Models/DVD/LanguageUnitTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/LanguageUnitTableEntry.cs
rename to SabreTools.Data.Models/DVD/LanguageUnitTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/ParentalManagementMasksTable.cs b/SabreTools.Data.Models/DVD/ParentalManagementMasksTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/ParentalManagementMasksTable.cs
rename to SabreTools.Data.Models/DVD/ParentalManagementMasksTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/ParentalManagementMasksTableEntry.cs b/SabreTools.Data.Models/DVD/ParentalManagementMasksTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/ParentalManagementMasksTableEntry.cs
rename to SabreTools.Data.Models/DVD/ParentalManagementMasksTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/ProgramChainTable.cs b/SabreTools.Data.Models/DVD/ProgramChainTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/ProgramChainTable.cs
rename to SabreTools.Data.Models/DVD/ProgramChainTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/ProgramChainTableEntry.cs b/SabreTools.Data.Models/DVD/ProgramChainTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/ProgramChainTableEntry.cs
rename to SabreTools.Data.Models/DVD/ProgramChainTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/TitlesTable.cs b/SabreTools.Data.Models/DVD/TitlesTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/TitlesTable.cs
rename to SabreTools.Data.Models/DVD/TitlesTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/TitlesTableEntry.cs b/SabreTools.Data.Models/DVD/TitlesTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/TitlesTableEntry.cs
rename to SabreTools.Data.Models/DVD/TitlesTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/VOBUAddressMap.cs b/SabreTools.Data.Models/DVD/VOBUAddressMap.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/VOBUAddressMap.cs
rename to SabreTools.Data.Models/DVD/VOBUAddressMap.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/VideoManagerIFO.cs b/SabreTools.Data.Models/DVD/VideoManagerIFO.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/VideoManagerIFO.cs
rename to SabreTools.Data.Models/DVD/VideoManagerIFO.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DVD/VideoTitleSetIFO.cs b/SabreTools.Data.Models/DVD/VideoTitleSetIFO.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DVD/VideoTitleSetIFO.cs
rename to SabreTools.Data.Models/DVD/VideoTitleSetIFO.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Delphi/Constants.cs b/SabreTools.Data.Models/Delphi/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Delphi/Constants.cs
rename to SabreTools.Data.Models/Delphi/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Delphi/PackageInfoTable.cs b/SabreTools.Data.Models/Delphi/PackageInfoTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Delphi/PackageInfoTable.cs
rename to SabreTools.Data.Models/Delphi/PackageInfoTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Delphi/PackageTypeInfo.cs b/SabreTools.Data.Models/Delphi/PackageTypeInfo.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Delphi/PackageTypeInfo.cs
rename to SabreTools.Data.Models/Delphi/PackageTypeInfo.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Delphi/PackageUnitEntry.cs b/SabreTools.Data.Models/Delphi/PackageUnitEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Delphi/PackageUnitEntry.cs
rename to SabreTools.Data.Models/Delphi/PackageUnitEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DosCenter/DosCenter.cs b/SabreTools.Data.Models/DosCenter/DosCenter.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DosCenter/DosCenter.cs
rename to SabreTools.Data.Models/DosCenter/DosCenter.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DosCenter/File.cs b/SabreTools.Data.Models/DosCenter/File.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DosCenter/File.cs
rename to SabreTools.Data.Models/DosCenter/File.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DosCenter/Game.cs b/SabreTools.Data.Models/DosCenter/Game.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DosCenter/Game.cs
rename to SabreTools.Data.Models/DosCenter/Game.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/DosCenter/MetadataFile.cs b/SabreTools.Data.Models/DosCenter/MetadataFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/DosCenter/MetadataFile.cs
rename to SabreTools.Data.Models/DosCenter/MetadataFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/EverdriveSMDB/MetadataFile.cs b/SabreTools.Data.Models/EverdriveSMDB/MetadataFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/EverdriveSMDB/MetadataFile.cs
rename to SabreTools.Data.Models/EverdriveSMDB/MetadataFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/EverdriveSMDB/Row.cs b/SabreTools.Data.Models/EverdriveSMDB/Row.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/EverdriveSMDB/Row.cs
rename to SabreTools.Data.Models/EverdriveSMDB/Row.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/BlockEntry.cs b/SabreTools.Data.Models/GCF/BlockEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/BlockEntry.cs
rename to SabreTools.Data.Models/GCF/BlockEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/BlockEntryHeader.cs b/SabreTools.Data.Models/GCF/BlockEntryHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/BlockEntryHeader.cs
rename to SabreTools.Data.Models/GCF/BlockEntryHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/BlockEntryMap.cs b/SabreTools.Data.Models/GCF/BlockEntryMap.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/BlockEntryMap.cs
rename to SabreTools.Data.Models/GCF/BlockEntryMap.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/BlockEntryMapHeader.cs b/SabreTools.Data.Models/GCF/BlockEntryMapHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/BlockEntryMapHeader.cs
rename to SabreTools.Data.Models/GCF/BlockEntryMapHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/ChecksumEntry.cs b/SabreTools.Data.Models/GCF/ChecksumEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/ChecksumEntry.cs
rename to SabreTools.Data.Models/GCF/ChecksumEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/ChecksumHeader.cs b/SabreTools.Data.Models/GCF/ChecksumHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/ChecksumHeader.cs
rename to SabreTools.Data.Models/GCF/ChecksumHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/ChecksumMapEntry.cs b/SabreTools.Data.Models/GCF/ChecksumMapEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/ChecksumMapEntry.cs
rename to SabreTools.Data.Models/GCF/ChecksumMapEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/ChecksumMapHeader.cs b/SabreTools.Data.Models/GCF/ChecksumMapHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/ChecksumMapHeader.cs
rename to SabreTools.Data.Models/GCF/ChecksumMapHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/Constants.cs b/SabreTools.Data.Models/GCF/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/Constants.cs
rename to SabreTools.Data.Models/GCF/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/DataBlockHeader.cs b/SabreTools.Data.Models/GCF/DataBlockHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/DataBlockHeader.cs
rename to SabreTools.Data.Models/GCF/DataBlockHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryCopyEntry.cs b/SabreTools.Data.Models/GCF/DirectoryCopyEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryCopyEntry.cs
rename to SabreTools.Data.Models/GCF/DirectoryCopyEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryEntry.cs b/SabreTools.Data.Models/GCF/DirectoryEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryEntry.cs
rename to SabreTools.Data.Models/GCF/DirectoryEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryHeader.cs b/SabreTools.Data.Models/GCF/DirectoryHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryHeader.cs
rename to SabreTools.Data.Models/GCF/DirectoryHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryInfo1Entry.cs b/SabreTools.Data.Models/GCF/DirectoryInfo1Entry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryInfo1Entry.cs
rename to SabreTools.Data.Models/GCF/DirectoryInfo1Entry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryInfo2Entry.cs b/SabreTools.Data.Models/GCF/DirectoryInfo2Entry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryInfo2Entry.cs
rename to SabreTools.Data.Models/GCF/DirectoryInfo2Entry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryLocalEntry.cs b/SabreTools.Data.Models/GCF/DirectoryLocalEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryLocalEntry.cs
rename to SabreTools.Data.Models/GCF/DirectoryLocalEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryMapEntry.cs b/SabreTools.Data.Models/GCF/DirectoryMapEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryMapEntry.cs
rename to SabreTools.Data.Models/GCF/DirectoryMapEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryMapHeader.cs b/SabreTools.Data.Models/GCF/DirectoryMapHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/DirectoryMapHeader.cs
rename to SabreTools.Data.Models/GCF/DirectoryMapHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/Enums.cs b/SabreTools.Data.Models/GCF/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/Enums.cs
rename to SabreTools.Data.Models/GCF/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/File.cs b/SabreTools.Data.Models/GCF/File.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/File.cs
rename to SabreTools.Data.Models/GCF/File.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/FragmentationMap.cs b/SabreTools.Data.Models/GCF/FragmentationMap.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/FragmentationMap.cs
rename to SabreTools.Data.Models/GCF/FragmentationMap.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/FragmentationMapHeader.cs b/SabreTools.Data.Models/GCF/FragmentationMapHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/FragmentationMapHeader.cs
rename to SabreTools.Data.Models/GCF/FragmentationMapHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GCF/Header.cs b/SabreTools.Data.Models/GCF/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GCF/Header.cs
rename to SabreTools.Data.Models/GCF/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GZIP/Archive.cs b/SabreTools.Data.Models/GZIP/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GZIP/Archive.cs
rename to SabreTools.Data.Models/GZIP/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GZIP/Constants.cs b/SabreTools.Data.Models/GZIP/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GZIP/Constants.cs
rename to SabreTools.Data.Models/GZIP/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GZIP/Enums.cs b/SabreTools.Data.Models/GZIP/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GZIP/Enums.cs
rename to SabreTools.Data.Models/GZIP/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GZIP/ExtraFieldData.cs b/SabreTools.Data.Models/GZIP/ExtraFieldData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GZIP/ExtraFieldData.cs
rename to SabreTools.Data.Models/GZIP/ExtraFieldData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GZIP/Header.cs b/SabreTools.Data.Models/GZIP/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GZIP/Header.cs
rename to SabreTools.Data.Models/GZIP/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GZIP/Trailer.cs b/SabreTools.Data.Models/GZIP/Trailer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GZIP/Trailer.cs
rename to SabreTools.Data.Models/GZIP/Trailer.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GameHeader/FileData.cs b/SabreTools.Data.Models/GameHeader/FileData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GameHeader/FileData.cs
rename to SabreTools.Data.Models/GameHeader/FileData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GameHeader/NitroEncryptedData.cs b/SabreTools.Data.Models/GameHeader/NitroEncryptedData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GameHeader/NitroEncryptedData.cs
rename to SabreTools.Data.Models/GameHeader/NitroEncryptedData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GameHeader/NitroHeaderData.cs b/SabreTools.Data.Models/GameHeader/NitroHeaderData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GameHeader/NitroHeaderData.cs
rename to SabreTools.Data.Models/GameHeader/NitroHeaderData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/GameHeader/NitroIconTitleData.cs b/SabreTools.Data.Models/GameHeader/NitroIconTitleData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/GameHeader/NitroIconTitleData.cs
rename to SabreTools.Data.Models/GameHeader/NitroIconTitleData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Hashfile/Hashfile.cs b/SabreTools.Data.Models/Hashfile/Hashfile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Hashfile/Hashfile.cs
rename to SabreTools.Data.Models/Hashfile/Hashfile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Hashfile/MD2.cs b/SabreTools.Data.Models/Hashfile/MD2.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Hashfile/MD2.cs
rename to SabreTools.Data.Models/Hashfile/MD2.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Hashfile/MD4.cs b/SabreTools.Data.Models/Hashfile/MD4.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Hashfile/MD4.cs
rename to SabreTools.Data.Models/Hashfile/MD4.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Hashfile/MD5.cs b/SabreTools.Data.Models/Hashfile/MD5.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Hashfile/MD5.cs
rename to SabreTools.Data.Models/Hashfile/MD5.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Hashfile/RIPEMD128.cs b/SabreTools.Data.Models/Hashfile/RIPEMD128.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Hashfile/RIPEMD128.cs
rename to SabreTools.Data.Models/Hashfile/RIPEMD128.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Hashfile/RIPEMD160.cs b/SabreTools.Data.Models/Hashfile/RIPEMD160.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Hashfile/RIPEMD160.cs
rename to SabreTools.Data.Models/Hashfile/RIPEMD160.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Hashfile/SFV.cs b/SabreTools.Data.Models/Hashfile/SFV.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Hashfile/SFV.cs
rename to SabreTools.Data.Models/Hashfile/SFV.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Hashfile/SHA1.cs b/SabreTools.Data.Models/Hashfile/SHA1.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Hashfile/SHA1.cs
rename to SabreTools.Data.Models/Hashfile/SHA1.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Hashfile/SHA256.cs b/SabreTools.Data.Models/Hashfile/SHA256.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Hashfile/SHA256.cs
rename to SabreTools.Data.Models/Hashfile/SHA256.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Hashfile/SHA384.cs b/SabreTools.Data.Models/Hashfile/SHA384.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Hashfile/SHA384.cs
rename to SabreTools.Data.Models/Hashfile/SHA384.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Hashfile/SHA512.cs b/SabreTools.Data.Models/Hashfile/SHA512.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Hashfile/SHA512.cs
rename to SabreTools.Data.Models/Hashfile/SHA512.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Hashfile/SpamSum.cs b/SabreTools.Data.Models/Hashfile/SpamSum.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Hashfile/SpamSum.cs
rename to SabreTools.Data.Models/Hashfile/SpamSum.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/IRD/File.cs b/SabreTools.Data.Models/IRD/File.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/IRD/File.cs
rename to SabreTools.Data.Models/IRD/File.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/BaseVolumeDescriptor.cs b/SabreTools.Data.Models/ISO9660/BaseVolumeDescriptor.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/BaseVolumeDescriptor.cs
rename to SabreTools.Data.Models/ISO9660/BaseVolumeDescriptor.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/BootRecordVolumeDescriptor.cs b/SabreTools.Data.Models/ISO9660/BootRecordVolumeDescriptor.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/BootRecordVolumeDescriptor.cs
rename to SabreTools.Data.Models/ISO9660/BootRecordVolumeDescriptor.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/Constants.cs b/SabreTools.Data.Models/ISO9660/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/Constants.cs
rename to SabreTools.Data.Models/ISO9660/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/DataSector.cs b/SabreTools.Data.Models/ISO9660/DataSector.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/DataSector.cs
rename to SabreTools.Data.Models/ISO9660/DataSector.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/DecDateTime.cs b/SabreTools.Data.Models/ISO9660/DecDateTime.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/DecDateTime.cs
rename to SabreTools.Data.Models/ISO9660/DecDateTime.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/DirectoryExtent.cs b/SabreTools.Data.Models/ISO9660/DirectoryExtent.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/DirectoryExtent.cs
rename to SabreTools.Data.Models/ISO9660/DirectoryExtent.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/DirectoryRecord.cs b/SabreTools.Data.Models/ISO9660/DirectoryRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/DirectoryRecord.cs
rename to SabreTools.Data.Models/ISO9660/DirectoryRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/DirectoryRecordDateTime.cs b/SabreTools.Data.Models/ISO9660/DirectoryRecordDateTime.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/DirectoryRecordDateTime.cs
rename to SabreTools.Data.Models/ISO9660/DirectoryRecordDateTime.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/Enums.cs b/SabreTools.Data.Models/ISO9660/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/Enums.cs
rename to SabreTools.Data.Models/ISO9660/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/ExtendedAttributeRecord.cs b/SabreTools.Data.Models/ISO9660/ExtendedAttributeRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/ExtendedAttributeRecord.cs
rename to SabreTools.Data.Models/ISO9660/ExtendedAttributeRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/FileExtent.cs b/SabreTools.Data.Models/ISO9660/FileExtent.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/FileExtent.cs
rename to SabreTools.Data.Models/ISO9660/FileExtent.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/FileSystem.cs b/SabreTools.Data.Models/ISO9660/FileSystem.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/FileSystem.cs
rename to SabreTools.Data.Models/ISO9660/FileSystem.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/GenericVolumeDescriptor.cs b/SabreTools.Data.Models/ISO9660/GenericVolumeDescriptor.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/GenericVolumeDescriptor.cs
rename to SabreTools.Data.Models/ISO9660/GenericVolumeDescriptor.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/PathTableGroup.cs b/SabreTools.Data.Models/ISO9660/PathTableGroup.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/PathTableGroup.cs
rename to SabreTools.Data.Models/ISO9660/PathTableGroup.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/PathTableRecord.cs b/SabreTools.Data.Models/ISO9660/PathTableRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/PathTableRecord.cs
rename to SabreTools.Data.Models/ISO9660/PathTableRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/PrimaryVolumeDescriptor.cs b/SabreTools.Data.Models/ISO9660/PrimaryVolumeDescriptor.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/PrimaryVolumeDescriptor.cs
rename to SabreTools.Data.Models/ISO9660/PrimaryVolumeDescriptor.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/Sector.cs b/SabreTools.Data.Models/ISO9660/Sector.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/Sector.cs
rename to SabreTools.Data.Models/ISO9660/Sector.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/SupplementaryVolumerDescriptor.cs b/SabreTools.Data.Models/ISO9660/SupplementaryVolumerDescriptor.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/SupplementaryVolumerDescriptor.cs
rename to SabreTools.Data.Models/ISO9660/SupplementaryVolumerDescriptor.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/Volume.cs b/SabreTools.Data.Models/ISO9660/Volume.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/Volume.cs
rename to SabreTools.Data.Models/ISO9660/Volume.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/VolumeDescriptor.cs b/SabreTools.Data.Models/ISO9660/VolumeDescriptor.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/VolumeDescriptor.cs
rename to SabreTools.Data.Models/ISO9660/VolumeDescriptor.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/VolumeDescriptorSetTerminator.cs b/SabreTools.Data.Models/ISO9660/VolumeDescriptorSetTerminator.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/VolumeDescriptorSetTerminator.cs
rename to SabreTools.Data.Models/ISO9660/VolumeDescriptorSetTerminator.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ISO9660/VolumePartitionDescriptor.cs b/SabreTools.Data.Models/ISO9660/VolumePartitionDescriptor.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ISO9660/VolumePartitionDescriptor.cs
rename to SabreTools.Data.Models/ISO9660/VolumePartitionDescriptor.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldArchiveV3/Archive.cs b/SabreTools.Data.Models/InstallShieldArchiveV3/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldArchiveV3/Archive.cs
rename to SabreTools.Data.Models/InstallShieldArchiveV3/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldArchiveV3/Constants.cs b/SabreTools.Data.Models/InstallShieldArchiveV3/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldArchiveV3/Constants.cs
rename to SabreTools.Data.Models/InstallShieldArchiveV3/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldArchiveV3/Directory.cs b/SabreTools.Data.Models/InstallShieldArchiveV3/Directory.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldArchiveV3/Directory.cs
rename to SabreTools.Data.Models/InstallShieldArchiveV3/Directory.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldArchiveV3/Enums.cs b/SabreTools.Data.Models/InstallShieldArchiveV3/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldArchiveV3/Enums.cs
rename to SabreTools.Data.Models/InstallShieldArchiveV3/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldArchiveV3/File.cs b/SabreTools.Data.Models/InstallShieldArchiveV3/File.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldArchiveV3/File.cs
rename to SabreTools.Data.Models/InstallShieldArchiveV3/File.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldArchiveV3/Header.cs b/SabreTools.Data.Models/InstallShieldArchiveV3/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldArchiveV3/Header.cs
rename to SabreTools.Data.Models/InstallShieldArchiveV3/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/Cabinet.cs b/SabreTools.Data.Models/InstallShieldCabinet/Cabinet.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/Cabinet.cs
rename to SabreTools.Data.Models/InstallShieldCabinet/Cabinet.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/CommonHeader.cs b/SabreTools.Data.Models/InstallShieldCabinet/CommonHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/CommonHeader.cs
rename to SabreTools.Data.Models/InstallShieldCabinet/CommonHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/Component.cs b/SabreTools.Data.Models/InstallShieldCabinet/Component.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/Component.cs
rename to SabreTools.Data.Models/InstallShieldCabinet/Component.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/Constants.cs b/SabreTools.Data.Models/InstallShieldCabinet/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/Constants.cs
rename to SabreTools.Data.Models/InstallShieldCabinet/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/Descriptor.cs b/SabreTools.Data.Models/InstallShieldCabinet/Descriptor.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/Descriptor.cs
rename to SabreTools.Data.Models/InstallShieldCabinet/Descriptor.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/Enums.cs b/SabreTools.Data.Models/InstallShieldCabinet/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/Enums.cs
rename to SabreTools.Data.Models/InstallShieldCabinet/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/FileDescriptor.cs b/SabreTools.Data.Models/InstallShieldCabinet/FileDescriptor.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/FileDescriptor.cs
rename to SabreTools.Data.Models/InstallShieldCabinet/FileDescriptor.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/FileGroup.cs b/SabreTools.Data.Models/InstallShieldCabinet/FileGroup.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/FileGroup.cs
rename to SabreTools.Data.Models/InstallShieldCabinet/FileGroup.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/OffsetList.cs b/SabreTools.Data.Models/InstallShieldCabinet/OffsetList.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/OffsetList.cs
rename to SabreTools.Data.Models/InstallShieldCabinet/OffsetList.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/VolumeHeader.cs b/SabreTools.Data.Models/InstallShieldCabinet/VolumeHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldCabinet/VolumeHeader.cs
rename to SabreTools.Data.Models/InstallShieldCabinet/VolumeHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldExecutable/Constants.cs b/SabreTools.Data.Models/InstallShieldExecutable/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldExecutable/Constants.cs
rename to SabreTools.Data.Models/InstallShieldExecutable/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldExecutable/FileEntry.cs b/SabreTools.Data.Models/InstallShieldExecutable/FileEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldExecutable/FileEntry.cs
rename to SabreTools.Data.Models/InstallShieldExecutable/FileEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/InstallShieldExecutable/SFX.cs b/SabreTools.Data.Models/InstallShieldExecutable/SFX.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/InstallShieldExecutable/SFX.cs
rename to SabreTools.Data.Models/InstallShieldExecutable/SFX.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LDSCRYPT/Constants.cs b/SabreTools.Data.Models/LDSCRYPT/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LDSCRYPT/Constants.cs
rename to SabreTools.Data.Models/LDSCRYPT/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LDSCRYPT/EncryptedFile.cs b/SabreTools.Data.Models/LDSCRYPT/EncryptedFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LDSCRYPT/EncryptedFile.cs
rename to SabreTools.Data.Models/LDSCRYPT/EncryptedFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LZ/Constants.cs b/SabreTools.Data.Models/LZ/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LZ/Constants.cs
rename to SabreTools.Data.Models/LZ/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LZ/Enums.cs b/SabreTools.Data.Models/LZ/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LZ/Enums.cs
rename to SabreTools.Data.Models/LZ/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LZ/KWAJFile.cs b/SabreTools.Data.Models/LZ/KWAJFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LZ/KWAJFile.cs
rename to SabreTools.Data.Models/LZ/KWAJFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LZ/KWAJHeader.cs b/SabreTools.Data.Models/LZ/KWAJHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LZ/KWAJHeader.cs
rename to SabreTools.Data.Models/LZ/KWAJHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LZ/KWAJHeaderExtensions.cs b/SabreTools.Data.Models/LZ/KWAJHeaderExtensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LZ/KWAJHeaderExtensions.cs
rename to SabreTools.Data.Models/LZ/KWAJHeaderExtensions.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LZ/QBasicFile.cs b/SabreTools.Data.Models/LZ/QBasicFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LZ/QBasicFile.cs
rename to SabreTools.Data.Models/LZ/QBasicFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LZ/QBasicHeader.cs b/SabreTools.Data.Models/LZ/QBasicHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LZ/QBasicHeader.cs
rename to SabreTools.Data.Models/LZ/QBasicHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LZ/SZDDFile.cs b/SabreTools.Data.Models/LZ/SZDDFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LZ/SZDDFile.cs
rename to SabreTools.Data.Models/LZ/SZDDFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LZ/SZDDHeader.cs b/SabreTools.Data.Models/LZ/SZDDHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LZ/SZDDHeader.cs
rename to SabreTools.Data.Models/LZ/SZDDHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/Constants.cs b/SabreTools.Data.Models/LinearExecutable/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/Constants.cs
rename to SabreTools.Data.Models/LinearExecutable/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/DebugInformation.cs b/SabreTools.Data.Models/LinearExecutable/DebugInformation.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/DebugInformation.cs
rename to SabreTools.Data.Models/LinearExecutable/DebugInformation.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/EntryTableBundle.cs b/SabreTools.Data.Models/LinearExecutable/EntryTableBundle.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/EntryTableBundle.cs
rename to SabreTools.Data.Models/LinearExecutable/EntryTableBundle.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/EntryTableEntry.cs b/SabreTools.Data.Models/LinearExecutable/EntryTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/EntryTableEntry.cs
rename to SabreTools.Data.Models/LinearExecutable/EntryTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/Enums.cs b/SabreTools.Data.Models/LinearExecutable/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/Enums.cs
rename to SabreTools.Data.Models/LinearExecutable/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/Executable.cs b/SabreTools.Data.Models/LinearExecutable/Executable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/Executable.cs
rename to SabreTools.Data.Models/LinearExecutable/Executable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/FixupPageTableEntry.cs b/SabreTools.Data.Models/LinearExecutable/FixupPageTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/FixupPageTableEntry.cs
rename to SabreTools.Data.Models/LinearExecutable/FixupPageTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/FixupRecordTableEntry.cs b/SabreTools.Data.Models/LinearExecutable/FixupRecordTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/FixupRecordTableEntry.cs
rename to SabreTools.Data.Models/LinearExecutable/FixupRecordTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/ImportModuleNameTableEntry.cs b/SabreTools.Data.Models/LinearExecutable/ImportModuleNameTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/ImportModuleNameTableEntry.cs
rename to SabreTools.Data.Models/LinearExecutable/ImportModuleNameTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/ImportProcedureNameTableEntry.cs b/SabreTools.Data.Models/LinearExecutable/ImportProcedureNameTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/ImportProcedureNameTableEntry.cs
rename to SabreTools.Data.Models/LinearExecutable/ImportProcedureNameTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/InformationBlock.cs b/SabreTools.Data.Models/LinearExecutable/InformationBlock.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/InformationBlock.cs
rename to SabreTools.Data.Models/LinearExecutable/InformationBlock.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/ModuleFormatDirectivesTableEntry.cs b/SabreTools.Data.Models/LinearExecutable/ModuleFormatDirectivesTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/ModuleFormatDirectivesTableEntry.cs
rename to SabreTools.Data.Models/LinearExecutable/ModuleFormatDirectivesTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/NonResidentNamesTableEntry.cs b/SabreTools.Data.Models/LinearExecutable/NonResidentNamesTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/NonResidentNamesTableEntry.cs
rename to SabreTools.Data.Models/LinearExecutable/NonResidentNamesTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/ObjectPageMapEntry.cs b/SabreTools.Data.Models/LinearExecutable/ObjectPageMapEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/ObjectPageMapEntry.cs
rename to SabreTools.Data.Models/LinearExecutable/ObjectPageMapEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/ObjectTableEntry.cs b/SabreTools.Data.Models/LinearExecutable/ObjectTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/ObjectTableEntry.cs
rename to SabreTools.Data.Models/LinearExecutable/ObjectTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/PerPageChecksumTableEntry.cs b/SabreTools.Data.Models/LinearExecutable/PerPageChecksumTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/PerPageChecksumTableEntry.cs
rename to SabreTools.Data.Models/LinearExecutable/PerPageChecksumTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/ResidentNamesTableEntry.cs b/SabreTools.Data.Models/LinearExecutable/ResidentNamesTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/ResidentNamesTableEntry.cs
rename to SabreTools.Data.Models/LinearExecutable/ResidentNamesTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/ResourceTableEntry.cs b/SabreTools.Data.Models/LinearExecutable/ResourceTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/ResourceTableEntry.cs
rename to SabreTools.Data.Models/LinearExecutable/ResourceTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/VerifyRecordDirectiveTableEntry.cs b/SabreTools.Data.Models/LinearExecutable/VerifyRecordDirectiveTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/LinearExecutable/VerifyRecordDirectiveTableEntry.cs
rename to SabreTools.Data.Models/LinearExecutable/VerifyRecordDirectiveTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listrom/MetadataFile.cs b/SabreTools.Data.Models/Listrom/MetadataFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listrom/MetadataFile.cs
rename to SabreTools.Data.Models/Listrom/MetadataFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listrom/Row.cs b/SabreTools.Data.Models/Listrom/Row.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listrom/Row.cs
rename to SabreTools.Data.Models/Listrom/Row.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listrom/Set.cs b/SabreTools.Data.Models/Listrom/Set.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listrom/Set.cs
rename to SabreTools.Data.Models/Listrom/Set.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Adjuster.cs b/SabreTools.Data.Models/Listxml/Adjuster.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Adjuster.cs
rename to SabreTools.Data.Models/Listxml/Adjuster.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Analog.cs b/SabreTools.Data.Models/Listxml/Analog.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Analog.cs
rename to SabreTools.Data.Models/Listxml/Analog.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/BiosSet.cs b/SabreTools.Data.Models/Listxml/BiosSet.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/BiosSet.cs
rename to SabreTools.Data.Models/Listxml/BiosSet.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Chip.cs b/SabreTools.Data.Models/Listxml/Chip.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Chip.cs
rename to SabreTools.Data.Models/Listxml/Chip.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Condition.cs b/SabreTools.Data.Models/Listxml/Condition.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Condition.cs
rename to SabreTools.Data.Models/Listxml/Condition.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/ConfLocation.cs b/SabreTools.Data.Models/Listxml/ConfLocation.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/ConfLocation.cs
rename to SabreTools.Data.Models/Listxml/ConfLocation.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/ConfSetting.cs b/SabreTools.Data.Models/Listxml/ConfSetting.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/ConfSetting.cs
rename to SabreTools.Data.Models/Listxml/ConfSetting.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Configuration.cs b/SabreTools.Data.Models/Listxml/Configuration.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Configuration.cs
rename to SabreTools.Data.Models/Listxml/Configuration.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Control.cs b/SabreTools.Data.Models/Listxml/Control.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Control.cs
rename to SabreTools.Data.Models/Listxml/Control.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Device.cs b/SabreTools.Data.Models/Listxml/Device.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Device.cs
rename to SabreTools.Data.Models/Listxml/Device.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/DeviceRef.cs b/SabreTools.Data.Models/Listxml/DeviceRef.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/DeviceRef.cs
rename to SabreTools.Data.Models/Listxml/DeviceRef.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/DipLocation.cs b/SabreTools.Data.Models/Listxml/DipLocation.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/DipLocation.cs
rename to SabreTools.Data.Models/Listxml/DipLocation.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/DipSwitch.cs b/SabreTools.Data.Models/Listxml/DipSwitch.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/DipSwitch.cs
rename to SabreTools.Data.Models/Listxml/DipSwitch.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/DipValue.cs b/SabreTools.Data.Models/Listxml/DipValue.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/DipValue.cs
rename to SabreTools.Data.Models/Listxml/DipValue.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Disk.cs b/SabreTools.Data.Models/Listxml/Disk.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Disk.cs
rename to SabreTools.Data.Models/Listxml/Disk.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Display.cs b/SabreTools.Data.Models/Listxml/Display.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Display.cs
rename to SabreTools.Data.Models/Listxml/Display.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Driver.cs b/SabreTools.Data.Models/Listxml/Driver.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Driver.cs
rename to SabreTools.Data.Models/Listxml/Driver.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Extension.cs b/SabreTools.Data.Models/Listxml/Extension.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Extension.cs
rename to SabreTools.Data.Models/Listxml/Extension.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Feature.cs b/SabreTools.Data.Models/Listxml/Feature.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Feature.cs
rename to SabreTools.Data.Models/Listxml/Feature.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Game.cs b/SabreTools.Data.Models/Listxml/Game.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Game.cs
rename to SabreTools.Data.Models/Listxml/Game.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/GameBase.cs b/SabreTools.Data.Models/Listxml/GameBase.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/GameBase.cs
rename to SabreTools.Data.Models/Listxml/GameBase.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Input.cs b/SabreTools.Data.Models/Listxml/Input.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Input.cs
rename to SabreTools.Data.Models/Listxml/Input.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Instance.cs b/SabreTools.Data.Models/Listxml/Instance.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Instance.cs
rename to SabreTools.Data.Models/Listxml/Instance.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/M1.cs b/SabreTools.Data.Models/Listxml/M1.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/M1.cs
rename to SabreTools.Data.Models/Listxml/M1.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Machine.cs b/SabreTools.Data.Models/Listxml/Machine.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Machine.cs
rename to SabreTools.Data.Models/Listxml/Machine.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Mame.cs b/SabreTools.Data.Models/Listxml/Mame.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Mame.cs
rename to SabreTools.Data.Models/Listxml/Mame.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Mess.cs b/SabreTools.Data.Models/Listxml/Mess.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Mess.cs
rename to SabreTools.Data.Models/Listxml/Mess.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Port.cs b/SabreTools.Data.Models/Listxml/Port.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Port.cs
rename to SabreTools.Data.Models/Listxml/Port.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/RamOption.cs b/SabreTools.Data.Models/Listxml/RamOption.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/RamOption.cs
rename to SabreTools.Data.Models/Listxml/RamOption.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Rom.cs b/SabreTools.Data.Models/Listxml/Rom.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Rom.cs
rename to SabreTools.Data.Models/Listxml/Rom.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Sample.cs b/SabreTools.Data.Models/Listxml/Sample.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Sample.cs
rename to SabreTools.Data.Models/Listxml/Sample.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Slot.cs b/SabreTools.Data.Models/Listxml/Slot.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Slot.cs
rename to SabreTools.Data.Models/Listxml/Slot.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/SlotOption.cs b/SabreTools.Data.Models/Listxml/SlotOption.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/SlotOption.cs
rename to SabreTools.Data.Models/Listxml/SlotOption.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/SoftwareList.cs b/SabreTools.Data.Models/Listxml/SoftwareList.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/SoftwareList.cs
rename to SabreTools.Data.Models/Listxml/SoftwareList.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Sound.cs b/SabreTools.Data.Models/Listxml/Sound.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Sound.cs
rename to SabreTools.Data.Models/Listxml/Sound.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Listxml/Video.cs b/SabreTools.Data.Models/Listxml/Video.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Listxml/Video.cs
rename to SabreTools.Data.Models/Listxml/Video.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Archive.cs b/SabreTools.Data.Models/Logiqx/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Archive.cs
rename to SabreTools.Data.Models/Logiqx/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/BiosSet.cs b/SabreTools.Data.Models/Logiqx/BiosSet.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/BiosSet.cs
rename to SabreTools.Data.Models/Logiqx/BiosSet.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/ClrMamePro.cs b/SabreTools.Data.Models/Logiqx/ClrMamePro.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/ClrMamePro.cs
rename to SabreTools.Data.Models/Logiqx/ClrMamePro.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Datafile.cs b/SabreTools.Data.Models/Logiqx/Datafile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Datafile.cs
rename to SabreTools.Data.Models/Logiqx/Datafile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/DeviceRef.cs b/SabreTools.Data.Models/Logiqx/DeviceRef.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/DeviceRef.cs
rename to SabreTools.Data.Models/Logiqx/DeviceRef.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Dir.cs b/SabreTools.Data.Models/Logiqx/Dir.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Dir.cs
rename to SabreTools.Data.Models/Logiqx/Dir.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Disk.cs b/SabreTools.Data.Models/Logiqx/Disk.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Disk.cs
rename to SabreTools.Data.Models/Logiqx/Disk.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Driver.cs b/SabreTools.Data.Models/Logiqx/Driver.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Driver.cs
rename to SabreTools.Data.Models/Logiqx/Driver.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Game.cs b/SabreTools.Data.Models/Logiqx/Game.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Game.cs
rename to SabreTools.Data.Models/Logiqx/Game.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/GameBase.cs b/SabreTools.Data.Models/Logiqx/GameBase.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/GameBase.cs
rename to SabreTools.Data.Models/Logiqx/GameBase.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Header.cs b/SabreTools.Data.Models/Logiqx/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Header.cs
rename to SabreTools.Data.Models/Logiqx/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Machine.cs b/SabreTools.Data.Models/Logiqx/Machine.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Machine.cs
rename to SabreTools.Data.Models/Logiqx/Machine.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Media.cs b/SabreTools.Data.Models/Logiqx/Media.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Media.cs
rename to SabreTools.Data.Models/Logiqx/Media.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Release.cs b/SabreTools.Data.Models/Logiqx/Release.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Release.cs
rename to SabreTools.Data.Models/Logiqx/Release.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Rom.cs b/SabreTools.Data.Models/Logiqx/Rom.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Rom.cs
rename to SabreTools.Data.Models/Logiqx/Rom.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/RomCenter.cs b/SabreTools.Data.Models/Logiqx/RomCenter.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/RomCenter.cs
rename to SabreTools.Data.Models/Logiqx/RomCenter.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Sample.cs b/SabreTools.Data.Models/Logiqx/Sample.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Sample.cs
rename to SabreTools.Data.Models/Logiqx/Sample.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/SoftwareList.cs b/SabreTools.Data.Models/Logiqx/SoftwareList.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/SoftwareList.cs
rename to SabreTools.Data.Models/Logiqx/SoftwareList.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Trurip.cs b/SabreTools.Data.Models/Logiqx/Trurip.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Logiqx/Trurip.cs
rename to SabreTools.Data.Models/Logiqx/Trurip.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MSDOS/Constants.cs b/SabreTools.Data.Models/MSDOS/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MSDOS/Constants.cs
rename to SabreTools.Data.Models/MSDOS/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MSDOS/Executable.cs b/SabreTools.Data.Models/MSDOS/Executable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MSDOS/Executable.cs
rename to SabreTools.Data.Models/MSDOS/Executable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MSDOS/ExecutableHeader.cs b/SabreTools.Data.Models/MSDOS/ExecutableHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MSDOS/ExecutableHeader.cs
rename to SabreTools.Data.Models/MSDOS/ExecutableHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MSDOS/RelocationEntry.cs b/SabreTools.Data.Models/MSDOS/RelocationEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MSDOS/RelocationEntry.cs
rename to SabreTools.Data.Models/MSDOS/RelocationEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Adjuster.cs b/SabreTools.Data.Models/Metadata/Adjuster.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Adjuster.cs
rename to SabreTools.Data.Models/Metadata/Adjuster.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Analog.cs b/SabreTools.Data.Models/Metadata/Analog.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Analog.cs
rename to SabreTools.Data.Models/Metadata/Analog.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Archive.cs b/SabreTools.Data.Models/Metadata/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Archive.cs
rename to SabreTools.Data.Models/Metadata/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/BiosSet.cs b/SabreTools.Data.Models/Metadata/BiosSet.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/BiosSet.cs
rename to SabreTools.Data.Models/Metadata/BiosSet.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Blank.cs b/SabreTools.Data.Models/Metadata/Blank.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Blank.cs
rename to SabreTools.Data.Models/Metadata/Blank.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Chip.cs b/SabreTools.Data.Models/Metadata/Chip.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Chip.cs
rename to SabreTools.Data.Models/Metadata/Chip.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Condition.cs b/SabreTools.Data.Models/Metadata/Condition.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Condition.cs
rename to SabreTools.Data.Models/Metadata/Condition.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/ConfLocation.cs b/SabreTools.Data.Models/Metadata/ConfLocation.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/ConfLocation.cs
rename to SabreTools.Data.Models/Metadata/ConfLocation.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/ConfSetting.cs b/SabreTools.Data.Models/Metadata/ConfSetting.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/ConfSetting.cs
rename to SabreTools.Data.Models/Metadata/ConfSetting.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Configuration.cs b/SabreTools.Data.Models/Metadata/Configuration.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Configuration.cs
rename to SabreTools.Data.Models/Metadata/Configuration.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Control.cs b/SabreTools.Data.Models/Metadata/Control.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Control.cs
rename to SabreTools.Data.Models/Metadata/Control.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/DatItem.cs b/SabreTools.Data.Models/Metadata/DatItem.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/DatItem.cs
rename to SabreTools.Data.Models/Metadata/DatItem.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/DataArea.cs b/SabreTools.Data.Models/Metadata/DataArea.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/DataArea.cs
rename to SabreTools.Data.Models/Metadata/DataArea.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Device.cs b/SabreTools.Data.Models/Metadata/Device.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Device.cs
rename to SabreTools.Data.Models/Metadata/Device.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/DeviceRef.cs b/SabreTools.Data.Models/Metadata/DeviceRef.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/DeviceRef.cs
rename to SabreTools.Data.Models/Metadata/DeviceRef.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/DictionaryBase.cs b/SabreTools.Data.Models/Metadata/DictionaryBase.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/DictionaryBase.cs
rename to SabreTools.Data.Models/Metadata/DictionaryBase.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/DipLocation.cs b/SabreTools.Data.Models/Metadata/DipLocation.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/DipLocation.cs
rename to SabreTools.Data.Models/Metadata/DipLocation.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/DipSwitch.cs b/SabreTools.Data.Models/Metadata/DipSwitch.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/DipSwitch.cs
rename to SabreTools.Data.Models/Metadata/DipSwitch.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/DipValue.cs b/SabreTools.Data.Models/Metadata/DipValue.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/DipValue.cs
rename to SabreTools.Data.Models/Metadata/DipValue.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Disk.cs b/SabreTools.Data.Models/Metadata/Disk.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Disk.cs
rename to SabreTools.Data.Models/Metadata/Disk.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/DiskArea.cs b/SabreTools.Data.Models/Metadata/DiskArea.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/DiskArea.cs
rename to SabreTools.Data.Models/Metadata/DiskArea.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Display.cs b/SabreTools.Data.Models/Metadata/Display.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Display.cs
rename to SabreTools.Data.Models/Metadata/Display.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Driver.cs b/SabreTools.Data.Models/Metadata/Driver.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Driver.cs
rename to SabreTools.Data.Models/Metadata/Driver.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Dump.cs b/SabreTools.Data.Models/Metadata/Dump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Dump.cs
rename to SabreTools.Data.Models/Metadata/Dump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Extension.cs b/SabreTools.Data.Models/Metadata/Extension.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Extension.cs
rename to SabreTools.Data.Models/Metadata/Extension.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Feature.cs b/SabreTools.Data.Models/Metadata/Feature.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Feature.cs
rename to SabreTools.Data.Models/Metadata/Feature.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Header.cs b/SabreTools.Data.Models/Metadata/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Header.cs
rename to SabreTools.Data.Models/Metadata/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Info.cs b/SabreTools.Data.Models/Metadata/Info.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Info.cs
rename to SabreTools.Data.Models/Metadata/Info.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/InfoSource.cs b/SabreTools.Data.Models/Metadata/InfoSource.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/InfoSource.cs
rename to SabreTools.Data.Models/Metadata/InfoSource.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Input.cs b/SabreTools.Data.Models/Metadata/Input.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Input.cs
rename to SabreTools.Data.Models/Metadata/Input.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Instance.cs b/SabreTools.Data.Models/Metadata/Instance.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Instance.cs
rename to SabreTools.Data.Models/Metadata/Instance.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/ItemType.cs b/SabreTools.Data.Models/Metadata/ItemType.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/ItemType.cs
rename to SabreTools.Data.Models/Metadata/ItemType.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Machine.cs b/SabreTools.Data.Models/Metadata/Machine.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Machine.cs
rename to SabreTools.Data.Models/Metadata/Machine.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Media.cs b/SabreTools.Data.Models/Metadata/Media.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Media.cs
rename to SabreTools.Data.Models/Metadata/Media.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/MetadataFile.cs b/SabreTools.Data.Models/Metadata/MetadataFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/MetadataFile.cs
rename to SabreTools.Data.Models/Metadata/MetadataFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Original.cs b/SabreTools.Data.Models/Metadata/Original.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Original.cs
rename to SabreTools.Data.Models/Metadata/Original.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Part.cs b/SabreTools.Data.Models/Metadata/Part.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Part.cs
rename to SabreTools.Data.Models/Metadata/Part.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Port.cs b/SabreTools.Data.Models/Metadata/Port.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Port.cs
rename to SabreTools.Data.Models/Metadata/Port.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/RamOption.cs b/SabreTools.Data.Models/Metadata/RamOption.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/RamOption.cs
rename to SabreTools.Data.Models/Metadata/RamOption.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Release.cs b/SabreTools.Data.Models/Metadata/Release.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Release.cs
rename to SabreTools.Data.Models/Metadata/Release.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Rom.cs b/SabreTools.Data.Models/Metadata/Rom.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Rom.cs
rename to SabreTools.Data.Models/Metadata/Rom.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Sample.cs b/SabreTools.Data.Models/Metadata/Sample.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Sample.cs
rename to SabreTools.Data.Models/Metadata/Sample.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/SharedFeat.cs b/SabreTools.Data.Models/Metadata/SharedFeat.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/SharedFeat.cs
rename to SabreTools.Data.Models/Metadata/SharedFeat.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Slot.cs b/SabreTools.Data.Models/Metadata/Slot.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Slot.cs
rename to SabreTools.Data.Models/Metadata/Slot.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/SlotOption.cs b/SabreTools.Data.Models/Metadata/SlotOption.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/SlotOption.cs
rename to SabreTools.Data.Models/Metadata/SlotOption.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Software.cs b/SabreTools.Data.Models/Metadata/Software.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Software.cs
rename to SabreTools.Data.Models/Metadata/Software.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/SoftwareList.cs b/SabreTools.Data.Models/Metadata/SoftwareList.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/SoftwareList.cs
rename to SabreTools.Data.Models/Metadata/SoftwareList.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Sound.cs b/SabreTools.Data.Models/Metadata/Sound.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Sound.cs
rename to SabreTools.Data.Models/Metadata/Sound.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Metadata/Video.cs b/SabreTools.Data.Models/Metadata/Video.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Metadata/Video.cs
rename to SabreTools.Data.Models/Metadata/Video.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MicrosoftCabinet/CFDATA.cs b/SabreTools.Data.Models/MicrosoftCabinet/CFDATA.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MicrosoftCabinet/CFDATA.cs
rename to SabreTools.Data.Models/MicrosoftCabinet/CFDATA.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MicrosoftCabinet/CFFILE.cs b/SabreTools.Data.Models/MicrosoftCabinet/CFFILE.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MicrosoftCabinet/CFFILE.cs
rename to SabreTools.Data.Models/MicrosoftCabinet/CFFILE.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MicrosoftCabinet/CFFOLDER.cs b/SabreTools.Data.Models/MicrosoftCabinet/CFFOLDER.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MicrosoftCabinet/CFFOLDER.cs
rename to SabreTools.Data.Models/MicrosoftCabinet/CFFOLDER.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MicrosoftCabinet/CFHEADER.cs b/SabreTools.Data.Models/MicrosoftCabinet/CFHEADER.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MicrosoftCabinet/CFHEADER.cs
rename to SabreTools.Data.Models/MicrosoftCabinet/CFHEADER.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MicrosoftCabinet/Cabinet.cs b/SabreTools.Data.Models/MicrosoftCabinet/Cabinet.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MicrosoftCabinet/Cabinet.cs
rename to SabreTools.Data.Models/MicrosoftCabinet/Cabinet.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MicrosoftCabinet/Constants.cs b/SabreTools.Data.Models/MicrosoftCabinet/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MicrosoftCabinet/Constants.cs
rename to SabreTools.Data.Models/MicrosoftCabinet/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MicrosoftCabinet/Enums.cs b/SabreTools.Data.Models/MicrosoftCabinet/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MicrosoftCabinet/Enums.cs
rename to SabreTools.Data.Models/MicrosoftCabinet/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/Archive.cs b/SabreTools.Data.Models/MoPaQ/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/Archive.cs
rename to SabreTools.Data.Models/MoPaQ/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/ArchiveHeader.cs b/SabreTools.Data.Models/MoPaQ/ArchiveHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/ArchiveHeader.cs
rename to SabreTools.Data.Models/MoPaQ/ArchiveHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/BetTable.cs b/SabreTools.Data.Models/MoPaQ/BetTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/BetTable.cs
rename to SabreTools.Data.Models/MoPaQ/BetTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/BlockEntry.cs b/SabreTools.Data.Models/MoPaQ/BlockEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/BlockEntry.cs
rename to SabreTools.Data.Models/MoPaQ/BlockEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/Constants.cs b/SabreTools.Data.Models/MoPaQ/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/Constants.cs
rename to SabreTools.Data.Models/MoPaQ/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/Enums.cs b/SabreTools.Data.Models/MoPaQ/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/Enums.cs
rename to SabreTools.Data.Models/MoPaQ/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/HashEntry.cs b/SabreTools.Data.Models/MoPaQ/HashEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/HashEntry.cs
rename to SabreTools.Data.Models/MoPaQ/HashEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/HetTable.cs b/SabreTools.Data.Models/MoPaQ/HetTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/HetTable.cs
rename to SabreTools.Data.Models/MoPaQ/HetTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/PatchHeader.cs b/SabreTools.Data.Models/MoPaQ/PatchHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/PatchHeader.cs
rename to SabreTools.Data.Models/MoPaQ/PatchHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/PatchInfo.cs b/SabreTools.Data.Models/MoPaQ/PatchInfo.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/PatchInfo.cs
rename to SabreTools.Data.Models/MoPaQ/PatchInfo.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/UserData.cs b/SabreTools.Data.Models/MoPaQ/UserData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/MoPaQ/UserData.cs
rename to SabreTools.Data.Models/MoPaQ/UserData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/ARM11KernelCapabilities.cs b/SabreTools.Data.Models/N3DS/ARM11KernelCapabilities.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/ARM11KernelCapabilities.cs
rename to SabreTools.Data.Models/N3DS/ARM11KernelCapabilities.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/ARM11LocalSystemCapabilities.cs b/SabreTools.Data.Models/N3DS/ARM11LocalSystemCapabilities.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/ARM11LocalSystemCapabilities.cs
rename to SabreTools.Data.Models/N3DS/ARM11LocalSystemCapabilities.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/ARM9AccessControl.cs b/SabreTools.Data.Models/N3DS/ARM9AccessControl.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/ARM9AccessControl.cs
rename to SabreTools.Data.Models/N3DS/ARM9AccessControl.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/AccessControlInfo.cs b/SabreTools.Data.Models/N3DS/AccessControlInfo.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/AccessControlInfo.cs
rename to SabreTools.Data.Models/N3DS/AccessControlInfo.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/CIA.cs b/SabreTools.Data.Models/N3DS/CIA.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/CIA.cs
rename to SabreTools.Data.Models/N3DS/CIA.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/CIAHeader.cs b/SabreTools.Data.Models/N3DS/CIAHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/CIAHeader.cs
rename to SabreTools.Data.Models/N3DS/CIAHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/CardInfoHeader.cs b/SabreTools.Data.Models/N3DS/CardInfoHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/CardInfoHeader.cs
rename to SabreTools.Data.Models/N3DS/CardInfoHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/Cart.cs b/SabreTools.Data.Models/N3DS/Cart.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/Cart.cs
rename to SabreTools.Data.Models/N3DS/Cart.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/Certificate.cs b/SabreTools.Data.Models/N3DS/Certificate.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/Certificate.cs
rename to SabreTools.Data.Models/N3DS/Certificate.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/CodeSetInfo.cs b/SabreTools.Data.Models/N3DS/CodeSetInfo.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/CodeSetInfo.cs
rename to SabreTools.Data.Models/N3DS/CodeSetInfo.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/Constants.cs b/SabreTools.Data.Models/N3DS/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/Constants.cs
rename to SabreTools.Data.Models/N3DS/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/ContentChunkRecord.cs b/SabreTools.Data.Models/N3DS/ContentChunkRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/ContentChunkRecord.cs
rename to SabreTools.Data.Models/N3DS/ContentChunkRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/ContentInfoRecord.cs b/SabreTools.Data.Models/N3DS/ContentInfoRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/ContentInfoRecord.cs
rename to SabreTools.Data.Models/N3DS/ContentInfoRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/DevelopmentCardInfoHeader.cs b/SabreTools.Data.Models/N3DS/DevelopmentCardInfoHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/DevelopmentCardInfoHeader.cs
rename to SabreTools.Data.Models/N3DS/DevelopmentCardInfoHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/Enums.cs b/SabreTools.Data.Models/N3DS/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/Enums.cs
rename to SabreTools.Data.Models/N3DS/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/ExeFSFileHeader.cs b/SabreTools.Data.Models/N3DS/ExeFSFileHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/ExeFSFileHeader.cs
rename to SabreTools.Data.Models/N3DS/ExeFSFileHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/ExeFSHeader.cs b/SabreTools.Data.Models/N3DS/ExeFSHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/ExeFSHeader.cs
rename to SabreTools.Data.Models/N3DS/ExeFSHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/InitialData.cs b/SabreTools.Data.Models/N3DS/InitialData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/InitialData.cs
rename to SabreTools.Data.Models/N3DS/InitialData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/MetaData.cs b/SabreTools.Data.Models/N3DS/MetaData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/MetaData.cs
rename to SabreTools.Data.Models/N3DS/MetaData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/NCCHExtendedHeader.cs b/SabreTools.Data.Models/N3DS/NCCHExtendedHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/NCCHExtendedHeader.cs
rename to SabreTools.Data.Models/N3DS/NCCHExtendedHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/NCCHHeader.cs b/SabreTools.Data.Models/N3DS/NCCHHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/NCCHHeader.cs
rename to SabreTools.Data.Models/N3DS/NCCHHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/NCCHHeaderFlags.cs b/SabreTools.Data.Models/N3DS/NCCHHeaderFlags.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/NCCHHeaderFlags.cs
rename to SabreTools.Data.Models/N3DS/NCCHHeaderFlags.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/NCSDHeader.cs b/SabreTools.Data.Models/N3DS/NCSDHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/NCSDHeader.cs
rename to SabreTools.Data.Models/N3DS/NCSDHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/PartitionTableEntry.cs b/SabreTools.Data.Models/N3DS/PartitionTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/PartitionTableEntry.cs
rename to SabreTools.Data.Models/N3DS/PartitionTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/RomFSHeader.cs b/SabreTools.Data.Models/N3DS/RomFSHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/RomFSHeader.cs
rename to SabreTools.Data.Models/N3DS/RomFSHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/StorageInfo.cs b/SabreTools.Data.Models/N3DS/StorageInfo.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/StorageInfo.cs
rename to SabreTools.Data.Models/N3DS/StorageInfo.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/SystemControlInfo.cs b/SabreTools.Data.Models/N3DS/SystemControlInfo.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/SystemControlInfo.cs
rename to SabreTools.Data.Models/N3DS/SystemControlInfo.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/SystemInfo.cs b/SabreTools.Data.Models/N3DS/SystemInfo.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/SystemInfo.cs
rename to SabreTools.Data.Models/N3DS/SystemInfo.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/TestData.cs b/SabreTools.Data.Models/N3DS/TestData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/TestData.cs
rename to SabreTools.Data.Models/N3DS/TestData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/Ticket.cs b/SabreTools.Data.Models/N3DS/Ticket.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/Ticket.cs
rename to SabreTools.Data.Models/N3DS/Ticket.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/N3DS/TitleMetadata.cs b/SabreTools.Data.Models/N3DS/TitleMetadata.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/N3DS/TitleMetadata.cs
rename to SabreTools.Data.Models/N3DS/TitleMetadata.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NCF/ChecksumEntry.cs b/SabreTools.Data.Models/NCF/ChecksumEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NCF/ChecksumEntry.cs
rename to SabreTools.Data.Models/NCF/ChecksumEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NCF/ChecksumHeader.cs b/SabreTools.Data.Models/NCF/ChecksumHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NCF/ChecksumHeader.cs
rename to SabreTools.Data.Models/NCF/ChecksumHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NCF/ChecksumMapEntry.cs b/SabreTools.Data.Models/NCF/ChecksumMapEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NCF/ChecksumMapEntry.cs
rename to SabreTools.Data.Models/NCF/ChecksumMapEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NCF/ChecksumMapHeader.cs b/SabreTools.Data.Models/NCF/ChecksumMapHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NCF/ChecksumMapHeader.cs
rename to SabreTools.Data.Models/NCF/ChecksumMapHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NCF/DirectoryCopyEntry.cs b/SabreTools.Data.Models/NCF/DirectoryCopyEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NCF/DirectoryCopyEntry.cs
rename to SabreTools.Data.Models/NCF/DirectoryCopyEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NCF/DirectoryEntry.cs b/SabreTools.Data.Models/NCF/DirectoryEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NCF/DirectoryEntry.cs
rename to SabreTools.Data.Models/NCF/DirectoryEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NCF/DirectoryHeader.cs b/SabreTools.Data.Models/NCF/DirectoryHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NCF/DirectoryHeader.cs
rename to SabreTools.Data.Models/NCF/DirectoryHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NCF/DirectoryInfo1Entry.cs b/SabreTools.Data.Models/NCF/DirectoryInfo1Entry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NCF/DirectoryInfo1Entry.cs
rename to SabreTools.Data.Models/NCF/DirectoryInfo1Entry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NCF/DirectoryInfo2Entry.cs b/SabreTools.Data.Models/NCF/DirectoryInfo2Entry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NCF/DirectoryInfo2Entry.cs
rename to SabreTools.Data.Models/NCF/DirectoryInfo2Entry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NCF/DirectoryLocalEntry.cs b/SabreTools.Data.Models/NCF/DirectoryLocalEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NCF/DirectoryLocalEntry.cs
rename to SabreTools.Data.Models/NCF/DirectoryLocalEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NCF/Enums.cs b/SabreTools.Data.Models/NCF/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NCF/Enums.cs
rename to SabreTools.Data.Models/NCF/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NCF/File.cs b/SabreTools.Data.Models/NCF/File.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NCF/File.cs
rename to SabreTools.Data.Models/NCF/File.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NCF/Header.cs b/SabreTools.Data.Models/NCF/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NCF/Header.cs
rename to SabreTools.Data.Models/NCF/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NCF/UnknownEntry.cs b/SabreTools.Data.Models/NCF/UnknownEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NCF/UnknownEntry.cs
rename to SabreTools.Data.Models/NCF/UnknownEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NCF/UnknownHeader.cs b/SabreTools.Data.Models/NCF/UnknownHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NCF/UnknownHeader.cs
rename to SabreTools.Data.Models/NCF/UnknownHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NES/Cart.cs b/SabreTools.Data.Models/NES/Cart.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NES/Cart.cs
rename to SabreTools.Data.Models/NES/Cart.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NES/CartHeader.cs b/SabreTools.Data.Models/NES/CartHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NES/CartHeader.cs
rename to SabreTools.Data.Models/NES/CartHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NES/CartHeader1.cs b/SabreTools.Data.Models/NES/CartHeader1.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NES/CartHeader1.cs
rename to SabreTools.Data.Models/NES/CartHeader1.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NES/CartHeader2.cs b/SabreTools.Data.Models/NES/CartHeader2.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NES/CartHeader2.cs
rename to SabreTools.Data.Models/NES/CartHeader2.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NES/Constants.cs b/SabreTools.Data.Models/NES/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NES/Constants.cs
rename to SabreTools.Data.Models/NES/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NES/Enums.cs b/SabreTools.Data.Models/NES/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NES/Enums.cs
rename to SabreTools.Data.Models/NES/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NES/FDS.cs b/SabreTools.Data.Models/NES/FDS.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NES/FDS.cs
rename to SabreTools.Data.Models/NES/FDS.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NES/FDSHeader.cs b/SabreTools.Data.Models/NES/FDSHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NES/FDSHeader.cs
rename to SabreTools.Data.Models/NES/FDSHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NES/QD.cs b/SabreTools.Data.Models/NES/QD.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NES/QD.cs
rename to SabreTools.Data.Models/NES/QD.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/Constants.cs b/SabreTools.Data.Models/NewExecutable/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/Constants.cs
rename to SabreTools.Data.Models/NewExecutable/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/EntryTableBundle.cs b/SabreTools.Data.Models/NewExecutable/EntryTableBundle.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/EntryTableBundle.cs
rename to SabreTools.Data.Models/NewExecutable/EntryTableBundle.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/Enums.cs b/SabreTools.Data.Models/NewExecutable/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/Enums.cs
rename to SabreTools.Data.Models/NewExecutable/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/Executable.cs b/SabreTools.Data.Models/NewExecutable/Executable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/Executable.cs
rename to SabreTools.Data.Models/NewExecutable/Executable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ExecutableHeader.cs b/SabreTools.Data.Models/NewExecutable/ExecutableHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ExecutableHeader.cs
rename to SabreTools.Data.Models/NewExecutable/ExecutableHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ImportNameRelocationRecord.cs b/SabreTools.Data.Models/NewExecutable/ImportNameRelocationRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ImportNameRelocationRecord.cs
rename to SabreTools.Data.Models/NewExecutable/ImportNameRelocationRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ImportOrdinalRelocationRecord.cs b/SabreTools.Data.Models/NewExecutable/ImportOrdinalRelocationRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ImportOrdinalRelocationRecord.cs
rename to SabreTools.Data.Models/NewExecutable/ImportOrdinalRelocationRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ImportedNameTableEntry.cs b/SabreTools.Data.Models/NewExecutable/ImportedNameTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ImportedNameTableEntry.cs
rename to SabreTools.Data.Models/NewExecutable/ImportedNameTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/InternalRefRelocationRecord.cs b/SabreTools.Data.Models/NewExecutable/InternalRefRelocationRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/InternalRefRelocationRecord.cs
rename to SabreTools.Data.Models/NewExecutable/InternalRefRelocationRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ModuleReferenceTableEntry.cs b/SabreTools.Data.Models/NewExecutable/ModuleReferenceTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ModuleReferenceTableEntry.cs
rename to SabreTools.Data.Models/NewExecutable/ModuleReferenceTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/NonResidentNameTableEntry.cs b/SabreTools.Data.Models/NewExecutable/NonResidentNameTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/NonResidentNameTableEntry.cs
rename to SabreTools.Data.Models/NewExecutable/NonResidentNameTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/OSFixupRelocationRecord.cs b/SabreTools.Data.Models/NewExecutable/OSFixupRelocationRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/OSFixupRelocationRecord.cs
rename to SabreTools.Data.Models/NewExecutable/OSFixupRelocationRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/PerSegmentData.cs b/SabreTools.Data.Models/NewExecutable/PerSegmentData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/PerSegmentData.cs
rename to SabreTools.Data.Models/NewExecutable/PerSegmentData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/RelocationRecord.cs b/SabreTools.Data.Models/NewExecutable/RelocationRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/RelocationRecord.cs
rename to SabreTools.Data.Models/NewExecutable/RelocationRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ResidentNameTableEntry.cs b/SabreTools.Data.Models/NewExecutable/ResidentNameTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ResidentNameTableEntry.cs
rename to SabreTools.Data.Models/NewExecutable/ResidentNameTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ResourceTable.cs b/SabreTools.Data.Models/NewExecutable/ResourceTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ResourceTable.cs
rename to SabreTools.Data.Models/NewExecutable/ResourceTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ResourceTypeAndNameString.cs b/SabreTools.Data.Models/NewExecutable/ResourceTypeAndNameString.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ResourceTypeAndNameString.cs
rename to SabreTools.Data.Models/NewExecutable/ResourceTypeAndNameString.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ResourceTypeInformationEntry.cs b/SabreTools.Data.Models/NewExecutable/ResourceTypeInformationEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ResourceTypeInformationEntry.cs
rename to SabreTools.Data.Models/NewExecutable/ResourceTypeInformationEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ResourceTypeResourceEntry.cs b/SabreTools.Data.Models/NewExecutable/ResourceTypeResourceEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/ResourceTypeResourceEntry.cs
rename to SabreTools.Data.Models/NewExecutable/ResourceTypeResourceEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/SegmentTableEntry.cs b/SabreTools.Data.Models/NewExecutable/SegmentTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NewExecutable/SegmentTableEntry.cs
rename to SabreTools.Data.Models/NewExecutable/SegmentTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Nitro/Cart.cs b/SabreTools.Data.Models/Nitro/Cart.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Nitro/Cart.cs
rename to SabreTools.Data.Models/Nitro/Cart.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Nitro/CommonHeader.cs b/SabreTools.Data.Models/Nitro/CommonHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Nitro/CommonHeader.cs
rename to SabreTools.Data.Models/Nitro/CommonHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Nitro/Constants.cs b/SabreTools.Data.Models/Nitro/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Nitro/Constants.cs
rename to SabreTools.Data.Models/Nitro/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Nitro/Enums.cs b/SabreTools.Data.Models/Nitro/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Nitro/Enums.cs
rename to SabreTools.Data.Models/Nitro/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Nitro/ExtendedDSiHeader.cs b/SabreTools.Data.Models/Nitro/ExtendedDSiHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Nitro/ExtendedDSiHeader.cs
rename to SabreTools.Data.Models/Nitro/ExtendedDSiHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Nitro/FileAllocationTableEntry.cs b/SabreTools.Data.Models/Nitro/FileAllocationTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Nitro/FileAllocationTableEntry.cs
rename to SabreTools.Data.Models/Nitro/FileAllocationTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Nitro/FolderAllocationTableEntry.cs b/SabreTools.Data.Models/Nitro/FolderAllocationTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Nitro/FolderAllocationTableEntry.cs
rename to SabreTools.Data.Models/Nitro/FolderAllocationTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Nitro/NameListEntry.cs b/SabreTools.Data.Models/Nitro/NameListEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Nitro/NameListEntry.cs
rename to SabreTools.Data.Models/Nitro/NameListEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Nitro/NameTable.cs b/SabreTools.Data.Models/Nitro/NameTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Nitro/NameTable.cs
rename to SabreTools.Data.Models/Nitro/NameTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/NoFilterAttribute.cs b/SabreTools.Data.Models/NoFilterAttribute.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/NoFilterAttribute.cs
rename to SabreTools.Data.Models/NoFilterAttribute.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/ArrayDimension.cs b/SabreTools.Data.Models/OLE/ArrayDimension.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/ArrayDimension.cs
rename to SabreTools.Data.Models/OLE/ArrayDimension.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/ArrayHeader.cs b/SabreTools.Data.Models/OLE/ArrayHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/ArrayHeader.cs
rename to SabreTools.Data.Models/OLE/ArrayHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/BLOB.cs b/SabreTools.Data.Models/OLE/BLOB.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/BLOB.cs
rename to SabreTools.Data.Models/OLE/BLOB.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/CURRENCY.cs b/SabreTools.Data.Models/OLE/CURRENCY.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/CURRENCY.cs
rename to SabreTools.Data.Models/OLE/CURRENCY.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/ClipboardData.cs b/SabreTools.Data.Models/OLE/ClipboardData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/ClipboardData.cs
rename to SabreTools.Data.Models/OLE/ClipboardData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/CodePageString.cs b/SabreTools.Data.Models/OLE/CodePageString.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/CodePageString.cs
rename to SabreTools.Data.Models/OLE/CodePageString.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/Constants.cs b/SabreTools.Data.Models/OLE/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/Constants.cs
rename to SabreTools.Data.Models/OLE/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/ControlStream.cs b/SabreTools.Data.Models/OLE/ControlStream.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/ControlStream.cs
rename to SabreTools.Data.Models/OLE/ControlStream.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/DATE.cs b/SabreTools.Data.Models/OLE/DATE.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/DATE.cs
rename to SabreTools.Data.Models/OLE/DATE.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/DECIMAL.cs b/SabreTools.Data.Models/OLE/DECIMAL.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/DECIMAL.cs
rename to SabreTools.Data.Models/OLE/DECIMAL.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/Dictionary.cs b/SabreTools.Data.Models/OLE/Dictionary.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/Dictionary.cs
rename to SabreTools.Data.Models/OLE/Dictionary.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/DictionaryEntry.cs b/SabreTools.Data.Models/OLE/DictionaryEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/DictionaryEntry.cs
rename to SabreTools.Data.Models/OLE/DictionaryEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/Enums.cs b/SabreTools.Data.Models/OLE/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/Enums.cs
rename to SabreTools.Data.Models/OLE/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/FILETIME.cs b/SabreTools.Data.Models/OLE/FILETIME.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/FILETIME.cs
rename to SabreTools.Data.Models/OLE/FILETIME.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/GUID.cs b/SabreTools.Data.Models/OLE/GUID.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/GUID.cs
rename to SabreTools.Data.Models/OLE/GUID.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/IndirectPropertyName.cs b/SabreTools.Data.Models/OLE/IndirectPropertyName.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/IndirectPropertyName.cs
rename to SabreTools.Data.Models/OLE/IndirectPropertyName.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/PropertyIdentifierAndOffset.cs b/SabreTools.Data.Models/OLE/PropertyIdentifierAndOffset.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/PropertyIdentifierAndOffset.cs
rename to SabreTools.Data.Models/OLE/PropertyIdentifierAndOffset.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/PropertySet.cs b/SabreTools.Data.Models/OLE/PropertySet.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/PropertySet.cs
rename to SabreTools.Data.Models/OLE/PropertySet.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/PropertySetStream.cs b/SabreTools.Data.Models/OLE/PropertySetStream.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/PropertySetStream.cs
rename to SabreTools.Data.Models/OLE/PropertySetStream.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/TypedPropertyValue.cs b/SabreTools.Data.Models/OLE/TypedPropertyValue.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/TypedPropertyValue.cs
rename to SabreTools.Data.Models/OLE/TypedPropertyValue.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/UnicodeString.cs b/SabreTools.Data.Models/OLE/UnicodeString.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/UnicodeString.cs
rename to SabreTools.Data.Models/OLE/UnicodeString.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/VectorHeader.cs b/SabreTools.Data.Models/OLE/VectorHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/VectorHeader.cs
rename to SabreTools.Data.Models/OLE/VectorHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OLE/VersionedStream.cs b/SabreTools.Data.Models/OLE/VersionedStream.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OLE/VersionedStream.cs
rename to SabreTools.Data.Models/OLE/VersionedStream.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/CanOpen.cs b/SabreTools.Data.Models/OfflineList/CanOpen.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/CanOpen.cs
rename to SabreTools.Data.Models/OfflineList/CanOpen.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Configuration.cs b/SabreTools.Data.Models/OfflineList/Configuration.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Configuration.cs
rename to SabreTools.Data.Models/OfflineList/Configuration.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Dat.cs b/SabreTools.Data.Models/OfflineList/Dat.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Dat.cs
rename to SabreTools.Data.Models/OfflineList/Dat.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/DatUrl.cs b/SabreTools.Data.Models/OfflineList/DatUrl.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/DatUrl.cs
rename to SabreTools.Data.Models/OfflineList/DatUrl.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/FileRomCRC.cs b/SabreTools.Data.Models/OfflineList/FileRomCRC.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/FileRomCRC.cs
rename to SabreTools.Data.Models/OfflineList/FileRomCRC.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Files.cs b/SabreTools.Data.Models/OfflineList/Files.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Files.cs
rename to SabreTools.Data.Models/OfflineList/Files.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Find.cs b/SabreTools.Data.Models/OfflineList/Find.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Find.cs
rename to SabreTools.Data.Models/OfflineList/Find.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/GUI.cs b/SabreTools.Data.Models/OfflineList/GUI.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/GUI.cs
rename to SabreTools.Data.Models/OfflineList/GUI.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Game.cs b/SabreTools.Data.Models/OfflineList/Game.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Game.cs
rename to SabreTools.Data.Models/OfflineList/Game.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Games.cs b/SabreTools.Data.Models/OfflineList/Games.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Games.cs
rename to SabreTools.Data.Models/OfflineList/Games.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Image.cs b/SabreTools.Data.Models/OfflineList/Image.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Image.cs
rename to SabreTools.Data.Models/OfflineList/Image.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Images.cs b/SabreTools.Data.Models/OfflineList/Images.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Images.cs
rename to SabreTools.Data.Models/OfflineList/Images.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/InfoBase.cs b/SabreTools.Data.Models/OfflineList/InfoBase.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/InfoBase.cs
rename to SabreTools.Data.Models/OfflineList/InfoBase.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Infos.cs b/SabreTools.Data.Models/OfflineList/Infos.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Infos.cs
rename to SabreTools.Data.Models/OfflineList/Infos.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/NewDat.cs b/SabreTools.Data.Models/OfflineList/NewDat.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/NewDat.cs
rename to SabreTools.Data.Models/OfflineList/NewDat.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Search.cs b/SabreTools.Data.Models/OfflineList/Search.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/Search.cs
rename to SabreTools.Data.Models/OfflineList/Search.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OfflineList/To.cs b/SabreTools.Data.Models/OfflineList/To.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OfflineList/To.cs
rename to SabreTools.Data.Models/OfflineList/To.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/Dump.cs b/SabreTools.Data.Models/OpenMSX/Dump.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/Dump.cs
rename to SabreTools.Data.Models/OpenMSX/Dump.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/MegaRom.cs b/SabreTools.Data.Models/OpenMSX/MegaRom.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/MegaRom.cs
rename to SabreTools.Data.Models/OpenMSX/MegaRom.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/Original.cs b/SabreTools.Data.Models/OpenMSX/Original.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/Original.cs
rename to SabreTools.Data.Models/OpenMSX/Original.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/Rom.cs b/SabreTools.Data.Models/OpenMSX/Rom.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/Rom.cs
rename to SabreTools.Data.Models/OpenMSX/Rom.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/RomBase.cs b/SabreTools.Data.Models/OpenMSX/RomBase.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/RomBase.cs
rename to SabreTools.Data.Models/OpenMSX/RomBase.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/SCCPlusCart.cs b/SabreTools.Data.Models/OpenMSX/SCCPlusCart.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/SCCPlusCart.cs
rename to SabreTools.Data.Models/OpenMSX/SCCPlusCart.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/Software.cs b/SabreTools.Data.Models/OpenMSX/Software.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/Software.cs
rename to SabreTools.Data.Models/OpenMSX/Software.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/SoftwareDb.cs b/SabreTools.Data.Models/OpenMSX/SoftwareDb.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/OpenMSX/SoftwareDb.cs
rename to SabreTools.Data.Models/OpenMSX/SoftwareDb.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PAK/Constants.cs b/SabreTools.Data.Models/PAK/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PAK/Constants.cs
rename to SabreTools.Data.Models/PAK/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PAK/DirectoryItem.cs b/SabreTools.Data.Models/PAK/DirectoryItem.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PAK/DirectoryItem.cs
rename to SabreTools.Data.Models/PAK/DirectoryItem.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PAK/File.cs b/SabreTools.Data.Models/PAK/File.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PAK/File.cs
rename to SabreTools.Data.Models/PAK/File.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PAK/Header.cs b/SabreTools.Data.Models/PAK/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PAK/Header.cs
rename to SabreTools.Data.Models/PAK/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PFF/Archive.cs b/SabreTools.Data.Models/PFF/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PFF/Archive.cs
rename to SabreTools.Data.Models/PFF/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PFF/Constants.cs b/SabreTools.Data.Models/PFF/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PFF/Constants.cs
rename to SabreTools.Data.Models/PFF/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PFF/Footer.cs b/SabreTools.Data.Models/PFF/Footer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PFF/Footer.cs
rename to SabreTools.Data.Models/PFF/Footer.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PFF/Header.cs b/SabreTools.Data.Models/PFF/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PFF/Header.cs
rename to SabreTools.Data.Models/PFF/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PFF/Segment.cs b/SabreTools.Data.Models/PFF/Segment.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PFF/Segment.cs
rename to SabreTools.Data.Models/PFF/Segment.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PIC/Constants.cs b/SabreTools.Data.Models/PIC/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PIC/Constants.cs
rename to SabreTools.Data.Models/PIC/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PIC/DiscInformation.cs b/SabreTools.Data.Models/PIC/DiscInformation.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PIC/DiscInformation.cs
rename to SabreTools.Data.Models/PIC/DiscInformation.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PIC/DiscInformationUnit.cs b/SabreTools.Data.Models/PIC/DiscInformationUnit.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PIC/DiscInformationUnit.cs
rename to SabreTools.Data.Models/PIC/DiscInformationUnit.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PIC/DiscInformationUnitBody.cs b/SabreTools.Data.Models/PIC/DiscInformationUnitBody.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PIC/DiscInformationUnitBody.cs
rename to SabreTools.Data.Models/PIC/DiscInformationUnitBody.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PIC/DiscInformationUnitHeader.cs b/SabreTools.Data.Models/PIC/DiscInformationUnitHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PIC/DiscInformationUnitHeader.cs
rename to SabreTools.Data.Models/PIC/DiscInformationUnitHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PIC/DiscInformationUnitTrailer.cs b/SabreTools.Data.Models/PIC/DiscInformationUnitTrailer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PIC/DiscInformationUnitTrailer.cs
rename to SabreTools.Data.Models/PIC/DiscInformationUnitTrailer.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/AS400ExtraFieldAttribute.cs b/SabreTools.Data.Models/PKZIP/AS400ExtraFieldAttribute.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/AS400ExtraFieldAttribute.cs
rename to SabreTools.Data.Models/PKZIP/AS400ExtraFieldAttribute.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/AesEncryptionStructure.cs b/SabreTools.Data.Models/PKZIP/AesEncryptionStructure.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/AesEncryptionStructure.cs
rename to SabreTools.Data.Models/PKZIP/AesEncryptionStructure.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/Archive.cs b/SabreTools.Data.Models/PKZIP/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/Archive.cs
rename to SabreTools.Data.Models/PKZIP/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/ArchiveExtraDataRecord.cs b/SabreTools.Data.Models/PKZIP/ArchiveExtraDataRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/ArchiveExtraDataRecord.cs
rename to SabreTools.Data.Models/PKZIP/ArchiveExtraDataRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/CentralDirectoryFileHeader.cs b/SabreTools.Data.Models/PKZIP/CentralDirectoryFileHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/CentralDirectoryFileHeader.cs
rename to SabreTools.Data.Models/PKZIP/CentralDirectoryFileHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/Constants.cs b/SabreTools.Data.Models/PKZIP/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/Constants.cs
rename to SabreTools.Data.Models/PKZIP/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/DataDescriptor.cs b/SabreTools.Data.Models/PKZIP/DataDescriptor.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/DataDescriptor.cs
rename to SabreTools.Data.Models/PKZIP/DataDescriptor.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/DataDescriptor64.cs b/SabreTools.Data.Models/PKZIP/DataDescriptor64.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/DataDescriptor64.cs
rename to SabreTools.Data.Models/PKZIP/DataDescriptor64.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/DataStreamAlignment.cs b/SabreTools.Data.Models/PKZIP/DataStreamAlignment.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/DataStreamAlignment.cs
rename to SabreTools.Data.Models/PKZIP/DataStreamAlignment.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/DigitalSignature.cs b/SabreTools.Data.Models/PKZIP/DigitalSignature.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/DigitalSignature.cs
rename to SabreTools.Data.Models/PKZIP/DigitalSignature.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/EndOfCentralDirectoryLocator64.cs b/SabreTools.Data.Models/PKZIP/EndOfCentralDirectoryLocator64.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/EndOfCentralDirectoryLocator64.cs
rename to SabreTools.Data.Models/PKZIP/EndOfCentralDirectoryLocator64.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/EndOfCentralDirectoryRecord.cs b/SabreTools.Data.Models/PKZIP/EndOfCentralDirectoryRecord.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/EndOfCentralDirectoryRecord.cs
rename to SabreTools.Data.Models/PKZIP/EndOfCentralDirectoryRecord.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/EndOfCentralDirectoryRecord64.cs b/SabreTools.Data.Models/PKZIP/EndOfCentralDirectoryRecord64.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/EndOfCentralDirectoryRecord64.cs
rename to SabreTools.Data.Models/PKZIP/EndOfCentralDirectoryRecord64.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/Enums.cs b/SabreTools.Data.Models/PKZIP/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/Enums.cs
rename to SabreTools.Data.Models/PKZIP/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/ExtendedTimestampExtraField.cs b/SabreTools.Data.Models/PKZIP/ExtendedTimestampExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/ExtendedTimestampExtraField.cs
rename to SabreTools.Data.Models/PKZIP/ExtendedTimestampExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/ExtensibleDataField.cs b/SabreTools.Data.Models/PKZIP/ExtensibleDataField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/ExtensibleDataField.cs
rename to SabreTools.Data.Models/PKZIP/ExtensibleDataField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/FWKCSMD5ExtraField.cs b/SabreTools.Data.Models/PKZIP/FWKCSMD5ExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/FWKCSMD5ExtraField.cs
rename to SabreTools.Data.Models/PKZIP/FWKCSMD5ExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/InfoZIPUnicodeCommentExtraField.cs b/SabreTools.Data.Models/PKZIP/InfoZIPUnicodeCommentExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/InfoZIPUnicodeCommentExtraField.cs
rename to SabreTools.Data.Models/PKZIP/InfoZIPUnicodeCommentExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/InfoZIPUnicodePathExtraField.cs b/SabreTools.Data.Models/PKZIP/InfoZIPUnicodePathExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/InfoZIPUnicodePathExtraField.cs
rename to SabreTools.Data.Models/PKZIP/InfoZIPUnicodePathExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/KeyProviderRecordExtraField.cs b/SabreTools.Data.Models/PKZIP/KeyProviderRecordExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/KeyProviderRecordExtraField.cs
rename to SabreTools.Data.Models/PKZIP/KeyProviderRecordExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/LocalFile.cs b/SabreTools.Data.Models/PKZIP/LocalFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/LocalFile.cs
rename to SabreTools.Data.Models/PKZIP/LocalFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/LocalFileHeader.cs b/SabreTools.Data.Models/PKZIP/LocalFileHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/LocalFileHeader.cs
rename to SabreTools.Data.Models/PKZIP/LocalFileHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/MVSExtraField.cs b/SabreTools.Data.Models/PKZIP/MVSExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/MVSExtraField.cs
rename to SabreTools.Data.Models/PKZIP/MVSExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/MicrosoftOpenPackagingGrowthHint.cs b/SabreTools.Data.Models/PKZIP/MicrosoftOpenPackagingGrowthHint.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/MicrosoftOpenPackagingGrowthHint.cs
rename to SabreTools.Data.Models/PKZIP/MicrosoftOpenPackagingGrowthHint.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/NTFSExtraField.cs b/SabreTools.Data.Models/PKZIP/NTFSExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/NTFSExtraField.cs
rename to SabreTools.Data.Models/PKZIP/NTFSExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/OS2ExtraField.cs b/SabreTools.Data.Models/PKZIP/OS2ExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/OS2ExtraField.cs
rename to SabreTools.Data.Models/PKZIP/OS2ExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/OS400ExtraField.cs b/SabreTools.Data.Models/PKZIP/OS400ExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/OS400ExtraField.cs
rename to SabreTools.Data.Models/PKZIP/OS400ExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/OpenVMSExtraField.cs b/SabreTools.Data.Models/PKZIP/OpenVMSExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/OpenVMSExtraField.cs
rename to SabreTools.Data.Models/PKZIP/OpenVMSExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/PKCS7EncryptionRecipientCertificateList.cs b/SabreTools.Data.Models/PKZIP/PKCS7EncryptionRecipientCertificateList.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/PKCS7EncryptionRecipientCertificateList.cs
rename to SabreTools.Data.Models/PKZIP/PKCS7EncryptionRecipientCertificateList.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/PKCS7Store.cs b/SabreTools.Data.Models/PKZIP/PKCS7Store.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/PKCS7Store.cs
rename to SabreTools.Data.Models/PKZIP/PKCS7Store.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/PatchDescriptorExtraField.cs b/SabreTools.Data.Models/PKZIP/PatchDescriptorExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/PatchDescriptorExtraField.cs
rename to SabreTools.Data.Models/PKZIP/PatchDescriptorExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/PolicyDecryptionKeyRecordExtraField.cs b/SabreTools.Data.Models/PKZIP/PolicyDecryptionKeyRecordExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/PolicyDecryptionKeyRecordExtraField.cs
rename to SabreTools.Data.Models/PKZIP/PolicyDecryptionKeyRecordExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/PolicyKeyDataRecordRecordExtraField.cs b/SabreTools.Data.Models/PKZIP/PolicyKeyDataRecordRecordExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/PolicyKeyDataRecordRecordExtraField.cs
rename to SabreTools.Data.Models/PKZIP/PolicyKeyDataRecordRecordExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/RecordManagementControls.cs b/SabreTools.Data.Models/PKZIP/RecordManagementControls.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/RecordManagementControls.cs
rename to SabreTools.Data.Models/PKZIP/RecordManagementControls.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/SpecialPurposeDataHeader.cs b/SabreTools.Data.Models/PKZIP/SpecialPurposeDataHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/SpecialPurposeDataHeader.cs
rename to SabreTools.Data.Models/PKZIP/SpecialPurposeDataHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/StrongEncryptionHeader.cs b/SabreTools.Data.Models/PKZIP/StrongEncryptionHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/StrongEncryptionHeader.cs
rename to SabreTools.Data.Models/PKZIP/StrongEncryptionHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/TagSizeVar.cs b/SabreTools.Data.Models/PKZIP/TagSizeVar.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/TagSizeVar.cs
rename to SabreTools.Data.Models/PKZIP/TagSizeVar.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/UnixExtraField.cs b/SabreTools.Data.Models/PKZIP/UnixExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/UnixExtraField.cs
rename to SabreTools.Data.Models/PKZIP/UnixExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/UnknownExtraField.cs b/SabreTools.Data.Models/PKZIP/UnknownExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/UnknownExtraField.cs
rename to SabreTools.Data.Models/PKZIP/UnknownExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/X509CentralDirectory.cs b/SabreTools.Data.Models/PKZIP/X509CentralDirectory.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/X509CentralDirectory.cs
rename to SabreTools.Data.Models/PKZIP/X509CentralDirectory.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/X509IndividualFile.cs b/SabreTools.Data.Models/PKZIP/X509IndividualFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/X509IndividualFile.cs
rename to SabreTools.Data.Models/PKZIP/X509IndividualFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/ZOSExtraFieldAttribute.cs b/SabreTools.Data.Models/PKZIP/ZOSExtraFieldAttribute.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/ZOSExtraFieldAttribute.cs
rename to SabreTools.Data.Models/PKZIP/ZOSExtraFieldAttribute.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/Zip64ExtendedInformationExtraField.cs b/SabreTools.Data.Models/PKZIP/Zip64ExtendedInformationExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/Zip64ExtendedInformationExtraField.cs
rename to SabreTools.Data.Models/PKZIP/Zip64ExtendedInformationExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/ZipItMacintoshExtraField.cs b/SabreTools.Data.Models/PKZIP/ZipItMacintoshExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/ZipItMacintoshExtraField.cs
rename to SabreTools.Data.Models/PKZIP/ZipItMacintoshExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/ZipItMacintoshShortDirectoryExtraField.cs b/SabreTools.Data.Models/PKZIP/ZipItMacintoshShortDirectoryExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/ZipItMacintoshShortDirectoryExtraField.cs
rename to SabreTools.Data.Models/PKZIP/ZipItMacintoshShortDirectoryExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PKZIP/ZipItMacintoshShortFileExtraField.cs b/SabreTools.Data.Models/PKZIP/ZipItMacintoshShortFileExtraField.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PKZIP/ZipItMacintoshShortFileExtraField.cs
rename to SabreTools.Data.Models/PKZIP/ZipItMacintoshShortFileExtraField.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayJ/AudioFile.cs b/SabreTools.Data.Models/PlayJ/AudioFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayJ/AudioFile.cs
rename to SabreTools.Data.Models/PlayJ/AudioFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayJ/AudioHeader.cs b/SabreTools.Data.Models/PlayJ/AudioHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayJ/AudioHeader.cs
rename to SabreTools.Data.Models/PlayJ/AudioHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayJ/AudioHeaderV1.cs b/SabreTools.Data.Models/PlayJ/AudioHeaderV1.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayJ/AudioHeaderV1.cs
rename to SabreTools.Data.Models/PlayJ/AudioHeaderV1.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayJ/AudioHeaderV2.cs b/SabreTools.Data.Models/PlayJ/AudioHeaderV2.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayJ/AudioHeaderV2.cs
rename to SabreTools.Data.Models/PlayJ/AudioHeaderV2.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayJ/Constants.cs b/SabreTools.Data.Models/PlayJ/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayJ/Constants.cs
rename to SabreTools.Data.Models/PlayJ/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayJ/DataFile.cs b/SabreTools.Data.Models/PlayJ/DataFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayJ/DataFile.cs
rename to SabreTools.Data.Models/PlayJ/DataFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayJ/Enums.cs b/SabreTools.Data.Models/PlayJ/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayJ/Enums.cs
rename to SabreTools.Data.Models/PlayJ/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayJ/Playlist.cs b/SabreTools.Data.Models/PlayJ/Playlist.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayJ/Playlist.cs
rename to SabreTools.Data.Models/PlayJ/Playlist.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayJ/PlaylistHeader.cs b/SabreTools.Data.Models/PlayJ/PlaylistHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayJ/PlaylistHeader.cs
rename to SabreTools.Data.Models/PlayJ/PlaylistHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayJ/UnknownBlock1.cs b/SabreTools.Data.Models/PlayJ/UnknownBlock1.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayJ/UnknownBlock1.cs
rename to SabreTools.Data.Models/PlayJ/UnknownBlock1.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayJ/UnknownBlock3.cs b/SabreTools.Data.Models/PlayJ/UnknownBlock3.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayJ/UnknownBlock3.cs
rename to SabreTools.Data.Models/PlayJ/UnknownBlock3.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayStation3/Constants.cs b/SabreTools.Data.Models/PlayStation3/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayStation3/Constants.cs
rename to SabreTools.Data.Models/PlayStation3/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayStation3/Enums.cs b/SabreTools.Data.Models/PlayStation3/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayStation3/Enums.cs
rename to SabreTools.Data.Models/PlayStation3/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayStation3/SFB.cs b/SabreTools.Data.Models/PlayStation3/SFB.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayStation3/SFB.cs
rename to SabreTools.Data.Models/PlayStation3/SFB.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayStation3/SFO.cs b/SabreTools.Data.Models/PlayStation3/SFO.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayStation3/SFO.cs
rename to SabreTools.Data.Models/PlayStation3/SFO.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayStation3/SFOHeader.cs b/SabreTools.Data.Models/PlayStation3/SFOHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayStation3/SFOHeader.cs
rename to SabreTools.Data.Models/PlayStation3/SFOHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayStation3/SFOIndexTableEntry.cs b/SabreTools.Data.Models/PlayStation3/SFOIndexTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayStation3/SFOIndexTableEntry.cs
rename to SabreTools.Data.Models/PlayStation3/SFOIndexTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayStation4/AppPkgHeader.cs b/SabreTools.Data.Models/PlayStation4/AppPkgHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayStation4/AppPkgHeader.cs
rename to SabreTools.Data.Models/PlayStation4/AppPkgHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PlayStation4/Constants.cs b/SabreTools.Data.Models/PlayStation4/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PlayStation4/Constants.cs
rename to SabreTools.Data.Models/PlayStation4/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/AttributeCertificate/Entry.cs b/SabreTools.Data.Models/PortableExecutable/AttributeCertificate/Entry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/AttributeCertificate/Entry.cs
rename to SabreTools.Data.Models/PortableExecutable/AttributeCertificate/Entry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/BaseRelocation/Block.cs b/SabreTools.Data.Models/PortableExecutable/BaseRelocation/Block.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/BaseRelocation/Block.cs
rename to SabreTools.Data.Models/PortableExecutable/BaseRelocation/Block.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/BaseRelocation/TypeOffsetFieldEntry.cs b/SabreTools.Data.Models/PortableExecutable/BaseRelocation/TypeOffsetFieldEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/BaseRelocation/TypeOffsetFieldEntry.cs
rename to SabreTools.Data.Models/PortableExecutable/BaseRelocation/TypeOffsetFieldEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Constants.cs b/SabreTools.Data.Models/PortableExecutable/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Constants.cs
rename to SabreTools.Data.Models/PortableExecutable/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/DataDirectory.cs b/SabreTools.Data.Models/PortableExecutable/DataDirectory.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/DataDirectory.cs
rename to SabreTools.Data.Models/PortableExecutable/DataDirectory.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/DebugData/Entry.cs b/SabreTools.Data.Models/PortableExecutable/DebugData/Entry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/DebugData/Entry.cs
rename to SabreTools.Data.Models/PortableExecutable/DebugData/Entry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/DebugData/NB10ProgramDatabase.cs b/SabreTools.Data.Models/PortableExecutable/DebugData/NB10ProgramDatabase.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/DebugData/NB10ProgramDatabase.cs
rename to SabreTools.Data.Models/PortableExecutable/DebugData/NB10ProgramDatabase.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/DebugData/RSDSProgramDatabase.cs b/SabreTools.Data.Models/PortableExecutable/DebugData/RSDSProgramDatabase.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/DebugData/RSDSProgramDatabase.cs
rename to SabreTools.Data.Models/PortableExecutable/DebugData/RSDSProgramDatabase.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/DebugData/Table.cs b/SabreTools.Data.Models/PortableExecutable/DebugData/Table.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/DebugData/Table.cs
rename to SabreTools.Data.Models/PortableExecutable/DebugData/Table.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/DelayLoad/DirectoryTable.cs b/SabreTools.Data.Models/PortableExecutable/DelayLoad/DirectoryTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/DelayLoad/DirectoryTable.cs
rename to SabreTools.Data.Models/PortableExecutable/DelayLoad/DirectoryTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Enums.cs b/SabreTools.Data.Models/PortableExecutable/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Enums.cs
rename to SabreTools.Data.Models/PortableExecutable/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Executable.cs b/SabreTools.Data.Models/PortableExecutable/Executable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Executable.cs
rename to SabreTools.Data.Models/PortableExecutable/Executable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Export/AddressTableEntry.cs b/SabreTools.Data.Models/PortableExecutable/Export/AddressTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Export/AddressTableEntry.cs
rename to SabreTools.Data.Models/PortableExecutable/Export/AddressTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Export/DirectoryTable.cs b/SabreTools.Data.Models/PortableExecutable/Export/DirectoryTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Export/DirectoryTable.cs
rename to SabreTools.Data.Models/PortableExecutable/Export/DirectoryTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Export/NamePointerTable.cs b/SabreTools.Data.Models/PortableExecutable/Export/NamePointerTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Export/NamePointerTable.cs
rename to SabreTools.Data.Models/PortableExecutable/Export/NamePointerTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Export/NameTable.cs b/SabreTools.Data.Models/PortableExecutable/Export/NameTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Export/NameTable.cs
rename to SabreTools.Data.Models/PortableExecutable/Export/NameTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Export/OrdinalTable.cs b/SabreTools.Data.Models/PortableExecutable/Export/OrdinalTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Export/OrdinalTable.cs
rename to SabreTools.Data.Models/PortableExecutable/Export/OrdinalTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Import/AddressTableEntry.cs b/SabreTools.Data.Models/PortableExecutable/Import/AddressTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Import/AddressTableEntry.cs
rename to SabreTools.Data.Models/PortableExecutable/Import/AddressTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Import/DirectoryTableEntry.cs b/SabreTools.Data.Models/PortableExecutable/Import/DirectoryTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Import/DirectoryTableEntry.cs
rename to SabreTools.Data.Models/PortableExecutable/Import/DirectoryTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Import/HintNameTableEntry.cs b/SabreTools.Data.Models/PortableExecutable/Import/HintNameTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Import/HintNameTableEntry.cs
rename to SabreTools.Data.Models/PortableExecutable/Import/HintNameTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Import/LookupTableEntry.cs b/SabreTools.Data.Models/PortableExecutable/Import/LookupTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Import/LookupTableEntry.cs
rename to SabreTools.Data.Models/PortableExecutable/Import/LookupTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/LoadConfiguration/Directory.cs b/SabreTools.Data.Models/PortableExecutable/LoadConfiguration/Directory.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/LoadConfiguration/Directory.cs
rename to SabreTools.Data.Models/PortableExecutable/LoadConfiguration/Directory.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/OptionalHeader.cs b/SabreTools.Data.Models/PortableExecutable/OptionalHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/OptionalHeader.cs
rename to SabreTools.Data.Models/PortableExecutable/OptionalHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/DataEntry.cs b/SabreTools.Data.Models/PortableExecutable/Resource/DataEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/DataEntry.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/DataEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/DirectoryEntry.cs b/SabreTools.Data.Models/PortableExecutable/Resource/DirectoryEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/DirectoryEntry.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/DirectoryEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/DirectoryString.cs b/SabreTools.Data.Models/PortableExecutable/Resource/DirectoryString.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/DirectoryString.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/DirectoryString.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/DirectoryTable.cs b/SabreTools.Data.Models/PortableExecutable/Resource/DirectoryTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/DirectoryTable.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/DirectoryTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/AcceleratorTable.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/AcceleratorTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/AcceleratorTable.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/AcceleratorTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/AcceleratorTableEntry.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/AcceleratorTableEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/AcceleratorTableEntry.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/AcceleratorTableEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/AssemblyManifest.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/AssemblyManifest.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/AssemblyManifest.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/AssemblyManifest.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/CursorAndIconResource.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/CursorAndIconResource.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/CursorAndIconResource.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/CursorAndIconResource.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogBoxResource.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogBoxResource.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogBoxResource.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogBoxResource.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogItemTemplate.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogItemTemplate.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogItemTemplate.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogItemTemplate.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogItemTemplateExtended.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogItemTemplateExtended.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogItemTemplateExtended.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogItemTemplateExtended.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogTemplate.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogTemplate.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogTemplate.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogTemplate.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogTemplateExtended.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogTemplateExtended.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogTemplateExtended.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/DialogTemplateExtended.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DirEntry.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DirEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/DirEntry.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/DirEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/FixedFileInfo.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/FixedFileInfo.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/FixedFileInfo.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/FixedFileInfo.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/FontDirEntry.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/FontDirEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/FontDirEntry.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/FontDirEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/FontGroupHeader.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/FontGroupHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/FontGroupHeader.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/FontGroupHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/GenericResourceEntry.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/GenericResourceEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/GenericResourceEntry.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/GenericResourceEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuHeader.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuHeader.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuHeaderExtended.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuHeaderExtended.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuHeaderExtended.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuHeaderExtended.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuItem.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuItem.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuItem.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuItem.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuItemExtended.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuItemExtended.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuItemExtended.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuItemExtended.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuResource.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuResource.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuResource.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/MenuResource.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MessageResourceBlock.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MessageResourceBlock.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MessageResourceBlock.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/MessageResourceBlock.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MessageResourceData.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MessageResourceData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MessageResourceData.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/MessageResourceData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MessageResourceEntry.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MessageResourceEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/MessageResourceEntry.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/MessageResourceEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/NewHeader.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/NewHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/NewHeader.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/NewHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/NormalMenuHeader.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/NormalMenuHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/NormalMenuHeader.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/NormalMenuHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/NormalMenuItem.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/NormalMenuItem.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/NormalMenuItem.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/NormalMenuItem.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/PopupMenuItem.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/PopupMenuItem.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/PopupMenuItem.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/PopupMenuItem.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/ResourceDataType.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/ResourceDataType.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/ResourceDataType.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/ResourceDataType.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringData.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringData.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringFileInfo.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringFileInfo.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringFileInfo.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringFileInfo.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringTable.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringTable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringTable.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringTable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringTableResource.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringTableResource.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringTableResource.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/StringTableResource.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/VarData.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/VarData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/VarData.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/VarData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/VarFileInfo.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/VarFileInfo.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/VarFileInfo.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/VarFileInfo.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/VersionInfo.cs b/SabreTools.Data.Models/PortableExecutable/Resource/Entries/VersionInfo.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/Entries/VersionInfo.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/Entries/VersionInfo.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/ResourceHeader.cs b/SabreTools.Data.Models/PortableExecutable/Resource/ResourceHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/Resource/ResourceHeader.cs
rename to SabreTools.Data.Models/PortableExecutable/Resource/ResourceHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/TLS/Directory.cs b/SabreTools.Data.Models/PortableExecutable/TLS/Directory.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/PortableExecutable/TLS/Directory.cs
rename to SabreTools.Data.Models/PortableExecutable/TLS/Directory.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Quantum/Archive.cs b/SabreTools.Data.Models/Quantum/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Quantum/Archive.cs
rename to SabreTools.Data.Models/Quantum/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Quantum/Constants.cs b/SabreTools.Data.Models/Quantum/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Quantum/Constants.cs
rename to SabreTools.Data.Models/Quantum/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Quantum/FileDescriptor.cs b/SabreTools.Data.Models/Quantum/FileDescriptor.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Quantum/FileDescriptor.cs
rename to SabreTools.Data.Models/Quantum/FileDescriptor.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Quantum/Header.cs b/SabreTools.Data.Models/Quantum/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Quantum/Header.cs
rename to SabreTools.Data.Models/Quantum/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/RAR/Archive.cs b/SabreTools.Data.Models/RAR/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/RAR/Archive.cs
rename to SabreTools.Data.Models/RAR/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/RAR/Constants.cs b/SabreTools.Data.Models/RAR/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/RAR/Constants.cs
rename to SabreTools.Data.Models/RAR/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/README.MD b/SabreTools.Data.Models/README.MD
similarity index 94%
rename from SabreTools.Serialization/SabreTools.Data.Models/README.MD
rename to SabreTools.Data.Models/README.MD
index 433b7ffe..201d1236 100644
--- a/SabreTools.Serialization/SabreTools.Data.Models/README.MD
+++ b/SabreTools.Data.Models/README.MD
@@ -1,6 +1,6 @@
 # SabreTools.Data.Models
 
-This namespace comprises of models that represent either directly serializable or representative structures for all SabreTools projects. The majority of models will have deserializers and wrappers, with some also having both regular and cross-model serializers.
+This library comprises of models that represent either directly serializable or representative structures for all SabreTools projects. The majority of models will have deserializers and wrappers, with some also having both regular and cross-model serializers.
 
 ## Notable Information Sources
 
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/RealArcade/Constants.cs b/SabreTools.Data.Models/RealArcade/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/RealArcade/Constants.cs
rename to SabreTools.Data.Models/RealArcade/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/RealArcade/Mezzanine.cs b/SabreTools.Data.Models/RealArcade/Mezzanine.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/RealArcade/Mezzanine.cs
rename to SabreTools.Data.Models/RealArcade/Mezzanine.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/RealArcade/RgsFile.cs b/SabreTools.Data.Models/RealArcade/RgsFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/RealArcade/RgsFile.cs
rename to SabreTools.Data.Models/RealArcade/RgsFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/RequiredAttribute.cs b/SabreTools.Data.Models/RequiredAttribute.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/RequiredAttribute.cs
rename to SabreTools.Data.Models/RequiredAttribute.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/RomCenter/Credits.cs b/SabreTools.Data.Models/RomCenter/Credits.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/RomCenter/Credits.cs
rename to SabreTools.Data.Models/RomCenter/Credits.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/RomCenter/Dat.cs b/SabreTools.Data.Models/RomCenter/Dat.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/RomCenter/Dat.cs
rename to SabreTools.Data.Models/RomCenter/Dat.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/RomCenter/Emulator.cs b/SabreTools.Data.Models/RomCenter/Emulator.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/RomCenter/Emulator.cs
rename to SabreTools.Data.Models/RomCenter/Emulator.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/RomCenter/Games.cs b/SabreTools.Data.Models/RomCenter/Games.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/RomCenter/Games.cs
rename to SabreTools.Data.Models/RomCenter/Games.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/RomCenter/MetadataFile.cs b/SabreTools.Data.Models/RomCenter/MetadataFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/RomCenter/MetadataFile.cs
rename to SabreTools.Data.Models/RomCenter/MetadataFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/RomCenter/Rom.cs b/SabreTools.Data.Models/RomCenter/Rom.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/RomCenter/Rom.cs
rename to SabreTools.Data.Models/RomCenter/Rom.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Archive.cs b/SabreTools.Data.Models/SGA/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Archive.cs
rename to SabreTools.Data.Models/SGA/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Constants.cs b/SabreTools.Data.Models/SGA/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Constants.cs
rename to SabreTools.Data.Models/SGA/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Directory.cs b/SabreTools.Data.Models/SGA/Directory.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Directory.cs
rename to SabreTools.Data.Models/SGA/Directory.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Directory4.cs b/SabreTools.Data.Models/SGA/Directory4.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Directory4.cs
rename to SabreTools.Data.Models/SGA/Directory4.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Directory5.cs b/SabreTools.Data.Models/SGA/Directory5.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Directory5.cs
rename to SabreTools.Data.Models/SGA/Directory5.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Directory6.cs b/SabreTools.Data.Models/SGA/Directory6.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Directory6.cs
rename to SabreTools.Data.Models/SGA/Directory6.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Directory7.cs b/SabreTools.Data.Models/SGA/Directory7.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Directory7.cs
rename to SabreTools.Data.Models/SGA/Directory7.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/DirectoryHeader.cs b/SabreTools.Data.Models/SGA/DirectoryHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/DirectoryHeader.cs
rename to SabreTools.Data.Models/SGA/DirectoryHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/DirectoryHeader4.cs b/SabreTools.Data.Models/SGA/DirectoryHeader4.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/DirectoryHeader4.cs
rename to SabreTools.Data.Models/SGA/DirectoryHeader4.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/DirectoryHeader5.cs b/SabreTools.Data.Models/SGA/DirectoryHeader5.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/DirectoryHeader5.cs
rename to SabreTools.Data.Models/SGA/DirectoryHeader5.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/DirectoryHeader7.cs b/SabreTools.Data.Models/SGA/DirectoryHeader7.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/DirectoryHeader7.cs
rename to SabreTools.Data.Models/SGA/DirectoryHeader7.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/File.cs b/SabreTools.Data.Models/SGA/File.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/File.cs
rename to SabreTools.Data.Models/SGA/File.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/File4.cs b/SabreTools.Data.Models/SGA/File4.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/File4.cs
rename to SabreTools.Data.Models/SGA/File4.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/File6.cs b/SabreTools.Data.Models/SGA/File6.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/File6.cs
rename to SabreTools.Data.Models/SGA/File6.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/File7.cs b/SabreTools.Data.Models/SGA/File7.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/File7.cs
rename to SabreTools.Data.Models/SGA/File7.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/FileHeader.cs b/SabreTools.Data.Models/SGA/FileHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/FileHeader.cs
rename to SabreTools.Data.Models/SGA/FileHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Folder.cs b/SabreTools.Data.Models/SGA/Folder.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Folder.cs
rename to SabreTools.Data.Models/SGA/Folder.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Folder4.cs b/SabreTools.Data.Models/SGA/Folder4.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Folder4.cs
rename to SabreTools.Data.Models/SGA/Folder4.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Folder5.cs b/SabreTools.Data.Models/SGA/Folder5.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Folder5.cs
rename to SabreTools.Data.Models/SGA/Folder5.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Header.cs b/SabreTools.Data.Models/SGA/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Header.cs
rename to SabreTools.Data.Models/SGA/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Header4.cs b/SabreTools.Data.Models/SGA/Header4.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Header4.cs
rename to SabreTools.Data.Models/SGA/Header4.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Header6.cs b/SabreTools.Data.Models/SGA/Header6.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Header6.cs
rename to SabreTools.Data.Models/SGA/Header6.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Section.cs b/SabreTools.Data.Models/SGA/Section.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Section.cs
rename to SabreTools.Data.Models/SGA/Section.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Section4.cs b/SabreTools.Data.Models/SGA/Section4.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Section4.cs
rename to SabreTools.Data.Models/SGA/Section4.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SGA/Section5.cs b/SabreTools.Data.Models/SGA/Section5.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SGA/Section5.cs
rename to SabreTools.Data.Models/SGA/Section5.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SNES/Cart.cs b/SabreTools.Data.Models/SNES/Cart.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SNES/Cart.cs
rename to SabreTools.Data.Models/SNES/Cart.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SNES/Constants.cs b/SabreTools.Data.Models/SNES/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SNES/Constants.cs
rename to SabreTools.Data.Models/SNES/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SNES/Enums.cs b/SabreTools.Data.Models/SNES/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SNES/Enums.cs
rename to SabreTools.Data.Models/SNES/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SNES/Header.cs b/SabreTools.Data.Models/SNES/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SNES/Header.cs
rename to SabreTools.Data.Models/SNES/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SNES/ProFighterHeader.cs b/SabreTools.Data.Models/SNES/ProFighterHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SNES/ProFighterHeader.cs
rename to SabreTools.Data.Models/SNES/ProFighterHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SNES/SuperWildCardHeader.cs b/SabreTools.Data.Models/SNES/SuperWildCardHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SNES/SuperWildCardHeader.cs
rename to SabreTools.Data.Models/SNES/SuperWildCardHeader.cs
diff --git a/SabreTools.Data.Models/SabreTools.Data.Models.csproj b/SabreTools.Data.Models/SabreTools.Data.Models.csproj
new file mode 100644
index 00000000..132d7c33
--- /dev/null
+++ b/SabreTools.Data.Models/SabreTools.Data.Models.csproj
@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <!-- Assembly Properties -->
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <CheckEolTargetFramework>false</CheckEolTargetFramework>
+        <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+        <IncludeSymbols>true</IncludeSymbols>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <Version>2.3.0</Version>
+
+        <!-- Package Properties -->
+        <Authors>Matt Nadareski</Authors>
+        <Description>Models representing different file and structure types</Description>
+        <Copyright>Copyright (c) Matt Nadareski 2019-2026</Copyright>
+        <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <RepositoryUrl>https://github.com/SabreTools/SabreTools.Serialization</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>models</PackageTags>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="README.md" Pack="true" PackagePath="" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+        <PackageReference Include="SabreTools.IO" Version="[1.9.1]" />
+     </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SafeDisc/Constants.cs b/SabreTools.Data.Models/SafeDisc/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SafeDisc/Constants.cs
rename to SabreTools.Data.Models/SafeDisc/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SafeDisc/EncryptedFileEntry.cs b/SabreTools.Data.Models/SafeDisc/EncryptedFileEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SafeDisc/EncryptedFileEntry.cs
rename to SabreTools.Data.Models/SafeDisc/EncryptedFileEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SecuROM/AddD.cs b/SabreTools.Data.Models/SecuROM/AddD.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SecuROM/AddD.cs
rename to SabreTools.Data.Models/SecuROM/AddD.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SecuROM/AddDEntry.cs b/SabreTools.Data.Models/SecuROM/AddDEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SecuROM/AddDEntry.cs
rename to SabreTools.Data.Models/SecuROM/AddDEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SecuROM/Constants.cs b/SabreTools.Data.Models/SecuROM/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SecuROM/Constants.cs
rename to SabreTools.Data.Models/SecuROM/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SecuROM/DFAEntry.cs b/SabreTools.Data.Models/SecuROM/DFAEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SecuROM/DFAEntry.cs
rename to SabreTools.Data.Models/SecuROM/DFAEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SecuROM/DFAFile.cs b/SabreTools.Data.Models/SecuROM/DFAFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SecuROM/DFAFile.cs
rename to SabreTools.Data.Models/SecuROM/DFAFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SecuROM/Enums.cs b/SabreTools.Data.Models/SecuROM/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SecuROM/Enums.cs
rename to SabreTools.Data.Models/SecuROM/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SecuROM/MatroshkaEntry.cs b/SabreTools.Data.Models/SecuROM/MatroshkaEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SecuROM/MatroshkaEntry.cs
rename to SabreTools.Data.Models/SecuROM/MatroshkaEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SecuROM/MatroshkaPackage.cs b/SabreTools.Data.Models/SecuROM/MatroshkaPackage.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SecuROM/MatroshkaPackage.cs
rename to SabreTools.Data.Models/SecuROM/MatroshkaPackage.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SeparatedValue/MetadataFile.cs b/SabreTools.Data.Models/SeparatedValue/MetadataFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SeparatedValue/MetadataFile.cs
rename to SabreTools.Data.Models/SeparatedValue/MetadataFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SeparatedValue/Row.cs b/SabreTools.Data.Models/SeparatedValue/Row.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SeparatedValue/Row.cs
rename to SabreTools.Data.Models/SeparatedValue/Row.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SevenZip/Archive.cs b/SabreTools.Data.Models/SevenZip/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SevenZip/Archive.cs
rename to SabreTools.Data.Models/SevenZip/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SevenZip/Constants.cs b/SabreTools.Data.Models/SevenZip/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SevenZip/Constants.cs
rename to SabreTools.Data.Models/SevenZip/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/DataArea.cs b/SabreTools.Data.Models/SoftwareList/DataArea.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/DataArea.cs
rename to SabreTools.Data.Models/SoftwareList/DataArea.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/DipSwitch.cs b/SabreTools.Data.Models/SoftwareList/DipSwitch.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/DipSwitch.cs
rename to SabreTools.Data.Models/SoftwareList/DipSwitch.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/DipValue.cs b/SabreTools.Data.Models/SoftwareList/DipValue.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/DipValue.cs
rename to SabreTools.Data.Models/SoftwareList/DipValue.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/Disk.cs b/SabreTools.Data.Models/SoftwareList/Disk.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/Disk.cs
rename to SabreTools.Data.Models/SoftwareList/Disk.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/DiskArea.cs b/SabreTools.Data.Models/SoftwareList/DiskArea.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/DiskArea.cs
rename to SabreTools.Data.Models/SoftwareList/DiskArea.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/Feature.cs b/SabreTools.Data.Models/SoftwareList/Feature.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/Feature.cs
rename to SabreTools.Data.Models/SoftwareList/Feature.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/Info.cs b/SabreTools.Data.Models/SoftwareList/Info.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/Info.cs
rename to SabreTools.Data.Models/SoftwareList/Info.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/Part.cs b/SabreTools.Data.Models/SoftwareList/Part.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/Part.cs
rename to SabreTools.Data.Models/SoftwareList/Part.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/Rom.cs b/SabreTools.Data.Models/SoftwareList/Rom.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/Rom.cs
rename to SabreTools.Data.Models/SoftwareList/Rom.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/SharedFeat.cs b/SabreTools.Data.Models/SoftwareList/SharedFeat.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/SharedFeat.cs
rename to SabreTools.Data.Models/SoftwareList/SharedFeat.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/Software.cs b/SabreTools.Data.Models/SoftwareList/Software.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/Software.cs
rename to SabreTools.Data.Models/SoftwareList/Software.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/SoftwareList.cs b/SabreTools.Data.Models/SoftwareList/SoftwareList.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SoftwareList/SoftwareList.cs
rename to SabreTools.Data.Models/SoftwareList/SoftwareList.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SpoonInstaller/FileEntry.cs b/SabreTools.Data.Models/SpoonInstaller/FileEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SpoonInstaller/FileEntry.cs
rename to SabreTools.Data.Models/SpoonInstaller/FileEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SpoonInstaller/Footer.cs b/SabreTools.Data.Models/SpoonInstaller/Footer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SpoonInstaller/Footer.cs
rename to SabreTools.Data.Models/SpoonInstaller/Footer.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/SpoonInstaller/SFX.cs b/SabreTools.Data.Models/SpoonInstaller/SFX.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/SpoonInstaller/SFX.cs
rename to SabreTools.Data.Models/SpoonInstaller/SFX.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/StarForce/Constants.cs b/SabreTools.Data.Models/StarForce/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/StarForce/Constants.cs
rename to SabreTools.Data.Models/StarForce/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/StarForce/FileEntry.cs b/SabreTools.Data.Models/StarForce/FileEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/StarForce/FileEntry.cs
rename to SabreTools.Data.Models/StarForce/FileEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/StarForce/FileHeader.cs b/SabreTools.Data.Models/StarForce/FileHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/StarForce/FileHeader.cs
rename to SabreTools.Data.Models/StarForce/FileHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/StarForce/FileSystem.cs b/SabreTools.Data.Models/StarForce/FileSystem.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/StarForce/FileSystem.cs
rename to SabreTools.Data.Models/StarForce/FileSystem.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/StarForce/Header.cs b/SabreTools.Data.Models/StarForce/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/StarForce/Header.cs
rename to SabreTools.Data.Models/StarForce/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/TAR/Archive.cs b/SabreTools.Data.Models/TAR/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/TAR/Archive.cs
rename to SabreTools.Data.Models/TAR/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/TAR/Block.cs b/SabreTools.Data.Models/TAR/Block.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/TAR/Block.cs
rename to SabreTools.Data.Models/TAR/Block.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/TAR/Constants.cs b/SabreTools.Data.Models/TAR/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/TAR/Constants.cs
rename to SabreTools.Data.Models/TAR/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/TAR/Entry.cs b/SabreTools.Data.Models/TAR/Entry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/TAR/Entry.cs
rename to SabreTools.Data.Models/TAR/Entry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/TAR/Enums.cs b/SabreTools.Data.Models/TAR/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/TAR/Enums.cs
rename to SabreTools.Data.Models/TAR/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/TAR/Header.cs b/SabreTools.Data.Models/TAR/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/TAR/Header.cs
rename to SabreTools.Data.Models/TAR/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/VDF/Constants.cs b/SabreTools.Data.Models/VDF/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/VDF/Constants.cs
rename to SabreTools.Data.Models/VDF/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/VDF/Sku.cs b/SabreTools.Data.Models/VDF/Sku.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/VDF/Sku.cs
rename to SabreTools.Data.Models/VDF/Sku.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/VDF/SkuSis.cs b/SabreTools.Data.Models/VDF/SkuSis.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/VDF/SkuSis.cs
rename to SabreTools.Data.Models/VDF/SkuSis.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/VPK/ArchiveHash.cs b/SabreTools.Data.Models/VPK/ArchiveHash.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/VPK/ArchiveHash.cs
rename to SabreTools.Data.Models/VPK/ArchiveHash.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/VPK/ArchiveMD5SectionEntry.cs b/SabreTools.Data.Models/VPK/ArchiveMD5SectionEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/VPK/ArchiveMD5SectionEntry.cs
rename to SabreTools.Data.Models/VPK/ArchiveMD5SectionEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/VPK/Constants.cs b/SabreTools.Data.Models/VPK/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/VPK/Constants.cs
rename to SabreTools.Data.Models/VPK/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/VPK/DirectoryEntry.cs b/SabreTools.Data.Models/VPK/DirectoryEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/VPK/DirectoryEntry.cs
rename to SabreTools.Data.Models/VPK/DirectoryEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/VPK/DirectoryItem.cs b/SabreTools.Data.Models/VPK/DirectoryItem.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/VPK/DirectoryItem.cs
rename to SabreTools.Data.Models/VPK/DirectoryItem.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/VPK/ExtendedHeader.cs b/SabreTools.Data.Models/VPK/ExtendedHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/VPK/ExtendedHeader.cs
rename to SabreTools.Data.Models/VPK/ExtendedHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/VPK/File.cs b/SabreTools.Data.Models/VPK/File.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/VPK/File.cs
rename to SabreTools.Data.Models/VPK/File.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/VPK/Header.cs b/SabreTools.Data.Models/VPK/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/VPK/Header.cs
rename to SabreTools.Data.Models/VPK/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/VPK/OtherMD5Section.cs b/SabreTools.Data.Models/VPK/OtherMD5Section.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/VPK/OtherMD5Section.cs
rename to SabreTools.Data.Models/VPK/OtherMD5Section.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/VPK/SignatureSection.cs b/SabreTools.Data.Models/VPK/SignatureSection.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/VPK/SignatureSection.cs
rename to SabreTools.Data.Models/VPK/SignatureSection.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WAD3/CharInfo.cs b/SabreTools.Data.Models/WAD3/CharInfo.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WAD3/CharInfo.cs
rename to SabreTools.Data.Models/WAD3/CharInfo.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WAD3/Constants.cs b/SabreTools.Data.Models/WAD3/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WAD3/Constants.cs
rename to SabreTools.Data.Models/WAD3/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WAD3/DirEntry.cs b/SabreTools.Data.Models/WAD3/DirEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WAD3/DirEntry.cs
rename to SabreTools.Data.Models/WAD3/DirEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WAD3/Enums.cs b/SabreTools.Data.Models/WAD3/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WAD3/Enums.cs
rename to SabreTools.Data.Models/WAD3/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WAD3/File.cs b/SabreTools.Data.Models/WAD3/File.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WAD3/File.cs
rename to SabreTools.Data.Models/WAD3/File.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WAD3/FileEntry.cs b/SabreTools.Data.Models/WAD3/FileEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WAD3/FileEntry.cs
rename to SabreTools.Data.Models/WAD3/FileEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WAD3/Font.cs b/SabreTools.Data.Models/WAD3/Font.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WAD3/Font.cs
rename to SabreTools.Data.Models/WAD3/Font.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WAD3/Header.cs b/SabreTools.Data.Models/WAD3/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WAD3/Header.cs
rename to SabreTools.Data.Models/WAD3/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WAD3/MipMap.cs b/SabreTools.Data.Models/WAD3/MipMap.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WAD3/MipMap.cs
rename to SabreTools.Data.Models/WAD3/MipMap.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WAD3/MipTex.cs b/SabreTools.Data.Models/WAD3/MipTex.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WAD3/MipTex.cs
rename to SabreTools.Data.Models/WAD3/MipTex.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WAD3/QpicImage.cs b/SabreTools.Data.Models/WAD3/QpicImage.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WAD3/QpicImage.cs
rename to SabreTools.Data.Models/WAD3/QpicImage.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/AddDirectoryToPath.cs b/SabreTools.Data.Models/WiseInstaller/Actions/AddDirectoryToPath.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/AddDirectoryToPath.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/AddDirectoryToPath.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/AddTextToInstallLog.cs b/SabreTools.Data.Models/WiseInstaller/Actions/AddTextToInstallLog.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/AddTextToInstallLog.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/AddTextToInstallLog.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/AddToAutoexecBat.cs b/SabreTools.Data.Models/WiseInstaller/Actions/AddToAutoexecBat.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/AddToAutoexecBat.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/AddToAutoexecBat.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/AddToConfigSys.cs b/SabreTools.Data.Models/WiseInstaller/Actions/AddToConfigSys.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/AddToConfigSys.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/AddToConfigSys.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/AddToSystemIni.cs b/SabreTools.Data.Models/WiseInstaller/Actions/AddToSystemIni.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/AddToSystemIni.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/AddToSystemIni.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CallDllFunction.cs b/SabreTools.Data.Models/WiseInstaller/Actions/CallDllFunction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CallDllFunction.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/CallDllFunction.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CheckConfiguration.cs b/SabreTools.Data.Models/WiseInstaller/Actions/CheckConfiguration.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CheckConfiguration.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/CheckConfiguration.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CheckDiskSpace.cs b/SabreTools.Data.Models/WiseInstaller/Actions/CheckDiskSpace.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CheckDiskSpace.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/CheckDiskSpace.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CheckHttpConnection.cs b/SabreTools.Data.Models/WiseInstaller/Actions/CheckHttpConnection.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CheckHttpConnection.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/CheckHttpConnection.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CheckIfFileDirExists.cs b/SabreTools.Data.Models/WiseInstaller/Actions/CheckIfFileDirExists.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CheckIfFileDirExists.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/CheckIfFileDirExists.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ConfigODBCDataSource.cs b/SabreTools.Data.Models/WiseInstaller/Actions/ConfigODBCDataSource.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ConfigODBCDataSource.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/ConfigODBCDataSource.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CopyLocalFile.cs b/SabreTools.Data.Models/WiseInstaller/Actions/CopyLocalFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CopyLocalFile.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/CopyLocalFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CreateDirectory.cs b/SabreTools.Data.Models/WiseInstaller/Actions/CreateDirectory.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CreateDirectory.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/CreateDirectory.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CustomDialogSet.cs b/SabreTools.Data.Models/WiseInstaller/Actions/CustomDialogSet.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/CustomDialogSet.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/CustomDialogSet.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/DeflateEntry.cs b/SabreTools.Data.Models/WiseInstaller/Actions/DeflateEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/DeflateEntry.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/DeflateEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/DeleteFile.cs b/SabreTools.Data.Models/WiseInstaller/Actions/DeleteFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/DeleteFile.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/DeleteFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/DisplayBillboard.cs b/SabreTools.Data.Models/WiseInstaller/Actions/DisplayBillboard.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/DisplayBillboard.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/DisplayBillboard.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/DisplayMessage.cs b/SabreTools.Data.Models/WiseInstaller/Actions/DisplayMessage.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/DisplayMessage.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/DisplayMessage.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/EditIniFile.cs b/SabreTools.Data.Models/WiseInstaller/Actions/EditIniFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/EditIniFile.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/EditIniFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/EditRegistry.cs b/SabreTools.Data.Models/WiseInstaller/Actions/EditRegistry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/EditRegistry.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/EditRegistry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ElseIfStatement.cs b/SabreTools.Data.Models/WiseInstaller/Actions/ElseIfStatement.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ElseIfStatement.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/ElseIfStatement.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ElseStatement.cs b/SabreTools.Data.Models/WiseInstaller/Actions/ElseStatement.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ElseStatement.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/ElseStatement.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/EndBlockStatement.cs b/SabreTools.Data.Models/WiseInstaller/Actions/EndBlockStatement.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/EndBlockStatement.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/EndBlockStatement.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/EndUserDefinedAction.cs b/SabreTools.Data.Models/WiseInstaller/Actions/EndUserDefinedAction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/EndUserDefinedAction.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/EndUserDefinedAction.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ExecuteProgram.cs b/SabreTools.Data.Models/WiseInstaller/Actions/ExecuteProgram.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ExecuteProgram.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/ExecuteProgram.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ExitInstallation.cs b/SabreTools.Data.Models/WiseInstaller/Actions/ExitInstallation.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ExitInstallation.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/ExitInstallation.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ExternalDllCall.cs b/SabreTools.Data.Models/WiseInstaller/Actions/ExternalDllCall.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ExternalDllCall.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/ExternalDllCall.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/FindFileInPath.cs b/SabreTools.Data.Models/WiseInstaller/Actions/FindFileInPath.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/FindFileInPath.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/FindFileInPath.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/FunctionData.cs b/SabreTools.Data.Models/WiseInstaller/Actions/FunctionData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/FunctionData.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/FunctionData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/GetEnvironmentVariable.cs b/SabreTools.Data.Models/WiseInstaller/Actions/GetEnvironmentVariable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/GetEnvironmentVariable.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/GetEnvironmentVariable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/GetRegistryKeyValue.cs b/SabreTools.Data.Models/WiseInstaller/Actions/GetRegistryKeyValue.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/GetRegistryKeyValue.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/GetRegistryKeyValue.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/GetSystemInformation.cs b/SabreTools.Data.Models/WiseInstaller/Actions/GetSystemInformation.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/GetSystemInformation.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/GetSystemInformation.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/GetTemporaryFilename.cs b/SabreTools.Data.Models/WiseInstaller/Actions/GetTemporaryFilename.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/GetTemporaryFilename.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/GetTemporaryFilename.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/IfWhileStatement.cs b/SabreTools.Data.Models/WiseInstaller/Actions/IfWhileStatement.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/IfWhileStatement.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/IfWhileStatement.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/IncludeScript.cs b/SabreTools.Data.Models/WiseInstaller/Actions/IncludeScript.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/IncludeScript.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/IncludeScript.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/InsertLineIntoTextFile.cs b/SabreTools.Data.Models/WiseInstaller/Actions/InsertLineIntoTextFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/InsertLineIntoTextFile.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/InsertLineIntoTextFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/InstallDirectXComponents.cs b/SabreTools.Data.Models/WiseInstaller/Actions/InstallDirectXComponents.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/InstallDirectXComponents.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/InstallDirectXComponents.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/InstallFile.cs b/SabreTools.Data.Models/WiseInstaller/Actions/InstallFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/InstallFile.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/InstallFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/InvalidOperation.cs b/SabreTools.Data.Models/WiseInstaller/Actions/InvalidOperation.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/InvalidOperation.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/InvalidOperation.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/MachineStateData.cs b/SabreTools.Data.Models/WiseInstaller/Actions/MachineStateData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/MachineStateData.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/MachineStateData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/NewEvent.cs b/SabreTools.Data.Models/WiseInstaller/Actions/NewEvent.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/NewEvent.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/NewEvent.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/NoOp.cs b/SabreTools.Data.Models/WiseInstaller/Actions/NoOp.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/NoOp.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/NoOp.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/OpenCloseInstallLog.cs b/SabreTools.Data.Models/WiseInstaller/Actions/OpenCloseInstallLog.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/OpenCloseInstallLog.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/OpenCloseInstallLog.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ParseString.cs b/SabreTools.Data.Models/WiseInstaller/Actions/ParseString.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ParseString.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/ParseString.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/PlayMultimediaFile.cs b/SabreTools.Data.Models/WiseInstaller/Actions/PlayMultimediaFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/PlayMultimediaFile.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/PlayMultimediaFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/PostToHttpServer.cs b/SabreTools.Data.Models/WiseInstaller/Actions/PostToHttpServer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/PostToHttpServer.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/PostToHttpServer.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/PromptForFilename.cs b/SabreTools.Data.Models/WiseInstaller/Actions/PromptForFilename.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/PromptForFilename.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/PromptForFilename.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ReadIniValue.cs b/SabreTools.Data.Models/WiseInstaller/Actions/ReadIniValue.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ReadIniValue.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/ReadIniValue.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ReadUpdateTextFile.cs b/SabreTools.Data.Models/WiseInstaller/Actions/ReadUpdateTextFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ReadUpdateTextFile.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/ReadUpdateTextFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ReadWriteBinaryFile.cs b/SabreTools.Data.Models/WiseInstaller/Actions/ReadWriteBinaryFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/ReadWriteBinaryFile.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/ReadWriteBinaryFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/RegisterFont.cs b/SabreTools.Data.Models/WiseInstaller/Actions/RegisterFont.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/RegisterFont.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/RegisterFont.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/RenameFileDirectory.cs b/SabreTools.Data.Models/WiseInstaller/Actions/RenameFileDirectory.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/RenameFileDirectory.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/RenameFileDirectory.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/SearchForFile.cs b/SabreTools.Data.Models/WiseInstaller/Actions/SearchForFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/SearchForFile.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/SearchForFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/SelfRegisterOCXsDLLs.cs b/SabreTools.Data.Models/WiseInstaller/Actions/SelfRegisterOCXsDLLs.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/SelfRegisterOCXsDLLs.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/SelfRegisterOCXsDLLs.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/SetFileAttributes.cs b/SabreTools.Data.Models/WiseInstaller/Actions/SetFileAttributes.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/SetFileAttributes.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/SetFileAttributes.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/SetFilesBuffers.cs b/SabreTools.Data.Models/WiseInstaller/Actions/SetFilesBuffers.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/SetFilesBuffers.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/SetFilesBuffers.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/SetVariable.cs b/SabreTools.Data.Models/WiseInstaller/Actions/SetVariable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/SetVariable.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/SetVariable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/StartStopService.cs b/SabreTools.Data.Models/WiseInstaller/Actions/StartStopService.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/StartStopService.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/StartStopService.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/StartUserDefinedAction.cs b/SabreTools.Data.Models/WiseInstaller/Actions/StartUserDefinedAction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/StartUserDefinedAction.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/StartUserDefinedAction.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/Unknown0x19.cs b/SabreTools.Data.Models/WiseInstaller/Actions/Unknown0x19.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/Unknown0x19.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/Unknown0x19.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/Unknown0x24.cs b/SabreTools.Data.Models/WiseInstaller/Actions/Unknown0x24.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/Unknown0x24.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/Unknown0x24.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/Unknown0x25.cs b/SabreTools.Data.Models/WiseInstaller/Actions/Unknown0x25.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/Unknown0x25.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/Unknown0x25.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/UserDefinedActionStep.cs b/SabreTools.Data.Models/WiseInstaller/Actions/UserDefinedActionStep.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/UserDefinedActionStep.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/UserDefinedActionStep.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/Win32SystemDirectory.cs b/SabreTools.Data.Models/WiseInstaller/Actions/Win32SystemDirectory.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/Win32SystemDirectory.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/Win32SystemDirectory.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/WizardBlockLoop.cs b/SabreTools.Data.Models/WiseInstaller/Actions/WizardBlockLoop.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Actions/WizardBlockLoop.cs
rename to SabreTools.Data.Models/WiseInstaller/Actions/WizardBlockLoop.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Constants.cs b/SabreTools.Data.Models/WiseInstaller/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Constants.cs
rename to SabreTools.Data.Models/WiseInstaller/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Enums.cs b/SabreTools.Data.Models/WiseInstaller/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/Enums.cs
rename to SabreTools.Data.Models/WiseInstaller/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/MachineState.cs b/SabreTools.Data.Models/WiseInstaller/MachineState.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/MachineState.cs
rename to SabreTools.Data.Models/WiseInstaller/MachineState.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/OverlayHeader.cs b/SabreTools.Data.Models/WiseInstaller/OverlayHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/OverlayHeader.cs
rename to SabreTools.Data.Models/WiseInstaller/OverlayHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/ScriptFile.cs b/SabreTools.Data.Models/WiseInstaller/ScriptFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/ScriptFile.cs
rename to SabreTools.Data.Models/WiseInstaller/ScriptFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/ScriptHeader.cs b/SabreTools.Data.Models/WiseInstaller/ScriptHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/ScriptHeader.cs
rename to SabreTools.Data.Models/WiseInstaller/ScriptHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/SectionHeader.cs b/SabreTools.Data.Models/WiseInstaller/SectionHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/WiseInstaller/SectionHeader.cs
rename to SabreTools.Data.Models/WiseInstaller/SectionHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZ/Archive.cs b/SabreTools.Data.Models/XZ/Archive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZ/Archive.cs
rename to SabreTools.Data.Models/XZ/Archive.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZ/Block.cs b/SabreTools.Data.Models/XZ/Block.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZ/Block.cs
rename to SabreTools.Data.Models/XZ/Block.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZ/Constants.cs b/SabreTools.Data.Models/XZ/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZ/Constants.cs
rename to SabreTools.Data.Models/XZ/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZ/Enums.cs b/SabreTools.Data.Models/XZ/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZ/Enums.cs
rename to SabreTools.Data.Models/XZ/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZ/FilterFlags.cs b/SabreTools.Data.Models/XZ/FilterFlags.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZ/FilterFlags.cs
rename to SabreTools.Data.Models/XZ/FilterFlags.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZ/Footer.cs b/SabreTools.Data.Models/XZ/Footer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZ/Footer.cs
rename to SabreTools.Data.Models/XZ/Footer.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZ/Header.cs b/SabreTools.Data.Models/XZ/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZ/Header.cs
rename to SabreTools.Data.Models/XZ/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZ/Index.cs b/SabreTools.Data.Models/XZ/Index.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZ/Index.cs
rename to SabreTools.Data.Models/XZ/Index.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZ/Record.cs b/SabreTools.Data.Models/XZ/Record.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZ/Record.cs
rename to SabreTools.Data.Models/XZ/Record.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZP/Constants.cs b/SabreTools.Data.Models/XZP/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZP/Constants.cs
rename to SabreTools.Data.Models/XZP/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZP/DirectoryEntry.cs b/SabreTools.Data.Models/XZP/DirectoryEntry.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZP/DirectoryEntry.cs
rename to SabreTools.Data.Models/XZP/DirectoryEntry.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZP/DirectoryItem.cs b/SabreTools.Data.Models/XZP/DirectoryItem.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZP/DirectoryItem.cs
rename to SabreTools.Data.Models/XZP/DirectoryItem.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZP/DirectoryMapping.cs b/SabreTools.Data.Models/XZP/DirectoryMapping.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZP/DirectoryMapping.cs
rename to SabreTools.Data.Models/XZP/DirectoryMapping.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZP/File.cs b/SabreTools.Data.Models/XZP/File.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZP/File.cs
rename to SabreTools.Data.Models/XZP/File.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZP/Footer.cs b/SabreTools.Data.Models/XZP/Footer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZP/Footer.cs
rename to SabreTools.Data.Models/XZP/Footer.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XZP/Header.cs b/SabreTools.Data.Models/XZP/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XZP/Header.cs
rename to SabreTools.Data.Models/XZP/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/Attribute.cs b/SabreTools.Data.Models/Xbox/Attribute.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/Attribute.cs
rename to SabreTools.Data.Models/Xbox/Attribute.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/Catalog.cs b/SabreTools.Data.Models/Xbox/Catalog.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/Catalog.cs
rename to SabreTools.Data.Models/Xbox/Catalog.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/ChallengeResponseDataXGD23.cs b/SabreTools.Data.Models/Xbox/ChallengeResponseDataXGD23.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/ChallengeResponseDataXGD23.cs
rename to SabreTools.Data.Models/Xbox/ChallengeResponseDataXGD23.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/Constants.cs b/SabreTools.Data.Models/Xbox/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/Constants.cs
rename to SabreTools.Data.Models/Xbox/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/DecryptedChallengeResponseXGD23.cs b/SabreTools.Data.Models/Xbox/DecryptedChallengeResponseXGD23.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/DecryptedChallengeResponseXGD23.cs
rename to SabreTools.Data.Models/Xbox/DecryptedChallengeResponseXGD23.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/DriveEntryData.cs b/SabreTools.Data.Models/Xbox/DriveEntryData.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/DriveEntryData.cs
rename to SabreTools.Data.Models/Xbox/DriveEntryData.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/EncryptedChallengeResponseXGD1.cs b/SabreTools.Data.Models/Xbox/EncryptedChallengeResponseXGD1.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/EncryptedChallengeResponseXGD1.cs
rename to SabreTools.Data.Models/Xbox/EncryptedChallengeResponseXGD1.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/EncryptedChallengeResponseXGD23.cs b/SabreTools.Data.Models/Xbox/EncryptedChallengeResponseXGD23.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/EncryptedChallengeResponseXGD23.cs
rename to SabreTools.Data.Models/Xbox/EncryptedChallengeResponseXGD23.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/Image.cs b/SabreTools.Data.Models/Xbox/Image.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/Image.cs
rename to SabreTools.Data.Models/Xbox/Image.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/Package.cs b/SabreTools.Data.Models/Xbox/Package.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/Package.cs
rename to SabreTools.Data.Models/Xbox/Package.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/Rating.cs b/SabreTools.Data.Models/Xbox/Rating.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/Rating.cs
rename to SabreTools.Data.Models/Xbox/Rating.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/SecuritySector.cs b/SabreTools.Data.Models/Xbox/SecuritySector.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/SecuritySector.cs
rename to SabreTools.Data.Models/Xbox/SecuritySector.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/SecuritySectorXGD1.cs b/SabreTools.Data.Models/Xbox/SecuritySectorXGD1.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/SecuritySectorXGD1.cs
rename to SabreTools.Data.Models/Xbox/SecuritySectorXGD1.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/SecuritySectorXGD2.cs b/SabreTools.Data.Models/Xbox/SecuritySectorXGD2.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/SecuritySectorXGD2.cs
rename to SabreTools.Data.Models/Xbox/SecuritySectorXGD2.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/SecuritySectorXGD3.cs b/SabreTools.Data.Models/Xbox/SecuritySectorXGD3.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/SecuritySectorXGD3.cs
rename to SabreTools.Data.Models/Xbox/SecuritySectorXGD3.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/Title.cs b/SabreTools.Data.Models/Xbox/Title.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/Title.cs
rename to SabreTools.Data.Models/Xbox/Title.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/XMID.cs b/SabreTools.Data.Models/Xbox/XMID.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/XMID.cs
rename to SabreTools.Data.Models/Xbox/XMID.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/Xbox/XeMID.cs b/SabreTools.Data.Models/Xbox/XeMID.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/Xbox/XeMID.cs
rename to SabreTools.Data.Models/Xbox/XeMID.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/Certificate.cs b/SabreTools.Data.Models/XboxExecutable/Certificate.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/Certificate.cs
rename to SabreTools.Data.Models/XboxExecutable/Certificate.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/Constants.cs b/SabreTools.Data.Models/XboxExecutable/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/Constants.cs
rename to SabreTools.Data.Models/XboxExecutable/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/Enums.cs b/SabreTools.Data.Models/XboxExecutable/Enums.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/Enums.cs
rename to SabreTools.Data.Models/XboxExecutable/Enums.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/Executable.cs b/SabreTools.Data.Models/XboxExecutable/Executable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/Executable.cs
rename to SabreTools.Data.Models/XboxExecutable/Executable.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/Header.cs b/SabreTools.Data.Models/XboxExecutable/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/Header.cs
rename to SabreTools.Data.Models/XboxExecutable/Header.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/LibraryVersion.cs b/SabreTools.Data.Models/XboxExecutable/LibraryVersion.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/LibraryVersion.cs
rename to SabreTools.Data.Models/XboxExecutable/LibraryVersion.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/SectionHeader.cs b/SabreTools.Data.Models/XboxExecutable/SectionHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/SectionHeader.cs
rename to SabreTools.Data.Models/XboxExecutable/SectionHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/ThreadLocalStorage.cs b/SabreTools.Data.Models/XboxExecutable/ThreadLocalStorage.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/XboxExecutable/ThreadLocalStorage.cs
rename to SabreTools.Data.Models/XboxExecutable/ThreadLocalStorage.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ZSTD/Constants.cs b/SabreTools.Data.Models/ZSTD/Constants.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ZSTD/Constants.cs
rename to SabreTools.Data.Models/ZSTD/Constants.cs
diff --git a/SabreTools.Serialization/SabreTools.Data.Models/ZSTD/Header.cs b/SabreTools.Data.Models/ZSTD/Header.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Data.Models/ZSTD/Header.cs
rename to SabreTools.Data.Models/ZSTD/Header.cs
diff --git a/SabreTools.ObjectIdentifier.Test/SabreTools.ObjectIdentifier.Test.csproj b/SabreTools.ObjectIdentifier.Test/SabreTools.ObjectIdentifier.Test.csproj
index 69a04dc7..4d204995 100644
--- a/SabreTools.ObjectIdentifier.Test/SabreTools.ObjectIdentifier.Test.csproj
+++ b/SabreTools.ObjectIdentifier.Test/SabreTools.ObjectIdentifier.Test.csproj
@@ -8,20 +8,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\SabreTools.Serialization\SabreTools.Serialization.csproj" />
+        <PackageReference Include="coverlet.collector" Version="8.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="8.0.0">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-        <PackageReference Include="xunit" Version="2.9.3" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
+        <ProjectReference Include="..\SabreTools.ObjectIdentifier\SabreTools.ObjectIdentifier.csproj" />
     </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.ASN1.cs b/SabreTools.ObjectIdentifier/Parser.ASN1.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.ASN1.cs
rename to SabreTools.ObjectIdentifier/Parser.ASN1.cs
diff --git a/SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.ModifiedOIDIRI.cs b/SabreTools.ObjectIdentifier/Parser.ModifiedOIDIRI.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.ModifiedOIDIRI.cs
rename to SabreTools.ObjectIdentifier/Parser.ModifiedOIDIRI.cs
diff --git a/SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.OIDIRI.cs b/SabreTools.ObjectIdentifier/Parser.OIDIRI.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.OIDIRI.cs
rename to SabreTools.ObjectIdentifier/Parser.OIDIRI.cs
diff --git a/SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.cs b/SabreTools.ObjectIdentifier/Parser.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.cs
rename to SabreTools.ObjectIdentifier/Parser.cs
diff --git a/SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.dot.cs b/SabreTools.ObjectIdentifier/Parser.dot.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.ObjectIdentifier/Parser.dot.cs
rename to SabreTools.ObjectIdentifier/Parser.dot.cs
diff --git a/SabreTools.ObjectIdentifier/README.MD b/SabreTools.ObjectIdentifier/README.MD
new file mode 100644
index 00000000..74a33c3f
--- /dev/null
+++ b/SabreTools.ObjectIdentifier/README.MD
@@ -0,0 +1,5 @@
+# SabreTools.ObjectIdentifier
+
+This library contains parsing logic for Object Identifiers (OIDs). It parses into ASN.1, OID-IRI (Extended and Standard), and Dot notations.
+
+**NOTE:** Modified OID-IRI notification parsing is incomplete as it attempts to contain all leaves, even ones that are not named.
diff --git a/SabreTools.ObjectIdentifier/SabreTools.ObjectIdentifier.csproj b/SabreTools.ObjectIdentifier/SabreTools.ObjectIdentifier.csproj
new file mode 100644
index 00000000..37d44197
--- /dev/null
+++ b/SabreTools.ObjectIdentifier/SabreTools.ObjectIdentifier.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <!-- Assembly Properties -->
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <CheckEolTargetFramework>false</CheckEolTargetFramework>
+        <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+        <IncludeSymbols>true</IncludeSymbols>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <Version>2.3.0</Version>
+
+        <!-- Package Properties -->
+        <Authors>Matt Nadareski</Authors>
+        <Description>Object Identifier (OID) parsing</Description>
+        <Copyright>Copyright (c) Matt Nadareski 2019-2026</Copyright>
+        <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <RepositoryUrl>https://github.com/SabreTools/SabreTools.Serialization</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>oid asn1 parsing</PackageTags>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="README.md" Pack="true" PackagePath="" />
+    </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/SabreTools.Serialization.Test/CrossModel/ArchiveDotOrgTests.cs b/SabreTools.Serialization.CrossModel.Test/ArchiveDotOrgTests.cs
similarity index 98%
rename from SabreTools.Serialization.Test/CrossModel/ArchiveDotOrgTests.cs
rename to SabreTools.Serialization.CrossModel.Test/ArchiveDotOrgTests.cs
index 37083c80..dcad2d5d 100644
--- a/SabreTools.Serialization.Test/CrossModel/ArchiveDotOrgTests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/ArchiveDotOrgTests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class ArchiveDotOrgTests
     {
diff --git a/SabreTools.Serialization.Test/CrossModel/AttractModeTests.cs b/SabreTools.Serialization.CrossModel.Test/AttractModeTests.cs
similarity index 97%
rename from SabreTools.Serialization.Test/CrossModel/AttractModeTests.cs
rename to SabreTools.Serialization.CrossModel.Test/AttractModeTests.cs
index 5a4abd76..b93aaccb 100644
--- a/SabreTools.Serialization.Test/CrossModel/AttractModeTests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/AttractModeTests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class AttractModeTests
     {
diff --git a/SabreTools.Serialization.Test/CrossModel/ClrMameProTests.cs b/SabreTools.Serialization.CrossModel.Test/ClrMameProTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/CrossModel/ClrMameProTests.cs
rename to SabreTools.Serialization.CrossModel.Test/ClrMameProTests.cs
index bd29a60c..161fd8e8 100644
--- a/SabreTools.Serialization.Test/CrossModel/ClrMameProTests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/ClrMameProTests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class ClrMameProTests
     {
diff --git a/SabreTools.Serialization.Test/CrossModel/DosCenterTests.cs b/SabreTools.Serialization.CrossModel.Test/DosCenterTests.cs
similarity index 97%
rename from SabreTools.Serialization.Test/CrossModel/DosCenterTests.cs
rename to SabreTools.Serialization.CrossModel.Test/DosCenterTests.cs
index 2361883f..f1ec413b 100644
--- a/SabreTools.Serialization.Test/CrossModel/DosCenterTests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/DosCenterTests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class DosCenterTests
     {
diff --git a/SabreTools.Serialization.Test/CrossModel/EverdriveSMDBTests.cs b/SabreTools.Serialization.CrossModel.Test/EverdriveSMDBTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/CrossModel/EverdriveSMDBTests.cs
rename to SabreTools.Serialization.CrossModel.Test/EverdriveSMDBTests.cs
index bdfbb0f6..faa57ae7 100644
--- a/SabreTools.Serialization.Test/CrossModel/EverdriveSMDBTests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/EverdriveSMDBTests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class EverdriveSMDBTests
     {
diff --git a/SabreTools.Serialization.Test/CrossModel/HashfileTests.cs b/SabreTools.Serialization.CrossModel.Test/HashfileTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/CrossModel/HashfileTests.cs
rename to SabreTools.Serialization.CrossModel.Test/HashfileTests.cs
index bac9a8bf..18d10bc9 100644
--- a/SabreTools.Serialization.Test/CrossModel/HashfileTests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/HashfileTests.cs
@@ -1,9 +1,8 @@
 using System;
 using SabreTools.Hashing;
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class HashfileTests
     {
diff --git a/SabreTools.Serialization.Test/CrossModel/ListromTests.cs b/SabreTools.Serialization.CrossModel.Test/ListromTests.cs
similarity index 97%
rename from SabreTools.Serialization.Test/CrossModel/ListromTests.cs
rename to SabreTools.Serialization.CrossModel.Test/ListromTests.cs
index 57b51c6c..fbee49a2 100644
--- a/SabreTools.Serialization.Test/CrossModel/ListromTests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/ListromTests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class ListromTests
     {
diff --git a/SabreTools.Serialization.Test/CrossModel/ListxmlTests.cs b/SabreTools.Serialization.CrossModel.Test/ListxmlTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/CrossModel/ListxmlTests.cs
rename to SabreTools.Serialization.CrossModel.Test/ListxmlTests.cs
index 08a9b281..8f7cfcbf 100644
--- a/SabreTools.Serialization.Test/CrossModel/ListxmlTests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/ListxmlTests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class ListxmlTests
     {
diff --git a/SabreTools.Serialization.Test/CrossModel/LogiqxTests.cs b/SabreTools.Serialization.CrossModel.Test/LogiqxTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/CrossModel/LogiqxTests.cs
rename to SabreTools.Serialization.CrossModel.Test/LogiqxTests.cs
index dda71bc9..35822e4c 100644
--- a/SabreTools.Serialization.Test/CrossModel/LogiqxTests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/LogiqxTests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class LogiqxTests
     {
diff --git a/SabreTools.Serialization.Test/CrossModel/M1Tests.cs b/SabreTools.Serialization.CrossModel.Test/M1Tests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/CrossModel/M1Tests.cs
rename to SabreTools.Serialization.CrossModel.Test/M1Tests.cs
index b8513ace..2ece60d7 100644
--- a/SabreTools.Serialization.Test/CrossModel/M1Tests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/M1Tests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class M1Tests
     {
diff --git a/SabreTools.Serialization.Test/CrossModel/MessTests.cs b/SabreTools.Serialization.CrossModel.Test/MessTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/CrossModel/MessTests.cs
rename to SabreTools.Serialization.CrossModel.Test/MessTests.cs
index 00cf5052..aa584f06 100644
--- a/SabreTools.Serialization.Test/CrossModel/MessTests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/MessTests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class MessTests
     {
diff --git a/SabreTools.Serialization.Test/CrossModel/OfflineListTests.cs b/SabreTools.Serialization.CrossModel.Test/OfflineListTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/CrossModel/OfflineListTests.cs
rename to SabreTools.Serialization.CrossModel.Test/OfflineListTests.cs
index cb3d05d0..001a2f99 100644
--- a/SabreTools.Serialization.Test/CrossModel/OfflineListTests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/OfflineListTests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class OfflineListTests
     {
diff --git a/SabreTools.Serialization.Test/CrossModel/OpenMSXTests.cs b/SabreTools.Serialization.CrossModel.Test/OpenMSXTests.cs
similarity index 98%
rename from SabreTools.Serialization.Test/CrossModel/OpenMSXTests.cs
rename to SabreTools.Serialization.CrossModel.Test/OpenMSXTests.cs
index 88fc4b4f..0dae26aa 100644
--- a/SabreTools.Serialization.Test/CrossModel/OpenMSXTests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/OpenMSXTests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class OpenMSXTests
     {
diff --git a/SabreTools.Serialization.Test/CrossModel/RomCenterTests.cs b/SabreTools.Serialization.CrossModel.Test/RomCenterTests.cs
similarity index 98%
rename from SabreTools.Serialization.Test/CrossModel/RomCenterTests.cs
rename to SabreTools.Serialization.CrossModel.Test/RomCenterTests.cs
index 00f615b3..7f2f0fb1 100644
--- a/SabreTools.Serialization.Test/CrossModel/RomCenterTests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/RomCenterTests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class RomCenterTests
     {
diff --git a/SabreTools.Serialization.Test/SabreTools.Serialization.Test.csproj b/SabreTools.Serialization.CrossModel.Test/SabreTools.Serialization.CrossModel.Test.csproj
similarity index 54%
rename from SabreTools.Serialization.Test/SabreTools.Serialization.Test.csproj
rename to SabreTools.Serialization.CrossModel.Test/SabreTools.Serialization.CrossModel.Test.csproj
index 44fde1d4..e4d76db5 100644
--- a/SabreTools.Serialization.Test/SabreTools.Serialization.Test.csproj
+++ b/SabreTools.Serialization.CrossModel.Test/SabreTools.Serialization.CrossModel.Test.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
@@ -8,21 +8,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\SabreTools.Serialization\SabreTools.Serialization.csproj" />
+        <PackageReference Include="coverlet.collector" Version="8.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+        <PackageReference Include="SabreTools.Hashing" Version="[1.6.1]" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="8.0.0">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-        <PackageReference Include="SabreTools.Hashing" Version="[1.6.1]" />
-        <PackageReference Include="xunit" Version="2.9.3" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
+        <ProjectReference Include="..\SabreTools.Serialization.CrossModel\SabreTools.Serialization.CrossModel.csproj" />
     </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/SabreTools.Serialization.Test/CrossModel/SeparatedValueTests.cs b/SabreTools.Serialization.CrossModel.Test/SeparatedValueTests.cs
similarity index 98%
rename from SabreTools.Serialization.Test/CrossModel/SeparatedValueTests.cs
rename to SabreTools.Serialization.CrossModel.Test/SeparatedValueTests.cs
index 107fc33f..0725f0e3 100644
--- a/SabreTools.Serialization.Test/CrossModel/SeparatedValueTests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/SeparatedValueTests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class SeparatedValueTests
     {
diff --git a/SabreTools.Serialization.Test/CrossModel/SoftwareListTests.cs b/SabreTools.Serialization.CrossModel.Test/SoftwareListTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/CrossModel/SoftwareListTests.cs
rename to SabreTools.Serialization.CrossModel.Test/SoftwareListTests.cs
index 02746548..adc77d6d 100644
--- a/SabreTools.Serialization.Test/CrossModel/SoftwareListTests.cs
+++ b/SabreTools.Serialization.CrossModel.Test/SoftwareListTests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.CrossModel;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.CrossModel
+namespace SabreTools.Serialization.CrossModel.Test
 {
     public class SoftwareListTests
     {
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Deserializer.cs b/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/ArchiveDotOrg.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Serializer.cs b/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Serializer.cs
rename to SabreTools.Serialization.CrossModel/ArchiveDotOrg.Serializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/AttractMode.Deserializer.cs b/SabreTools.Serialization.CrossModel/AttractMode.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/AttractMode.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/AttractMode.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/AttractMode.Serializer.cs b/SabreTools.Serialization.CrossModel/AttractMode.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/AttractMode.Serializer.cs
rename to SabreTools.Serialization.CrossModel/AttractMode.Serializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/BaseMetadataSerializer.cs b/SabreTools.Serialization.CrossModel/BaseMetadataSerializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/BaseMetadataSerializer.cs
rename to SabreTools.Serialization.CrossModel/BaseMetadataSerializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs b/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs b/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs
rename to SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs b/SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs b/SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs
rename to SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/EverdriveSMDB.Deserializer.cs b/SabreTools.Serialization.CrossModel/EverdriveSMDB.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/EverdriveSMDB.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/EverdriveSMDB.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/EverdriveSMDB.Serializer.cs b/SabreTools.Serialization.CrossModel/EverdriveSMDB.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/EverdriveSMDB.Serializer.cs
rename to SabreTools.Serialization.CrossModel/EverdriveSMDB.Serializer.cs
diff --git a/SabreTools.Serialization.CrossModel/ExtensionAttribute.cs b/SabreTools.Serialization.CrossModel/ExtensionAttribute.cs
new file mode 100644
index 00000000..b40aacab
--- /dev/null
+++ b/SabreTools.Serialization.CrossModel/ExtensionAttribute.cs
@@ -0,0 +1,9 @@
+#if NET20
+
+namespace System.Runtime.CompilerServices
+{
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
+    internal sealed class ExtensionAttribute : Attribute {}
+}
+
+#endif
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/FDS.Deserializer.cs b/SabreTools.Serialization.CrossModel/FDS.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/FDS.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/FDS.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/FDS.Serializer.cs b/SabreTools.Serialization.CrossModel/FDS.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/FDS.Serializer.cs
rename to SabreTools.Serialization.CrossModel/FDS.Serializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/Hashfile.Deserializer.cs b/SabreTools.Serialization.CrossModel/Hashfile.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/Hashfile.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/Hashfile.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/Hashfile.Serializer.cs b/SabreTools.Serialization.CrossModel/Hashfile.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/Hashfile.Serializer.cs
rename to SabreTools.Serialization.CrossModel/Hashfile.Serializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/ICrossModel.cs b/SabreTools.Serialization.CrossModel/ICrossModel.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/ICrossModel.cs
rename to SabreTools.Serialization.CrossModel/ICrossModel.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/Listrom.Deserializer.cs b/SabreTools.Serialization.CrossModel/Listrom.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/Listrom.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/Listrom.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/Listrom.Serializer.cs b/SabreTools.Serialization.CrossModel/Listrom.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/Listrom.Serializer.cs
rename to SabreTools.Serialization.CrossModel/Listrom.Serializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs b/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs b/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs
rename to SabreTools.Serialization.CrossModel/Listxml.Serializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs b/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs b/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs
rename to SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/M1.Deserializer.cs b/SabreTools.Serialization.CrossModel/M1.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/M1.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/M1.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/M1.Serializer.cs b/SabreTools.Serialization.CrossModel/M1.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/M1.Serializer.cs
rename to SabreTools.Serialization.CrossModel/M1.Serializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/Mess.Deserializer.cs b/SabreTools.Serialization.CrossModel/Mess.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/Mess.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/Mess.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/Mess.Serializer.cs b/SabreTools.Serialization.CrossModel/Mess.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/Mess.Serializer.cs
rename to SabreTools.Serialization.CrossModel/Mess.Serializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/OfflineList.Deserializer.cs b/SabreTools.Serialization.CrossModel/OfflineList.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/OfflineList.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/OfflineList.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/OfflineList.Serializer.cs b/SabreTools.Serialization.CrossModel/OfflineList.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/OfflineList.Serializer.cs
rename to SabreTools.Serialization.CrossModel/OfflineList.Serializer.cs
diff --git a/SabreTools.Serialization.CrossModel/OldDotNet.cs b/SabreTools.Serialization.CrossModel/OldDotNet.cs
new file mode 100644
index 00000000..d2be0456
--- /dev/null
+++ b/SabreTools.Serialization.CrossModel/OldDotNet.cs
@@ -0,0 +1,50 @@
+#if NET20 || NET35
+
+using System;
+using System.IO;
+
+namespace SabreTools.Serialization.CrossModel
+{
+    /// <summary>
+    /// Derived from the mscorlib code from .NET Framework 4.0
+    /// </summary>
+    internal static class OldDotNet
+    {
+        public static void CopyTo(this Stream source, Stream destination)
+        {
+            if (destination is null)
+            {
+                throw new ArgumentNullException("destination");
+            }
+
+            if (!source.CanRead && !source.CanWrite)
+            {
+                throw new ObjectDisposedException(null);
+            }
+
+            if (!destination.CanRead && !destination.CanWrite)
+            {
+                throw new ObjectDisposedException("destination");
+            }
+
+            if (!source.CanRead)
+            {
+                throw new NotSupportedException();
+            }
+
+            if (!destination.CanWrite)
+            {
+                throw new NotSupportedException();
+            }
+
+            byte[] array = new byte[81920];
+            int count;
+            while ((count = source.Read(array, 0, array.Length)) != 0)
+            {
+                destination.Write(array, 0, count);
+            }
+        }
+    }
+}
+
+#endif
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/OpenMSX.Deserializer.cs b/SabreTools.Serialization.CrossModel/OpenMSX.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/OpenMSX.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/OpenMSX.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/OpenMSX.Serializer.cs b/SabreTools.Serialization.CrossModel/OpenMSX.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/OpenMSX.Serializer.cs
rename to SabreTools.Serialization.CrossModel/OpenMSX.Serializer.cs
diff --git a/SabreTools.Serialization.CrossModel/README.MD b/SabreTools.Serialization.CrossModel/README.MD
new file mode 100644
index 00000000..8687df3f
--- /dev/null
+++ b/SabreTools.Serialization.CrossModel/README.MD
@@ -0,0 +1,5 @@
+# SabreTools.Serialization.CrossModel
+
+This library contains methods for converting between different model formats. The majority of the implementations convert from specific Datfile/metadata file formats to the unified Metadata internal format.
+
+All cross-model converters implement `SabreTools.Serialization.CrossModel.ICrossModel<TSource, TDest>` which enforces bi-directional conversion.
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs b/SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs b/SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs
rename to SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs
diff --git a/SabreTools.Serialization.CrossModel/SabreTools.Serialization.CrossModel.csproj b/SabreTools.Serialization.CrossModel/SabreTools.Serialization.CrossModel.csproj
new file mode 100644
index 00000000..ba30188e
--- /dev/null
+++ b/SabreTools.Serialization.CrossModel/SabreTools.Serialization.CrossModel.csproj
@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <!-- Assembly Properties -->
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <CheckEolTargetFramework>false</CheckEolTargetFramework>
+        <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+        <IncludeSymbols>true</IncludeSymbols>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <Version>2.3.0</Version>
+
+        <!-- Package Properties -->
+        <Authors>Matt Nadareski</Authors>
+        <Description>Convert between models</Description>
+        <Copyright>Copyright (c) Matt Nadareski 2019-2026</Copyright>
+        <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <RepositoryUrl>https://github.com/SabreTools/SabreTools.Serialization</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>models conversion metadata</PackageTags>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="README.md" Pack="true" PackagePath="" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="SabreTools.Hashing" Version="[1.6.1]" />
+        <PackageReference Include="SabreTools.IO" Version="[1.9.1]" />
+     </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\SabreTools.Data.Models\SabreTools.Data.Models.csproj" />
+    </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs b/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs b/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs
rename to SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs b/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs
rename to SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs b/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs
rename to SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs
diff --git a/SabreTools.Serialization.Test/Readers/AACSTests.cs b/SabreTools.Serialization.Readers.Test/AACSTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/AACSTests.cs
rename to SabreTools.Serialization.Readers.Test/AACSTests.cs
index 086a1052..7e3204f1 100644
--- a/SabreTools.Serialization.Test/Readers/AACSTests.cs
+++ b/SabreTools.Serialization.Readers.Test/AACSTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class AACSTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/AbstractSyntaxNotationOneTests.cs b/SabreTools.Serialization.Readers.Test/AbstractSyntaxNotationOneTests.cs
similarity index 98%
rename from SabreTools.Serialization.Test/Readers/AbstractSyntaxNotationOneTests.cs
rename to SabreTools.Serialization.Readers.Test/AbstractSyntaxNotationOneTests.cs
index 8735864b..2eca6415 100644
--- a/SabreTools.Serialization.Test/Readers/AbstractSyntaxNotationOneTests.cs
+++ b/SabreTools.Serialization.Readers.Test/AbstractSyntaxNotationOneTests.cs
@@ -1,10 +1,9 @@
 using System.IO;
 using System.Linq;
 using SabreTools.Data.Models.ASN1;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class AbstractSyntaxNotationOneTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/AdvancedInstallerTests.cs b/SabreTools.Serialization.Readers.Test/AdvancedInstallerTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/AdvancedInstallerTests.cs
rename to SabreTools.Serialization.Readers.Test/AdvancedInstallerTests.cs
index 7295de83..f1263168 100644
--- a/SabreTools.Serialization.Test/Readers/AdvancedInstallerTests.cs
+++ b/SabreTools.Serialization.Readers.Test/AdvancedInstallerTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class AdvancedInstallerTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/AppPkgHeaderTests.cs b/SabreTools.Serialization.Readers.Test/AppPkgHeaderTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/AppPkgHeaderTests.cs
rename to SabreTools.Serialization.Readers.Test/AppPkgHeaderTests.cs
index 5add28e9..b61c3e7b 100644
--- a/SabreTools.Serialization.Test/Readers/AppPkgHeaderTests.cs
+++ b/SabreTools.Serialization.Readers.Test/AppPkgHeaderTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class AppPkgHeaderTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/ArchiveDotOrgTests.cs b/SabreTools.Serialization.Readers.Test/ArchiveDotOrgTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/Readers/ArchiveDotOrgTests.cs
rename to SabreTools.Serialization.Readers.Test/ArchiveDotOrgTests.cs
index 3cd47772..6dc20dcf 100644
--- a/SabreTools.Serialization.Test/Readers/ArchiveDotOrgTests.cs
+++ b/SabreTools.Serialization.Readers.Test/ArchiveDotOrgTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class ArchiveDotOrgTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/Atari7800CartTests.cs b/SabreTools.Serialization.Readers.Test/Atari7800CartTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/Atari7800CartTests.cs
rename to SabreTools.Serialization.Readers.Test/Atari7800CartTests.cs
index 67d96097..3361951e 100644
--- a/SabreTools.Serialization.Test/Readers/Atari7800CartTests.cs
+++ b/SabreTools.Serialization.Readers.Test/Atari7800CartTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class Atari7800CartTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/AtariLynxCartTests.cs b/SabreTools.Serialization.Readers.Test/AtariLynxCartTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/AtariLynxCartTests.cs
rename to SabreTools.Serialization.Readers.Test/AtariLynxCartTests.cs
index 81cb503b..44fd207b 100644
--- a/SabreTools.Serialization.Test/Readers/AtariLynxCartTests.cs
+++ b/SabreTools.Serialization.Readers.Test/AtariLynxCartTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class AtariLynxCartTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/AttractModeTests.cs b/SabreTools.Serialization.Readers.Test/AttractModeTests.cs
similarity index 98%
rename from SabreTools.Serialization.Test/Readers/AttractModeTests.cs
rename to SabreTools.Serialization.Readers.Test/AttractModeTests.cs
index c549283a..61c57d7e 100644
--- a/SabreTools.Serialization.Test/Readers/AttractModeTests.cs
+++ b/SabreTools.Serialization.Readers.Test/AttractModeTests.cs
@@ -1,10 +1,9 @@
 using System;
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class AttractModeTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/BDPlusTests.cs b/SabreTools.Serialization.Readers.Test/BDPlusTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/BDPlusTests.cs
rename to SabreTools.Serialization.Readers.Test/BDPlusTests.cs
index a917344b..8c0a7ee4 100644
--- a/SabreTools.Serialization.Test/Readers/BDPlusTests.cs
+++ b/SabreTools.Serialization.Readers.Test/BDPlusTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class BDPlusTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/BFPKTests.cs b/SabreTools.Serialization.Readers.Test/BFPKTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/BFPKTests.cs
rename to SabreTools.Serialization.Readers.Test/BFPKTests.cs
index 1d71cf76..71b95fbe 100644
--- a/SabreTools.Serialization.Test/Readers/BFPKTests.cs
+++ b/SabreTools.Serialization.Readers.Test/BFPKTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class BFPKTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/BSPTests.cs b/SabreTools.Serialization.Readers.Test/BSPTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/BSPTests.cs
rename to SabreTools.Serialization.Readers.Test/BSPTests.cs
index 37a4b2ad..97e72476 100644
--- a/SabreTools.Serialization.Test/Readers/BSPTests.cs
+++ b/SabreTools.Serialization.Readers.Test/BSPTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class BSPTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/CFBTests.cs b/SabreTools.Serialization.Readers.Test/CFBTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/CFBTests.cs
rename to SabreTools.Serialization.Readers.Test/CFBTests.cs
index bb51b2ee..45bfa853 100644
--- a/SabreTools.Serialization.Test/Readers/CFBTests.cs
+++ b/SabreTools.Serialization.Readers.Test/CFBTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class CFBTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/CHDTests.cs b/SabreTools.Serialization.Readers.Test/CHDTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/CHDTests.cs
rename to SabreTools.Serialization.Readers.Test/CHDTests.cs
index 9e5882dd..108d6330 100644
--- a/SabreTools.Serialization.Test/Readers/CHDTests.cs
+++ b/SabreTools.Serialization.Readers.Test/CHDTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class CHDTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/CIATests.cs b/SabreTools.Serialization.Readers.Test/CIATests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/CIATests.cs
rename to SabreTools.Serialization.Readers.Test/CIATests.cs
index fa9f3de5..eebfbca9 100644
--- a/SabreTools.Serialization.Test/Readers/CIATests.cs
+++ b/SabreTools.Serialization.Readers.Test/CIATests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class CIATests
     {
diff --git a/SabreTools.Serialization.Test/Readers/CatalogTests.cs b/SabreTools.Serialization.Readers.Test/CatalogTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/CatalogTests.cs
rename to SabreTools.Serialization.Readers.Test/CatalogTests.cs
index ac5ac747..f606b1f2 100644
--- a/SabreTools.Serialization.Test/Readers/CatalogTests.cs
+++ b/SabreTools.Serialization.Readers.Test/CatalogTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class CatalogTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/ClrMameProTests.cs b/SabreTools.Serialization.Readers.Test/ClrMameProTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/Readers/ClrMameProTests.cs
rename to SabreTools.Serialization.Readers.Test/ClrMameProTests.cs
index 8c919513..dbc8f149 100644
--- a/SabreTools.Serialization.Test/Readers/ClrMameProTests.cs
+++ b/SabreTools.Serialization.Readers.Test/ClrMameProTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class ClrMameProTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/CueSheetTests.cs b/SabreTools.Serialization.Readers.Test/CueSheetTests.cs
similarity index 97%
rename from SabreTools.Serialization.Test/Readers/CueSheetTests.cs
rename to SabreTools.Serialization.Readers.Test/CueSheetTests.cs
index ceca85eb..7d5e5aeb 100644
--- a/SabreTools.Serialization.Test/Readers/CueSheetTests.cs
+++ b/SabreTools.Serialization.Readers.Test/CueSheetTests.cs
@@ -2,10 +2,9 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Text;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class CueSheetTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/DosCenterTests.cs b/SabreTools.Serialization.Readers.Test/DosCenterTests.cs
similarity index 98%
rename from SabreTools.Serialization.Test/Readers/DosCenterTests.cs
rename to SabreTools.Serialization.Readers.Test/DosCenterTests.cs
index a5ecc54d..ac93632a 100644
--- a/SabreTools.Serialization.Test/Readers/DosCenterTests.cs
+++ b/SabreTools.Serialization.Readers.Test/DosCenterTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class DosCenterTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/EverdriveSMDBTests.cs b/SabreTools.Serialization.Readers.Test/EverdriveSMDBTests.cs
similarity index 97%
rename from SabreTools.Serialization.Test/Readers/EverdriveSMDBTests.cs
rename to SabreTools.Serialization.Readers.Test/EverdriveSMDBTests.cs
index 448e6a17..ddeb237d 100644
--- a/SabreTools.Serialization.Test/Readers/EverdriveSMDBTests.cs
+++ b/SabreTools.Serialization.Readers.Test/EverdriveSMDBTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class EverdriveSMDBTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/FDSTests.cs b/SabreTools.Serialization.Readers.Test/FDSTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/FDSTests.cs
rename to SabreTools.Serialization.Readers.Test/FDSTests.cs
index 0250142b..1790b77d 100644
--- a/SabreTools.Serialization.Test/Readers/FDSTests.cs
+++ b/SabreTools.Serialization.Readers.Test/FDSTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class FDSTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/GCFTests.cs b/SabreTools.Serialization.Readers.Test/GCFTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/GCFTests.cs
rename to SabreTools.Serialization.Readers.Test/GCFTests.cs
index aa99e1d1..acf40255 100644
--- a/SabreTools.Serialization.Test/Readers/GCFTests.cs
+++ b/SabreTools.Serialization.Readers.Test/GCFTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class GCFTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/GZipTests.cs b/SabreTools.Serialization.Readers.Test/GZipTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/GZipTests.cs
rename to SabreTools.Serialization.Readers.Test/GZipTests.cs
index ff69bfda..a19f1db4 100644
--- a/SabreTools.Serialization.Test/Readers/GZipTests.cs
+++ b/SabreTools.Serialization.Readers.Test/GZipTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class GZipTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/HashfileTests.cs b/SabreTools.Serialization.Readers.Test/HashfileTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/Readers/HashfileTests.cs
rename to SabreTools.Serialization.Readers.Test/HashfileTests.cs
index 9ceaed1f..0ece735b 100644
--- a/SabreTools.Serialization.Test/Readers/HashfileTests.cs
+++ b/SabreTools.Serialization.Readers.Test/HashfileTests.cs
@@ -2,10 +2,9 @@ using System;
 using System.IO;
 using System.Linq;
 using SabreTools.Hashing;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class HashfileTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/IRDTests.cs b/SabreTools.Serialization.Readers.Test/IRDTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/IRDTests.cs
rename to SabreTools.Serialization.Readers.Test/IRDTests.cs
index 04bbca5c..e92b813a 100644
--- a/SabreTools.Serialization.Test/Readers/IRDTests.cs
+++ b/SabreTools.Serialization.Readers.Test/IRDTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class IRDTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/ISO9660Tests.cs b/SabreTools.Serialization.Readers.Test/ISO9660Tests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/ISO9660Tests.cs
rename to SabreTools.Serialization.Readers.Test/ISO9660Tests.cs
index d23ee51c..91504c40 100644
--- a/SabreTools.Serialization.Test/Readers/ISO9660Tests.cs
+++ b/SabreTools.Serialization.Readers.Test/ISO9660Tests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class ISO9660Tests
     {
diff --git a/SabreTools.Serialization.Test/Readers/InstallShieldArchiveV3Tests.cs b/SabreTools.Serialization.Readers.Test/InstallShieldArchiveV3Tests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/InstallShieldArchiveV3Tests.cs
rename to SabreTools.Serialization.Readers.Test/InstallShieldArchiveV3Tests.cs
index b3934172..1cfc891f 100644
--- a/SabreTools.Serialization.Test/Readers/InstallShieldArchiveV3Tests.cs
+++ b/SabreTools.Serialization.Readers.Test/InstallShieldArchiveV3Tests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class InstallShieldArchiveV3Tests
     {
diff --git a/SabreTools.Serialization.Test/Readers/InstallShieldCabinetTests.cs b/SabreTools.Serialization.Readers.Test/InstallShieldCabinetTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/InstallShieldCabinetTests.cs
rename to SabreTools.Serialization.Readers.Test/InstallShieldCabinetTests.cs
index 8a3f25b7..211c7afb 100644
--- a/SabreTools.Serialization.Test/Readers/InstallShieldCabinetTests.cs
+++ b/SabreTools.Serialization.Readers.Test/InstallShieldCabinetTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class InstallShieldCabinetTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/InstallShieldExecutableTests.cs b/SabreTools.Serialization.Readers.Test/InstallShieldExecutableTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/InstallShieldExecutableTests.cs
rename to SabreTools.Serialization.Readers.Test/InstallShieldExecutableTests.cs
index 0db81f14..e13f8801 100644
--- a/SabreTools.Serialization.Test/Readers/InstallShieldExecutableTests.cs
+++ b/SabreTools.Serialization.Readers.Test/InstallShieldExecutableTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class InstallShieldExecutableTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/LZKWAJTests.cs b/SabreTools.Serialization.Readers.Test/LZKWAJTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/LZKWAJTests.cs
rename to SabreTools.Serialization.Readers.Test/LZKWAJTests.cs
index c4332869..f0b12fa5 100644
--- a/SabreTools.Serialization.Test/Readers/LZKWAJTests.cs
+++ b/SabreTools.Serialization.Readers.Test/LZKWAJTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class LZKWAJTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/LZQBasicTests.cs b/SabreTools.Serialization.Readers.Test/LZQBasicTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/LZQBasicTests.cs
rename to SabreTools.Serialization.Readers.Test/LZQBasicTests.cs
index 42590aa5..82141a61 100644
--- a/SabreTools.Serialization.Test/Readers/LZQBasicTests.cs
+++ b/SabreTools.Serialization.Readers.Test/LZQBasicTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class LZQBasicTests
 
diff --git a/SabreTools.Serialization.Test/Readers/LZSZDDTests.cs b/SabreTools.Serialization.Readers.Test/LZSZDDTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/LZSZDDTests.cs
rename to SabreTools.Serialization.Readers.Test/LZSZDDTests.cs
index 7e06913a..305d46ef 100644
--- a/SabreTools.Serialization.Test/Readers/LZSZDDTests.cs
+++ b/SabreTools.Serialization.Readers.Test/LZSZDDTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class LZSZDDTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/LinearExecutableTests.cs b/SabreTools.Serialization.Readers.Test/LinearExecutableTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/LinearExecutableTests.cs
rename to SabreTools.Serialization.Readers.Test/LinearExecutableTests.cs
index 03bf46b8..a16647e4 100644
--- a/SabreTools.Serialization.Test/Readers/LinearExecutableTests.cs
+++ b/SabreTools.Serialization.Readers.Test/LinearExecutableTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class LinearExecutableTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/ListromTests.cs b/SabreTools.Serialization.Readers.Test/ListromTests.cs
similarity index 98%
rename from SabreTools.Serialization.Test/Readers/ListromTests.cs
rename to SabreTools.Serialization.Readers.Test/ListromTests.cs
index 8347700c..fb20b94e 100644
--- a/SabreTools.Serialization.Test/Readers/ListromTests.cs
+++ b/SabreTools.Serialization.Readers.Test/ListromTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class ListromTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/ListxmlTests.cs b/SabreTools.Serialization.Readers.Test/ListxmlTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/Readers/ListxmlTests.cs
rename to SabreTools.Serialization.Readers.Test/ListxmlTests.cs
index a761262e..6f59387a 100644
--- a/SabreTools.Serialization.Test/Readers/ListxmlTests.cs
+++ b/SabreTools.Serialization.Readers.Test/ListxmlTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class ListxmlTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/LogiqxTests.cs b/SabreTools.Serialization.Readers.Test/LogiqxTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/Readers/LogiqxTests.cs
rename to SabreTools.Serialization.Readers.Test/LogiqxTests.cs
index c28b36c7..6fda20cc 100644
--- a/SabreTools.Serialization.Test/Readers/LogiqxTests.cs
+++ b/SabreTools.Serialization.Readers.Test/LogiqxTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class LogiqxTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/M1Tests.cs b/SabreTools.Serialization.Readers.Test/M1Tests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/Readers/M1Tests.cs
rename to SabreTools.Serialization.Readers.Test/M1Tests.cs
index c64f6e21..5a6d72e4 100644
--- a/SabreTools.Serialization.Test/Readers/M1Tests.cs
+++ b/SabreTools.Serialization.Readers.Test/M1Tests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class M1Tests
     {
diff --git a/SabreTools.Serialization.Test/Readers/MSDOSTests.cs b/SabreTools.Serialization.Readers.Test/MSDOSTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/MSDOSTests.cs
rename to SabreTools.Serialization.Readers.Test/MSDOSTests.cs
index 42fa3cb4..d6fbd617 100644
--- a/SabreTools.Serialization.Test/Readers/MSDOSTests.cs
+++ b/SabreTools.Serialization.Readers.Test/MSDOSTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class MSDOSTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/MessTests.cs b/SabreTools.Serialization.Readers.Test/MessTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/Readers/MessTests.cs
rename to SabreTools.Serialization.Readers.Test/MessTests.cs
index 3a3acac2..3da5af9f 100644
--- a/SabreTools.Serialization.Test/Readers/MessTests.cs
+++ b/SabreTools.Serialization.Readers.Test/MessTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class MessTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/MicrosoftCabinetTests.cs b/SabreTools.Serialization.Readers.Test/MicrosoftCabinetTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/MicrosoftCabinetTests.cs
rename to SabreTools.Serialization.Readers.Test/MicrosoftCabinetTests.cs
index b31412d7..413da699 100644
--- a/SabreTools.Serialization.Test/Readers/MicrosoftCabinetTests.cs
+++ b/SabreTools.Serialization.Readers.Test/MicrosoftCabinetTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class MicrosoftCabinetTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/MoPaQTests.cs b/SabreTools.Serialization.Readers.Test/MoPaQTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/MoPaQTests.cs
rename to SabreTools.Serialization.Readers.Test/MoPaQTests.cs
index 98f87401..17deec87 100644
--- a/SabreTools.Serialization.Test/Readers/MoPaQTests.cs
+++ b/SabreTools.Serialization.Readers.Test/MoPaQTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class MoPaQTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/N3DSTests.cs b/SabreTools.Serialization.Readers.Test/N3DSTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/N3DSTests.cs
rename to SabreTools.Serialization.Readers.Test/N3DSTests.cs
index e87789f8..17678608 100644
--- a/SabreTools.Serialization.Test/Readers/N3DSTests.cs
+++ b/SabreTools.Serialization.Readers.Test/N3DSTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class N3DSTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/NCFTests.cs b/SabreTools.Serialization.Readers.Test/NCFTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/NCFTests.cs
rename to SabreTools.Serialization.Readers.Test/NCFTests.cs
index a454963c..62715a84 100644
--- a/SabreTools.Serialization.Test/Readers/NCFTests.cs
+++ b/SabreTools.Serialization.Readers.Test/NCFTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class NCFTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/NESCartTests.cs b/SabreTools.Serialization.Readers.Test/NESCartTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/NESCartTests.cs
rename to SabreTools.Serialization.Readers.Test/NESCartTests.cs
index 532ebce1..b6cc277f 100644
--- a/SabreTools.Serialization.Test/Readers/NESCartTests.cs
+++ b/SabreTools.Serialization.Readers.Test/NESCartTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class NESCartTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/NewExecutableTests.cs b/SabreTools.Serialization.Readers.Test/NewExecutableTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/NewExecutableTests.cs
rename to SabreTools.Serialization.Readers.Test/NewExecutableTests.cs
index 3c71d3fb..86f53078 100644
--- a/SabreTools.Serialization.Test/Readers/NewExecutableTests.cs
+++ b/SabreTools.Serialization.Readers.Test/NewExecutableTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class NewExecutableTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/NitroTests.cs b/SabreTools.Serialization.Readers.Test/NitroTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/NitroTests.cs
rename to SabreTools.Serialization.Readers.Test/NitroTests.cs
index 68b798b4..b1cd5d85 100644
--- a/SabreTools.Serialization.Test/Readers/NitroTests.cs
+++ b/SabreTools.Serialization.Readers.Test/NitroTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class NitroTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/OfflineListTests.cs b/SabreTools.Serialization.Readers.Test/OfflineListTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/Readers/OfflineListTests.cs
rename to SabreTools.Serialization.Readers.Test/OfflineListTests.cs
index 4d41ea78..cb5372b6 100644
--- a/SabreTools.Serialization.Test/Readers/OfflineListTests.cs
+++ b/SabreTools.Serialization.Readers.Test/OfflineListTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class OfflineListTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/OpenMSXTests.cs b/SabreTools.Serialization.Readers.Test/OpenMSXTests.cs
similarity index 98%
rename from SabreTools.Serialization.Test/Readers/OpenMSXTests.cs
rename to SabreTools.Serialization.Readers.Test/OpenMSXTests.cs
index 237c3b27..52fc7204 100644
--- a/SabreTools.Serialization.Test/Readers/OpenMSXTests.cs
+++ b/SabreTools.Serialization.Readers.Test/OpenMSXTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class OpenMSXTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/PAKTests.cs b/SabreTools.Serialization.Readers.Test/PAKTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/PAKTests.cs
rename to SabreTools.Serialization.Readers.Test/PAKTests.cs
index eceae803..cbd0c3fa 100644
--- a/SabreTools.Serialization.Test/Readers/PAKTests.cs
+++ b/SabreTools.Serialization.Readers.Test/PAKTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class PAKTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/PFFTests.cs b/SabreTools.Serialization.Readers.Test/PFFTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/PFFTests.cs
rename to SabreTools.Serialization.Readers.Test/PFFTests.cs
index a2ac77f7..c25cafce 100644
--- a/SabreTools.Serialization.Test/Readers/PFFTests.cs
+++ b/SabreTools.Serialization.Readers.Test/PFFTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class PFFTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/PICTests.cs b/SabreTools.Serialization.Readers.Test/PICTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/PICTests.cs
rename to SabreTools.Serialization.Readers.Test/PICTests.cs
index a8d7b350..90131eb5 100644
--- a/SabreTools.Serialization.Test/Readers/PICTests.cs
+++ b/SabreTools.Serialization.Readers.Test/PICTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class PICTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/PKZIPTests.cs b/SabreTools.Serialization.Readers.Test/PKZIPTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/PKZIPTests.cs
rename to SabreTools.Serialization.Readers.Test/PKZIPTests.cs
index 48c1fac3..5a98b44b 100644
--- a/SabreTools.Serialization.Test/Readers/PKZIPTests.cs
+++ b/SabreTools.Serialization.Readers.Test/PKZIPTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class PKZIPTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/PlayJAudioTests.cs b/SabreTools.Serialization.Readers.Test/PlayJAudioTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/PlayJAudioTests.cs
rename to SabreTools.Serialization.Readers.Test/PlayJAudioTests.cs
index 2aa26141..00580481 100644
--- a/SabreTools.Serialization.Test/Readers/PlayJAudioTests.cs
+++ b/SabreTools.Serialization.Readers.Test/PlayJAudioTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class PlayJAudioTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/PlayJPlaylistTests.cs b/SabreTools.Serialization.Readers.Test/PlayJPlaylistTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/PlayJPlaylistTests.cs
rename to SabreTools.Serialization.Readers.Test/PlayJPlaylistTests.cs
index c312822f..3ff9bc32 100644
--- a/SabreTools.Serialization.Test/Readers/PlayJPlaylistTests.cs
+++ b/SabreTools.Serialization.Readers.Test/PlayJPlaylistTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class PlayJPlaylistTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/PortableExecutableTests.cs b/SabreTools.Serialization.Readers.Test/PortableExecutableTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/PortableExecutableTests.cs
rename to SabreTools.Serialization.Readers.Test/PortableExecutableTests.cs
index ca1e8f7a..2fade310 100644
--- a/SabreTools.Serialization.Test/Readers/PortableExecutableTests.cs
+++ b/SabreTools.Serialization.Readers.Test/PortableExecutableTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class PortableExecutableTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/QDTests.cs b/SabreTools.Serialization.Readers.Test/QDTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/QDTests.cs
rename to SabreTools.Serialization.Readers.Test/QDTests.cs
index 1a56cce4..071de678 100644
--- a/SabreTools.Serialization.Test/Readers/QDTests.cs
+++ b/SabreTools.Serialization.Readers.Test/QDTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class QDTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/QuantumTests.cs b/SabreTools.Serialization.Readers.Test/QuantumTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/QuantumTests.cs
rename to SabreTools.Serialization.Readers.Test/QuantumTests.cs
index edef770b..1c425807 100644
--- a/SabreTools.Serialization.Test/Readers/QuantumTests.cs
+++ b/SabreTools.Serialization.Readers.Test/QuantumTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class QuantumTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/RomCenterTests.cs b/SabreTools.Serialization.Readers.Test/RomCenterTests.cs
similarity index 98%
rename from SabreTools.Serialization.Test/Readers/RomCenterTests.cs
rename to SabreTools.Serialization.Readers.Test/RomCenterTests.cs
index 03fa803e..cd4de0aa 100644
--- a/SabreTools.Serialization.Test/Readers/RomCenterTests.cs
+++ b/SabreTools.Serialization.Readers.Test/RomCenterTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class RomCenterTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/SFBTests.cs b/SabreTools.Serialization.Readers.Test/SFBTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/SFBTests.cs
rename to SabreTools.Serialization.Readers.Test/SFBTests.cs
index 89bc2260..bb53c621 100644
--- a/SabreTools.Serialization.Test/Readers/SFBTests.cs
+++ b/SabreTools.Serialization.Readers.Test/SFBTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class SFBTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/SFOTests.cs b/SabreTools.Serialization.Readers.Test/SFOTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/SFOTests.cs
rename to SabreTools.Serialization.Readers.Test/SFOTests.cs
index e9916a05..50327567 100644
--- a/SabreTools.Serialization.Test/Readers/SFOTests.cs
+++ b/SabreTools.Serialization.Readers.Test/SFOTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class SFOTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/SGATests.cs b/SabreTools.Serialization.Readers.Test/SGATests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/SGATests.cs
rename to SabreTools.Serialization.Readers.Test/SGATests.cs
index 2e7c2931..e0fa62f4 100644
--- a/SabreTools.Serialization.Test/Readers/SGATests.cs
+++ b/SabreTools.Serialization.Readers.Test/SGATests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class SGATests
     {
diff --git a/SabreTools.Serialization.Readers.Test/SabreTools.Serialization.Readers.Test.csproj b/SabreTools.Serialization.Readers.Test/SabreTools.Serialization.Readers.Test.csproj
new file mode 100644
index 00000000..3ec125e1
--- /dev/null
+++ b/SabreTools.Serialization.Readers.Test/SabreTools.Serialization.Readers.Test.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+        <IsPackable>false</IsPackable>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="8.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\SabreTools.Serialization.Readers\SabreTools.Serialization.Readers.csproj" />
+        <ProjectReference Include="..\SabreTools.Serialization.Writers\SabreTools.Serialization.Writers.csproj" />
+    </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/SabreTools.Serialization.Test/Readers/SeparatedValueTests.cs b/SabreTools.Serialization.Readers.Test/SeparatedValueTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/Readers/SeparatedValueTests.cs
rename to SabreTools.Serialization.Readers.Test/SeparatedValueTests.cs
index caa19284..3e1d14d9 100644
--- a/SabreTools.Serialization.Test/Readers/SeparatedValueTests.cs
+++ b/SabreTools.Serialization.Readers.Test/SeparatedValueTests.cs
@@ -1,10 +1,9 @@
 using System;
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class SeparatedValueTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/SkuSisTests.cs b/SabreTools.Serialization.Readers.Test/SkuSisTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/SkuSisTests.cs
rename to SabreTools.Serialization.Readers.Test/SkuSisTests.cs
index 3067f6db..b7bd4c9a 100644
--- a/SabreTools.Serialization.Test/Readers/SkuSisTests.cs
+++ b/SabreTools.Serialization.Readers.Test/SkuSisTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class SkuSisTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/SoftwareListTests.cs b/SabreTools.Serialization.Readers.Test/SoftwareListTests.cs
similarity index 98%
rename from SabreTools.Serialization.Test/Readers/SoftwareListTests.cs
rename to SabreTools.Serialization.Readers.Test/SoftwareListTests.cs
index 97384073..2f77bbf0 100644
--- a/SabreTools.Serialization.Test/Readers/SoftwareListTests.cs
+++ b/SabreTools.Serialization.Readers.Test/SoftwareListTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class SoftwareListTests
     {
@@ -75,7 +74,7 @@ namespace SabreTools.Serialization.Test.Readers
         {
             // Get the serializer and deserializer
             var deserializer = new SoftwareList();
-            var serializer = new Serialization.Writers.SoftwareList();
+            var serializer = new Writers.SoftwareList();
 
             // Build the data
             Data.Models.SoftwareList.SoftwareList sl = Build();
diff --git a/SabreTools.Serialization.Test/Readers/TapeArchiveTests.cs b/SabreTools.Serialization.Readers.Test/TapeArchiveTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/TapeArchiveTests.cs
rename to SabreTools.Serialization.Readers.Test/TapeArchiveTests.cs
index 803d61b5..4fe5b090 100644
--- a/SabreTools.Serialization.Test/Readers/TapeArchiveTests.cs
+++ b/SabreTools.Serialization.Readers.Test/TapeArchiveTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class TapeArchiveTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/VBSPTests.cs b/SabreTools.Serialization.Readers.Test/VBSPTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/VBSPTests.cs
rename to SabreTools.Serialization.Readers.Test/VBSPTests.cs
index 219491ab..7592ce25 100644
--- a/SabreTools.Serialization.Test/Readers/VBSPTests.cs
+++ b/SabreTools.Serialization.Readers.Test/VBSPTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class VBSPTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/VPKTests.cs b/SabreTools.Serialization.Readers.Test/VPKTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/VPKTests.cs
rename to SabreTools.Serialization.Readers.Test/VPKTests.cs
index 59f73381..7c6a7f03 100644
--- a/SabreTools.Serialization.Test/Readers/VPKTests.cs
+++ b/SabreTools.Serialization.Readers.Test/VPKTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class VPKTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/WAD3Tests.cs b/SabreTools.Serialization.Readers.Test/WAD3Tests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/WAD3Tests.cs
rename to SabreTools.Serialization.Readers.Test/WAD3Tests.cs
index e1987360..f11dd088 100644
--- a/SabreTools.Serialization.Test/Readers/WAD3Tests.cs
+++ b/SabreTools.Serialization.Readers.Test/WAD3Tests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class WAD3Tests
     {
diff --git a/SabreTools.Serialization.Test/Readers/WiseOverlayHeaderTests.cs b/SabreTools.Serialization.Readers.Test/WiseOverlayHeaderTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/WiseOverlayHeaderTests.cs
rename to SabreTools.Serialization.Readers.Test/WiseOverlayHeaderTests.cs
index fc0aa695..efed55e2 100644
--- a/SabreTools.Serialization.Test/Readers/WiseOverlayHeaderTests.cs
+++ b/SabreTools.Serialization.Readers.Test/WiseOverlayHeaderTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class WiseOverlayHeaderTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/WiseScriptTests.cs b/SabreTools.Serialization.Readers.Test/WiseScriptTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/WiseScriptTests.cs
rename to SabreTools.Serialization.Readers.Test/WiseScriptTests.cs
index 7c08c32e..8c68f97c 100644
--- a/SabreTools.Serialization.Test/Readers/WiseScriptTests.cs
+++ b/SabreTools.Serialization.Readers.Test/WiseScriptTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class WiseScriptTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/WiseSectionHeaderTests.cs b/SabreTools.Serialization.Readers.Test/WiseSectionHeaderTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/WiseSectionHeaderTests.cs
rename to SabreTools.Serialization.Readers.Test/WiseSectionHeaderTests.cs
index 0e74b77a..6c69f9e3 100644
--- a/SabreTools.Serialization.Test/Readers/WiseSectionHeaderTests.cs
+++ b/SabreTools.Serialization.Readers.Test/WiseSectionHeaderTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class WiseSectionHeaderTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/XMIDTests.cs b/SabreTools.Serialization.Readers.Test/XMIDTests.cs
similarity index 90%
rename from SabreTools.Serialization.Test/Readers/XMIDTests.cs
rename to SabreTools.Serialization.Readers.Test/XMIDTests.cs
index 20e26fcb..86422bbd 100644
--- a/SabreTools.Serialization.Test/Readers/XMIDTests.cs
+++ b/SabreTools.Serialization.Readers.Test/XMIDTests.cs
@@ -1,8 +1,7 @@
 
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class XMIDTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/XZPTests.cs b/SabreTools.Serialization.Readers.Test/XZPTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/XZPTests.cs
rename to SabreTools.Serialization.Readers.Test/XZPTests.cs
index c7718d35..ea78c0cc 100644
--- a/SabreTools.Serialization.Test/Readers/XZPTests.cs
+++ b/SabreTools.Serialization.Readers.Test/XZPTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class XZPTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/XZTests.cs b/SabreTools.Serialization.Readers.Test/XZTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/XZTests.cs
rename to SabreTools.Serialization.Readers.Test/XZTests.cs
index a73ba872..4fca8723 100644
--- a/SabreTools.Serialization.Test/Readers/XZTests.cs
+++ b/SabreTools.Serialization.Readers.Test/XZTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class XZTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/XboxExecutableTests.cs b/SabreTools.Serialization.Readers.Test/XboxExecutableTests.cs
similarity index 95%
rename from SabreTools.Serialization.Test/Readers/XboxExecutableTests.cs
rename to SabreTools.Serialization.Readers.Test/XboxExecutableTests.cs
index 155b5cca..b57423c0 100644
--- a/SabreTools.Serialization.Test/Readers/XboxExecutableTests.cs
+++ b/SabreTools.Serialization.Readers.Test/XboxExecutableTests.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Linq;
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class XboxExecutableTests
     {
diff --git a/SabreTools.Serialization.Test/Readers/XeMIDTests.cs b/SabreTools.Serialization.Readers.Test/XeMIDTests.cs
similarity index 90%
rename from SabreTools.Serialization.Test/Readers/XeMIDTests.cs
rename to SabreTools.Serialization.Readers.Test/XeMIDTests.cs
index c96d3cf9..b5ac3f00 100644
--- a/SabreTools.Serialization.Test/Readers/XeMIDTests.cs
+++ b/SabreTools.Serialization.Readers.Test/XeMIDTests.cs
@@ -1,7 +1,6 @@
-using SabreTools.Serialization.Readers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Readers
+namespace SabreTools.Serialization.Readers.Test
 {
     public class XeMIDTests
     {
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/AACS.cs b/SabreTools.Serialization.Readers/AACS.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/AACS.cs
rename to SabreTools.Serialization.Readers/AACS.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/AbstractSyntaxNotationOne.cs b/SabreTools.Serialization.Readers/AbstractSyntaxNotationOne.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/AbstractSyntaxNotationOne.cs
rename to SabreTools.Serialization.Readers/AbstractSyntaxNotationOne.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/AdvancedInstaller.cs b/SabreTools.Serialization.Readers/AdvancedInstaller.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/AdvancedInstaller.cs
rename to SabreTools.Serialization.Readers/AdvancedInstaller.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/AppPkgHeader.cs b/SabreTools.Serialization.Readers/AppPkgHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/AppPkgHeader.cs
rename to SabreTools.Serialization.Readers/AppPkgHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/ArchiveDotOrg.cs b/SabreTools.Serialization.Readers/ArchiveDotOrg.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/ArchiveDotOrg.cs
rename to SabreTools.Serialization.Readers/ArchiveDotOrg.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/Atari7800Cart.cs b/SabreTools.Serialization.Readers/Atari7800Cart.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/Atari7800Cart.cs
rename to SabreTools.Serialization.Readers/Atari7800Cart.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/AtariLynxCart.cs b/SabreTools.Serialization.Readers/AtariLynxCart.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/AtariLynxCart.cs
rename to SabreTools.Serialization.Readers/AtariLynxCart.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/AttractMode.cs b/SabreTools.Serialization.Readers/AttractMode.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/AttractMode.cs
rename to SabreTools.Serialization.Readers/AttractMode.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/BDPlus.cs b/SabreTools.Serialization.Readers/BDPlus.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/BDPlus.cs
rename to SabreTools.Serialization.Readers/BDPlus.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/BFPK.cs b/SabreTools.Serialization.Readers/BFPK.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/BFPK.cs
rename to SabreTools.Serialization.Readers/BFPK.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/BSP.cs b/SabreTools.Serialization.Readers/BSP.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/BSP.cs
rename to SabreTools.Serialization.Readers/BSP.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/BaseBinaryReader.cs b/SabreTools.Serialization.Readers/BaseBinaryReader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/BaseBinaryReader.cs
rename to SabreTools.Serialization.Readers/BaseBinaryReader.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/CDROM.cs b/SabreTools.Serialization.Readers/CDROM.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/CDROM.cs
rename to SabreTools.Serialization.Readers/CDROM.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/CFB.cs b/SabreTools.Serialization.Readers/CFB.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/CFB.cs
rename to SabreTools.Serialization.Readers/CFB.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/CHD.cs b/SabreTools.Serialization.Readers/CHD.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/CHD.cs
rename to SabreTools.Serialization.Readers/CHD.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/CIA.cs b/SabreTools.Serialization.Readers/CIA.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/CIA.cs
rename to SabreTools.Serialization.Readers/CIA.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/Catalog.cs b/SabreTools.Serialization.Readers/Catalog.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/Catalog.cs
rename to SabreTools.Serialization.Readers/Catalog.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/ClrMamePro.cs b/SabreTools.Serialization.Readers/ClrMamePro.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/ClrMamePro.cs
rename to SabreTools.Serialization.Readers/ClrMamePro.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/CueSheet.cs b/SabreTools.Serialization.Readers/CueSheet.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/CueSheet.cs
rename to SabreTools.Serialization.Readers/CueSheet.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/DosCenter.cs b/SabreTools.Serialization.Readers/DosCenter.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/DosCenter.cs
rename to SabreTools.Serialization.Readers/DosCenter.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/EverdriveSMDB.cs b/SabreTools.Serialization.Readers/EverdriveSMDB.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/EverdriveSMDB.cs
rename to SabreTools.Serialization.Readers/EverdriveSMDB.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/FDS.cs b/SabreTools.Serialization.Readers/FDS.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/FDS.cs
rename to SabreTools.Serialization.Readers/FDS.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/GCF.cs b/SabreTools.Serialization.Readers/GCF.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/GCF.cs
rename to SabreTools.Serialization.Readers/GCF.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/GZip.cs b/SabreTools.Serialization.Readers/GZip.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/GZip.cs
rename to SabreTools.Serialization.Readers/GZip.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/Hashfile.cs b/SabreTools.Serialization.Readers/Hashfile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/Hashfile.cs
rename to SabreTools.Serialization.Readers/Hashfile.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/IByteReader.cs b/SabreTools.Serialization.Readers/IByteReader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/IByteReader.cs
rename to SabreTools.Serialization.Readers/IByteReader.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/IFileReader.cs b/SabreTools.Serialization.Readers/IFileReader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/IFileReader.cs
rename to SabreTools.Serialization.Readers/IFileReader.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/IRD.cs b/SabreTools.Serialization.Readers/IRD.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/IRD.cs
rename to SabreTools.Serialization.Readers/IRD.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/ISO9660.cs b/SabreTools.Serialization.Readers/ISO9660.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/ISO9660.cs
rename to SabreTools.Serialization.Readers/ISO9660.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/IStreamReader.cs b/SabreTools.Serialization.Readers/IStreamReader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/IStreamReader.cs
rename to SabreTools.Serialization.Readers/IStreamReader.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/IStringReader.cs b/SabreTools.Serialization.Readers/IStringReader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/IStringReader.cs
rename to SabreTools.Serialization.Readers/IStringReader.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/InstallShieldArchiveV3.cs b/SabreTools.Serialization.Readers/InstallShieldArchiveV3.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/InstallShieldArchiveV3.cs
rename to SabreTools.Serialization.Readers/InstallShieldArchiveV3.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/InstallShieldCabinet.cs b/SabreTools.Serialization.Readers/InstallShieldCabinet.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/InstallShieldCabinet.cs
rename to SabreTools.Serialization.Readers/InstallShieldCabinet.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/InstallShieldExecutable.cs b/SabreTools.Serialization.Readers/InstallShieldExecutable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/InstallShieldExecutable.cs
rename to SabreTools.Serialization.Readers/InstallShieldExecutable.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/JsonFile.cs b/SabreTools.Serialization.Readers/JsonFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/JsonFile.cs
rename to SabreTools.Serialization.Readers/JsonFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/LZKWAJ.cs b/SabreTools.Serialization.Readers/LZKWAJ.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/LZKWAJ.cs
rename to SabreTools.Serialization.Readers/LZKWAJ.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/LZQBasic.cs b/SabreTools.Serialization.Readers/LZQBasic.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/LZQBasic.cs
rename to SabreTools.Serialization.Readers/LZQBasic.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/LZSZDD.cs b/SabreTools.Serialization.Readers/LZSZDD.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/LZSZDD.cs
rename to SabreTools.Serialization.Readers/LZSZDD.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/LinearExecutable.cs b/SabreTools.Serialization.Readers/LinearExecutable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/LinearExecutable.cs
rename to SabreTools.Serialization.Readers/LinearExecutable.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/Listrom.cs b/SabreTools.Serialization.Readers/Listrom.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/Listrom.cs
rename to SabreTools.Serialization.Readers/Listrom.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/Listxml.cs b/SabreTools.Serialization.Readers/Listxml.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/Listxml.cs
rename to SabreTools.Serialization.Readers/Listxml.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/Logiqx.cs b/SabreTools.Serialization.Readers/Logiqx.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/Logiqx.cs
rename to SabreTools.Serialization.Readers/Logiqx.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/M1.cs b/SabreTools.Serialization.Readers/M1.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/M1.cs
rename to SabreTools.Serialization.Readers/M1.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/MSDOS.cs b/SabreTools.Serialization.Readers/MSDOS.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/MSDOS.cs
rename to SabreTools.Serialization.Readers/MSDOS.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/Mess.cs b/SabreTools.Serialization.Readers/Mess.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/Mess.cs
rename to SabreTools.Serialization.Readers/Mess.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/MicrosoftCabinet.cs b/SabreTools.Serialization.Readers/MicrosoftCabinet.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/MicrosoftCabinet.cs
rename to SabreTools.Serialization.Readers/MicrosoftCabinet.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/MoPaQ.cs b/SabreTools.Serialization.Readers/MoPaQ.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/MoPaQ.cs
rename to SabreTools.Serialization.Readers/MoPaQ.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/N3DS.cs b/SabreTools.Serialization.Readers/N3DS.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/N3DS.cs
rename to SabreTools.Serialization.Readers/N3DS.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/NCF.cs b/SabreTools.Serialization.Readers/NCF.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/NCF.cs
rename to SabreTools.Serialization.Readers/NCF.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/NESCart.cs b/SabreTools.Serialization.Readers/NESCart.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/NESCart.cs
rename to SabreTools.Serialization.Readers/NESCart.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/NewExecutable.cs b/SabreTools.Serialization.Readers/NewExecutable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/NewExecutable.cs
rename to SabreTools.Serialization.Readers/NewExecutable.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/Nitro.cs b/SabreTools.Serialization.Readers/Nitro.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/Nitro.cs
rename to SabreTools.Serialization.Readers/Nitro.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/OfflineList.cs b/SabreTools.Serialization.Readers/OfflineList.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/OfflineList.cs
rename to SabreTools.Serialization.Readers/OfflineList.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/OpenMSX.cs b/SabreTools.Serialization.Readers/OpenMSX.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/OpenMSX.cs
rename to SabreTools.Serialization.Readers/OpenMSX.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/PAK.cs b/SabreTools.Serialization.Readers/PAK.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/PAK.cs
rename to SabreTools.Serialization.Readers/PAK.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/PFF.cs b/SabreTools.Serialization.Readers/PFF.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/PFF.cs
rename to SabreTools.Serialization.Readers/PFF.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/PIC.cs b/SabreTools.Serialization.Readers/PIC.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/PIC.cs
rename to SabreTools.Serialization.Readers/PIC.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/PKZIP.cs b/SabreTools.Serialization.Readers/PKZIP.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/PKZIP.cs
rename to SabreTools.Serialization.Readers/PKZIP.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/PlayJAudio.cs b/SabreTools.Serialization.Readers/PlayJAudio.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/PlayJAudio.cs
rename to SabreTools.Serialization.Readers/PlayJAudio.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/PlayJPlaylist.cs b/SabreTools.Serialization.Readers/PlayJPlaylist.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/PlayJPlaylist.cs
rename to SabreTools.Serialization.Readers/PlayJPlaylist.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/PortableExecutable.cs b/SabreTools.Serialization.Readers/PortableExecutable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/PortableExecutable.cs
rename to SabreTools.Serialization.Readers/PortableExecutable.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/QD.cs b/SabreTools.Serialization.Readers/QD.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/QD.cs
rename to SabreTools.Serialization.Readers/QD.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/Quantum.cs b/SabreTools.Serialization.Readers/Quantum.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/Quantum.cs
rename to SabreTools.Serialization.Readers/Quantum.cs
diff --git a/SabreTools.Serialization.Readers/README.MD b/SabreTools.Serialization.Readers/README.MD
new file mode 100644
index 00000000..f63a2c14
--- /dev/null
+++ b/SabreTools.Serialization.Readers/README.MD
@@ -0,0 +1,12 @@
+# SabreTools.Serialization.Readers
+
+This library contains methods for reading in data from various input sources into models that are defined in `SabreTools.Data.Models`.
+
+Reader classes can inherit from one or more interfaces, as seen in the table below:
+
+| Interface Name | Source Type | Destination Type |
+| --- | --- | --- |
+| `SabreTools.Serialization.Readers.IByteReader<TModel>` | `byte[]?` | `TModel` |
+| `SabreTools.Serialization.Readers.IFileReader<TModel>` | `string?` path | `TModel` |
+| `SabreTools.Serialization.Readers.IStreamReader<TModel>` | `Stream?` | `TModel` |
+| `SabreTools.Serialization.Readers.IStringReader<TModel>` | `string?` representation | `TModel` |
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/RomCenter.cs b/SabreTools.Serialization.Readers/RomCenter.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/RomCenter.cs
rename to SabreTools.Serialization.Readers/RomCenter.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/SFB.cs b/SabreTools.Serialization.Readers/SFB.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/SFB.cs
rename to SabreTools.Serialization.Readers/SFB.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/SFO.cs b/SabreTools.Serialization.Readers/SFO.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/SFO.cs
rename to SabreTools.Serialization.Readers/SFO.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/SGA.cs b/SabreTools.Serialization.Readers/SGA.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/SGA.cs
rename to SabreTools.Serialization.Readers/SGA.cs
diff --git a/SabreTools.Serialization.Readers/SabreTools.Serialization.Readers.csproj b/SabreTools.Serialization.Readers/SabreTools.Serialization.Readers.csproj
new file mode 100644
index 00000000..8cf2b1af
--- /dev/null
+++ b/SabreTools.Serialization.Readers/SabreTools.Serialization.Readers.csproj
@@ -0,0 +1,49 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <!-- Assembly Properties -->
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <CheckEolTargetFramework>false</CheckEolTargetFramework>
+        <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+        <IncludeSymbols>true</IncludeSymbols>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <Version>2.3.0</Version>
+
+        <!-- Package Properties -->
+        <Authors>Matt Nadareski</Authors>
+        <Description>Convert from external sources to models</Description>
+        <Copyright>Copyright (c) Matt Nadareski 2019-2026</Copyright>
+        <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <RepositoryUrl>https://github.com/SabreTools/SabreTools.Serialization</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>serialization reader conversion models</PackageTags>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="README.md" Pack="true" PackagePath="" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <InternalsVisibleTo Include="SabreTools.Serialization.Readers.Test" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+        <PackageReference Include="SabreTools.Hashing" Version="[1.6.1]" />
+        <PackageReference Include="SabreTools.IO" Version="[1.9.1]" />
+     </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\SabreTools.Data.Extensions\SabreTools.Data.Extensions.csproj" />
+      <ProjectReference Include="..\SabreTools.Data.Models\SabreTools.Data.Models.csproj" />
+      <ProjectReference Include="..\SabreTools.ObjectIdentifier\SabreTools.ObjectIdentifier.csproj" />
+    </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/SecuROMAddD.cs b/SabreTools.Serialization.Readers/SecuROMAddD.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/SecuROMAddD.cs
rename to SabreTools.Serialization.Readers/SecuROMAddD.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/SecuROMDFA.cs b/SabreTools.Serialization.Readers/SecuROMDFA.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/SecuROMDFA.cs
rename to SabreTools.Serialization.Readers/SecuROMDFA.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/SecuROMMatroschkaPackage.cs b/SabreTools.Serialization.Readers/SecuROMMatroschkaPackage.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/SecuROMMatroschkaPackage.cs
rename to SabreTools.Serialization.Readers/SecuROMMatroschkaPackage.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/SeparatedValue.cs b/SabreTools.Serialization.Readers/SeparatedValue.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/SeparatedValue.cs
rename to SabreTools.Serialization.Readers/SeparatedValue.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/SkuSis.cs b/SabreTools.Serialization.Readers/SkuSis.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/SkuSis.cs
rename to SabreTools.Serialization.Readers/SkuSis.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/SoftwareList.cs b/SabreTools.Serialization.Readers/SoftwareList.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/SoftwareList.cs
rename to SabreTools.Serialization.Readers/SoftwareList.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/SpoonInstaller.cs b/SabreTools.Serialization.Readers/SpoonInstaller.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/SpoonInstaller.cs
rename to SabreTools.Serialization.Readers/SpoonInstaller.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/TapeArchive.cs b/SabreTools.Serialization.Readers/TapeArchive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/TapeArchive.cs
rename to SabreTools.Serialization.Readers/TapeArchive.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/VBSP.cs b/SabreTools.Serialization.Readers/VBSP.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/VBSP.cs
rename to SabreTools.Serialization.Readers/VBSP.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/VPK.cs b/SabreTools.Serialization.Readers/VPK.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/VPK.cs
rename to SabreTools.Serialization.Readers/VPK.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/WAD3.cs b/SabreTools.Serialization.Readers/WAD3.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/WAD3.cs
rename to SabreTools.Serialization.Readers/WAD3.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/WiseOverlayHeader.cs b/SabreTools.Serialization.Readers/WiseOverlayHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/WiseOverlayHeader.cs
rename to SabreTools.Serialization.Readers/WiseOverlayHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/WiseScript.cs b/SabreTools.Serialization.Readers/WiseScript.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/WiseScript.cs
rename to SabreTools.Serialization.Readers/WiseScript.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/WiseSectionHeader.cs b/SabreTools.Serialization.Readers/WiseSectionHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/WiseSectionHeader.cs
rename to SabreTools.Serialization.Readers/WiseSectionHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/XMID.cs b/SabreTools.Serialization.Readers/XMID.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/XMID.cs
rename to SabreTools.Serialization.Readers/XMID.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/XZ.cs b/SabreTools.Serialization.Readers/XZ.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/XZ.cs
rename to SabreTools.Serialization.Readers/XZ.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/XZP.cs b/SabreTools.Serialization.Readers/XZP.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/XZP.cs
rename to SabreTools.Serialization.Readers/XZP.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/XboxExecutable.cs b/SabreTools.Serialization.Readers/XboxExecutable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/XboxExecutable.cs
rename to SabreTools.Serialization.Readers/XboxExecutable.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/XeMID.cs b/SabreTools.Serialization.Readers/XeMID.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/XeMID.cs
rename to SabreTools.Serialization.Readers/XeMID.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/XmlFile.cs b/SabreTools.Serialization.Readers/XmlFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/XmlFile.cs
rename to SabreTools.Serialization.Readers/XmlFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Readers/ZSTD.cs b/SabreTools.Serialization.Readers/ZSTD.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Readers/ZSTD.cs
rename to SabreTools.Serialization.Readers/ZSTD.cs
diff --git a/SabreTools.Serialization.Test/Writers/ArchiveDotOrgTests.cs b/SabreTools.Serialization.Writers.Test/ArchiveDotOrgTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/ArchiveDotOrgTests.cs
rename to SabreTools.Serialization.Writers.Test/ArchiveDotOrgTests.cs
index 3d197ae0..a05ec70c 100644
--- a/SabreTools.Serialization.Test/Writers/ArchiveDotOrgTests.cs
+++ b/SabreTools.Serialization.Writers.Test/ArchiveDotOrgTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class ArchiveDotOrgTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/AttractModeTests.cs b/SabreTools.Serialization.Writers.Test/AttractModeTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/AttractModeTests.cs
rename to SabreTools.Serialization.Writers.Test/AttractModeTests.cs
index 52712fe2..0f0f2159 100644
--- a/SabreTools.Serialization.Test/Writers/AttractModeTests.cs
+++ b/SabreTools.Serialization.Writers.Test/AttractModeTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class AttractModeTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/CatalogTests.cs b/SabreTools.Serialization.Writers.Test/CatalogTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/CatalogTests.cs
rename to SabreTools.Serialization.Writers.Test/CatalogTests.cs
index d2395d8f..3b1a1914 100644
--- a/SabreTools.Serialization.Test/Writers/CatalogTests.cs
+++ b/SabreTools.Serialization.Writers.Test/CatalogTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class CatalogTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/ClrMameProTests.cs b/SabreTools.Serialization.Writers.Test/ClrMameProTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/ClrMameProTests.cs
rename to SabreTools.Serialization.Writers.Test/ClrMameProTests.cs
index e9100b98..e03dec49 100644
--- a/SabreTools.Serialization.Test/Writers/ClrMameProTests.cs
+++ b/SabreTools.Serialization.Writers.Test/ClrMameProTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class ClrMameProTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/CueSheetTests.cs b/SabreTools.Serialization.Writers.Test/CueSheetTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/CueSheetTests.cs
rename to SabreTools.Serialization.Writers.Test/CueSheetTests.cs
index 7cca9250..9c2bd5cc 100644
--- a/SabreTools.Serialization.Test/Writers/CueSheetTests.cs
+++ b/SabreTools.Serialization.Writers.Test/CueSheetTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class CueSheetTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/DosCenterTests.cs b/SabreTools.Serialization.Writers.Test/DosCenterTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/DosCenterTests.cs
rename to SabreTools.Serialization.Writers.Test/DosCenterTests.cs
index e2a157a5..b72600ca 100644
--- a/SabreTools.Serialization.Test/Writers/DosCenterTests.cs
+++ b/SabreTools.Serialization.Writers.Test/DosCenterTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class DosCenterTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/EverdriveSMDBTests.cs b/SabreTools.Serialization.Writers.Test/EverdriveSMDBTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/EverdriveSMDBTests.cs
rename to SabreTools.Serialization.Writers.Test/EverdriveSMDBTests.cs
index 7a5e9d01..1ab44a22 100644
--- a/SabreTools.Serialization.Test/Writers/EverdriveSMDBTests.cs
+++ b/SabreTools.Serialization.Writers.Test/EverdriveSMDBTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class EverdriveSMDBTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/HashfileTests.cs b/SabreTools.Serialization.Writers.Test/HashfileTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/HashfileTests.cs
rename to SabreTools.Serialization.Writers.Test/HashfileTests.cs
index fea5e7f1..61989a96 100644
--- a/SabreTools.Serialization.Test/Writers/HashfileTests.cs
+++ b/SabreTools.Serialization.Writers.Test/HashfileTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class HashfileTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/IRDTests.cs b/SabreTools.Serialization.Writers.Test/IRDTests.cs
similarity index 91%
rename from SabreTools.Serialization.Test/Writers/IRDTests.cs
rename to SabreTools.Serialization.Writers.Test/IRDTests.cs
index b71fe2df..be6fb9ea 100644
--- a/SabreTools.Serialization.Test/Writers/IRDTests.cs
+++ b/SabreTools.Serialization.Writers.Test/IRDTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class IRDTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/ListromTests.cs b/SabreTools.Serialization.Writers.Test/ListromTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/ListromTests.cs
rename to SabreTools.Serialization.Writers.Test/ListromTests.cs
index e28aace5..7aca2a8b 100644
--- a/SabreTools.Serialization.Test/Writers/ListromTests.cs
+++ b/SabreTools.Serialization.Writers.Test/ListromTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class ListromTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/ListxmlTests.cs b/SabreTools.Serialization.Writers.Test/ListxmlTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/ListxmlTests.cs
rename to SabreTools.Serialization.Writers.Test/ListxmlTests.cs
index f9c8a61e..60db7515 100644
--- a/SabreTools.Serialization.Test/Writers/ListxmlTests.cs
+++ b/SabreTools.Serialization.Writers.Test/ListxmlTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class ListxmlTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/LogiqxTests.cs b/SabreTools.Serialization.Writers.Test/LogiqxTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/LogiqxTests.cs
rename to SabreTools.Serialization.Writers.Test/LogiqxTests.cs
index eda2989c..ad593ca1 100644
--- a/SabreTools.Serialization.Test/Writers/LogiqxTests.cs
+++ b/SabreTools.Serialization.Writers.Test/LogiqxTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class LogiqxTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/M1Tests.cs b/SabreTools.Serialization.Writers.Test/M1Tests.cs
similarity index 91%
rename from SabreTools.Serialization.Test/Writers/M1Tests.cs
rename to SabreTools.Serialization.Writers.Test/M1Tests.cs
index d70aa78d..a3f67c93 100644
--- a/SabreTools.Serialization.Test/Writers/M1Tests.cs
+++ b/SabreTools.Serialization.Writers.Test/M1Tests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class M1Tests
     {
diff --git a/SabreTools.Serialization.Test/Writers/MessTests.cs b/SabreTools.Serialization.Writers.Test/MessTests.cs
similarity index 91%
rename from SabreTools.Serialization.Test/Writers/MessTests.cs
rename to SabreTools.Serialization.Writers.Test/MessTests.cs
index 4938150c..909eb595 100644
--- a/SabreTools.Serialization.Test/Writers/MessTests.cs
+++ b/SabreTools.Serialization.Writers.Test/MessTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class MessTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/OfflineListTests.cs b/SabreTools.Serialization.Writers.Test/OfflineListTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/OfflineListTests.cs
rename to SabreTools.Serialization.Writers.Test/OfflineListTests.cs
index 4fa8468a..0fcb72f3 100644
--- a/SabreTools.Serialization.Test/Writers/OfflineListTests.cs
+++ b/SabreTools.Serialization.Writers.Test/OfflineListTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class OfflineListTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/OpenMSXTests.cs b/SabreTools.Serialization.Writers.Test/OpenMSXTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/OpenMSXTests.cs
rename to SabreTools.Serialization.Writers.Test/OpenMSXTests.cs
index 619145bc..f3eaaf05 100644
--- a/SabreTools.Serialization.Test/Writers/OpenMSXTests.cs
+++ b/SabreTools.Serialization.Writers.Test/OpenMSXTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class OpenMSXTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/RomCenterTests.cs b/SabreTools.Serialization.Writers.Test/RomCenterTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/RomCenterTests.cs
rename to SabreTools.Serialization.Writers.Test/RomCenterTests.cs
index e527e883..ee922a63 100644
--- a/SabreTools.Serialization.Test/Writers/RomCenterTests.cs
+++ b/SabreTools.Serialization.Writers.Test/RomCenterTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class RomCenterTests
     {
diff --git a/SabreTools.Serialization.Writers.Test/SabreTools.Serialization.Writers.Test.csproj b/SabreTools.Serialization.Writers.Test/SabreTools.Serialization.Writers.Test.csproj
new file mode 100644
index 00000000..7823078c
--- /dev/null
+++ b/SabreTools.Serialization.Writers.Test/SabreTools.Serialization.Writers.Test.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+        <IsPackable>false</IsPackable>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="8.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\SabreTools.Serialization.Writers\SabreTools.Serialization.Writers.csproj" />
+    </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/SabreTools.Serialization.Test/Writers/SeparatedValueTests.cs b/SabreTools.Serialization.Writers.Test/SeparatedValueTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/SeparatedValueTests.cs
rename to SabreTools.Serialization.Writers.Test/SeparatedValueTests.cs
index c19259df..9f100577 100644
--- a/SabreTools.Serialization.Test/Writers/SeparatedValueTests.cs
+++ b/SabreTools.Serialization.Writers.Test/SeparatedValueTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class SeparatedValueTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/SoftwareListTests.cs b/SabreTools.Serialization.Writers.Test/SoftwareListTests.cs
similarity index 92%
rename from SabreTools.Serialization.Test/Writers/SoftwareListTests.cs
rename to SabreTools.Serialization.Writers.Test/SoftwareListTests.cs
index 9ea3eb50..7157a6ed 100644
--- a/SabreTools.Serialization.Test/Writers/SoftwareListTests.cs
+++ b/SabreTools.Serialization.Writers.Test/SoftwareListTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class SoftwareListTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/XMIDTests.cs b/SabreTools.Serialization.Writers.Test/XMIDTests.cs
similarity index 86%
rename from SabreTools.Serialization.Test/Writers/XMIDTests.cs
rename to SabreTools.Serialization.Writers.Test/XMIDTests.cs
index 4968d94c..7ccfefbf 100644
--- a/SabreTools.Serialization.Test/Writers/XMIDTests.cs
+++ b/SabreTools.Serialization.Writers.Test/XMIDTests.cs
@@ -1,7 +1,7 @@
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class XMIDTests
     {
diff --git a/SabreTools.Serialization.Test/Writers/XeMIDTests.cs b/SabreTools.Serialization.Writers.Test/XeMIDTests.cs
similarity index 86%
rename from SabreTools.Serialization.Test/Writers/XeMIDTests.cs
rename to SabreTools.Serialization.Writers.Test/XeMIDTests.cs
index ac6aab7d..9e67c393 100644
--- a/SabreTools.Serialization.Test/Writers/XeMIDTests.cs
+++ b/SabreTools.Serialization.Writers.Test/XeMIDTests.cs
@@ -1,7 +1,7 @@
 using SabreTools.Serialization.Writers;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Writers
+namespace SabreTools.Serialization.Writers.Test
 {
     public class XeMIDTests
     {
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/ArchiveDotOrg.cs b/SabreTools.Serialization.Writers/ArchiveDotOrg.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/ArchiveDotOrg.cs
rename to SabreTools.Serialization.Writers/ArchiveDotOrg.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/AttractMode.cs b/SabreTools.Serialization.Writers/AttractMode.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/AttractMode.cs
rename to SabreTools.Serialization.Writers/AttractMode.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/BaseBinaryWriter.cs b/SabreTools.Serialization.Writers/BaseBinaryWriter.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/BaseBinaryWriter.cs
rename to SabreTools.Serialization.Writers/BaseBinaryWriter.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/Catalog.cs b/SabreTools.Serialization.Writers/Catalog.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/Catalog.cs
rename to SabreTools.Serialization.Writers/Catalog.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/ClrMamePro.cs b/SabreTools.Serialization.Writers/ClrMamePro.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/ClrMamePro.cs
rename to SabreTools.Serialization.Writers/ClrMamePro.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/CueSheet.cs b/SabreTools.Serialization.Writers/CueSheet.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/CueSheet.cs
rename to SabreTools.Serialization.Writers/CueSheet.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/DosCenter.cs b/SabreTools.Serialization.Writers/DosCenter.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/DosCenter.cs
rename to SabreTools.Serialization.Writers/DosCenter.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/EverdriveSMDB.cs b/SabreTools.Serialization.Writers/EverdriveSMDB.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/EverdriveSMDB.cs
rename to SabreTools.Serialization.Writers/EverdriveSMDB.cs
diff --git a/SabreTools.Serialization.Writers/ExtensionAttribute.cs b/SabreTools.Serialization.Writers/ExtensionAttribute.cs
new file mode 100644
index 00000000..b40aacab
--- /dev/null
+++ b/SabreTools.Serialization.Writers/ExtensionAttribute.cs
@@ -0,0 +1,9 @@
+#if NET20
+
+namespace System.Runtime.CompilerServices
+{
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
+    internal sealed class ExtensionAttribute : Attribute {}
+}
+
+#endif
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/Hashfile.cs b/SabreTools.Serialization.Writers/Hashfile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/Hashfile.cs
rename to SabreTools.Serialization.Writers/Hashfile.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/IByteWriter.cs b/SabreTools.Serialization.Writers/IByteWriter.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/IByteWriter.cs
rename to SabreTools.Serialization.Writers/IByteWriter.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/IFileWriter.cs b/SabreTools.Serialization.Writers/IFileWriter.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/IFileWriter.cs
rename to SabreTools.Serialization.Writers/IFileWriter.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/IRD.cs b/SabreTools.Serialization.Writers/IRD.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/IRD.cs
rename to SabreTools.Serialization.Writers/IRD.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/IStreamWriter.cs b/SabreTools.Serialization.Writers/IStreamWriter.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/IStreamWriter.cs
rename to SabreTools.Serialization.Writers/IStreamWriter.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/IStringWriter.cs b/SabreTools.Serialization.Writers/IStringWriter.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/IStringWriter.cs
rename to SabreTools.Serialization.Writers/IStringWriter.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/JsonFile.cs b/SabreTools.Serialization.Writers/JsonFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/JsonFile.cs
rename to SabreTools.Serialization.Writers/JsonFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/Listrom.cs b/SabreTools.Serialization.Writers/Listrom.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/Listrom.cs
rename to SabreTools.Serialization.Writers/Listrom.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/Listxml.cs b/SabreTools.Serialization.Writers/Listxml.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/Listxml.cs
rename to SabreTools.Serialization.Writers/Listxml.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/Logiqx.cs b/SabreTools.Serialization.Writers/Logiqx.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/Logiqx.cs
rename to SabreTools.Serialization.Writers/Logiqx.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/M1.cs b/SabreTools.Serialization.Writers/M1.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/M1.cs
rename to SabreTools.Serialization.Writers/M1.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/Mess.cs b/SabreTools.Serialization.Writers/Mess.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/Mess.cs
rename to SabreTools.Serialization.Writers/Mess.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/OfflineList.cs b/SabreTools.Serialization.Writers/OfflineList.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/OfflineList.cs
rename to SabreTools.Serialization.Writers/OfflineList.cs
diff --git a/SabreTools.Serialization.Writers/OldDotNet.cs b/SabreTools.Serialization.Writers/OldDotNet.cs
new file mode 100644
index 00000000..8d971723
--- /dev/null
+++ b/SabreTools.Serialization.Writers/OldDotNet.cs
@@ -0,0 +1,50 @@
+#if NET20 || NET35
+
+using System;
+using System.IO;
+
+namespace SabreTools.Serialization.Writers
+{
+    /// <summary>
+    /// Derived from the mscorlib code from .NET Framework 4.0
+    /// </summary>
+    internal static class OldDotNet
+    {
+        public static void CopyTo(this Stream source, Stream destination)
+        {
+            if (destination is null)
+            {
+                throw new ArgumentNullException("destination");
+            }
+
+            if (!source.CanRead && !source.CanWrite)
+            {
+                throw new ObjectDisposedException(null);
+            }
+
+            if (!destination.CanRead && !destination.CanWrite)
+            {
+                throw new ObjectDisposedException("destination");
+            }
+
+            if (!source.CanRead)
+            {
+                throw new NotSupportedException();
+            }
+
+            if (!destination.CanWrite)
+            {
+                throw new NotSupportedException();
+            }
+
+            byte[] array = new byte[81920];
+            int count;
+            while ((count = source.Read(array, 0, array.Length)) != 0)
+            {
+                destination.Write(array, 0, count);
+            }
+        }
+    }
+}
+
+#endif
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/OpenMSX.cs b/SabreTools.Serialization.Writers/OpenMSX.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/OpenMSX.cs
rename to SabreTools.Serialization.Writers/OpenMSX.cs
diff --git a/SabreTools.Serialization.Writers/README.MD b/SabreTools.Serialization.Writers/README.MD
new file mode 100644
index 00000000..41b960b9
--- /dev/null
+++ b/SabreTools.Serialization.Writers/README.MD
@@ -0,0 +1,12 @@
+# SabreTools.Serialization.Writers
+
+This library contains methods for writing out data from models that are defined in `SabreTools.Data.Models` into various output sources into.
+
+Writer classes can inherit from one or more interfaces, as seen in the table below:
+
+| Interface Name | Source Type | Destination Type |
+| --- | --- | --- |
+| `SabreTools.Serialization.Writers.IByteWriter<TModel>` | `TModel` | `byte[]?` |
+| `SabreTools.Serialization.Writers.IFileWriter<TModel>` | `TModel` | `string?` path |
+| `SabreTools.Serialization.Writers.IStreamWriter<TModel>` | `TModel` | `Stream?` |
+| `SabreTools.Serialization.Writers.IStringWriter<TModel>` | `TModel` | `string?` representation |
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/RomCenter.cs b/SabreTools.Serialization.Writers/RomCenter.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/RomCenter.cs
rename to SabreTools.Serialization.Writers/RomCenter.cs
diff --git a/SabreTools.Serialization.Writers/SabreTools.Serialization.Writers.csproj b/SabreTools.Serialization.Writers/SabreTools.Serialization.Writers.csproj
new file mode 100644
index 00000000..d2852b99
--- /dev/null
+++ b/SabreTools.Serialization.Writers/SabreTools.Serialization.Writers.csproj
@@ -0,0 +1,43 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <!-- Assembly Properties -->
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <CheckEolTargetFramework>false</CheckEolTargetFramework>
+        <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+        <IncludeSymbols>true</IncludeSymbols>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <Version>2.3.0</Version>
+
+        <!-- Package Properties -->
+        <Authors>Matt Nadareski</Authors>
+        <Description>Convert from models to external sources</Description>
+        <Copyright>Copyright (c) Matt Nadareski 2019-2026</Copyright>
+        <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <RepositoryUrl>https://github.com/SabreTools/SabreTools.Serialization</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>serialization writer conversion models</PackageTags>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="README.md" Pack="true" PackagePath="" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+        <PackageReference Include="SabreTools.Hashing" Version="[1.6.1]" />
+        <PackageReference Include="SabreTools.IO" Version="[1.9.1]" />
+     </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\SabreTools.Data.Models\SabreTools.Data.Models.csproj" />
+    </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/SeparatedValue.cs b/SabreTools.Serialization.Writers/SeparatedValue.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/SeparatedValue.cs
rename to SabreTools.Serialization.Writers/SeparatedValue.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/SoftwareList.cs b/SabreTools.Serialization.Writers/SoftwareList.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/SoftwareList.cs
rename to SabreTools.Serialization.Writers/SoftwareList.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/XMID.cs b/SabreTools.Serialization.Writers/XMID.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/XMID.cs
rename to SabreTools.Serialization.Writers/XMID.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/XeMID.cs b/SabreTools.Serialization.Writers/XeMID.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/XeMID.cs
rename to SabreTools.Serialization.Writers/XeMID.cs
diff --git a/SabreTools.Serialization/SabreTools.Serialization.Writers/XmlFile.cs b/SabreTools.Serialization.Writers/XmlFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Serialization.Writers/XmlFile.cs
rename to SabreTools.Serialization.Writers/XmlFile.cs
diff --git a/SabreTools.Serialization.sln b/SabreTools.Serialization.sln
index 05375a53..aa01ea09 100644
--- a/SabreTools.Serialization.sln
+++ b/SabreTools.Serialization.sln
@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Serialization",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InfoPrint", "InfoPrint\InfoPrint.csproj", "{F3DEE31A-4726-464C-A90C-C19D78F51898}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Serialization.Test", "SabreTools.Serialization.Test\SabreTools.Serialization.Test.csproj", "{B8A04C5E-A14F-4842-9035-2F6871A1DA10}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtractionTool", "ExtractionTool\ExtractionTool.csproj", "{1565A8FD-1399-4CA7-A806-11FCD11EC687}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.ObjectIdentifier.Test", "SabreTools.ObjectIdentifier.Test\SabreTools.ObjectIdentifier.Test.csproj", "{B3AE7D43-3765-4F95-A5F1-820832732C0E}"
@@ -17,6 +15,26 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Data.Extensions.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Wrappers.Test", "SabreTools.Wrappers.Test\SabreTools.Wrappers.Test.csproj", "{537126F8-3735-460A-A18E-845C42975697}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Data.Extensions", "SabreTools.Data.Extensions\SabreTools.Data.Extensions.csproj", "{5591D030-E723-4CDA-BC4E-0C010448FAE2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Data.Models", "SabreTools.Data.Models\SabreTools.Data.Models.csproj", "{5972EA57-F29F-49D5-B632-DE48FB98755C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.ObjectIdentifier", "SabreTools.ObjectIdentifier\SabreTools.ObjectIdentifier.csproj", "{78C0FFA5-49FD-4BD2-A918-38A0AF43EEDE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Serialization.CrossModel", "SabreTools.Serialization.CrossModel\SabreTools.Serialization.CrossModel.csproj", "{09C97056-6F94-48CA-A468-15D1C6107029}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Serialization.Readers", "SabreTools.Serialization.Readers\SabreTools.Serialization.Readers.csproj", "{FAFFB5E1-A24B-4591-B6A2-8CB2387FB82A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Serialization.Writers", "SabreTools.Serialization.Writers\SabreTools.Serialization.Writers.csproj", "{3BD320A7-FEC0-4263-9FBF-2A3879762504}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Wrappers", "SabreTools.Wrappers\SabreTools.Wrappers.csproj", "{08B3F9E1-F18D-4DDD-A8A9-C1CF8A6DBECC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Serialization.CrossModel.Test", "SabreTools.Serialization.CrossModel.Test\SabreTools.Serialization.CrossModel.Test.csproj", "{F1BD0007-7C08-4B84-93D9-933690BA5296}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Serialization.Readers.Test", "SabreTools.Serialization.Readers.Test\SabreTools.Serialization.Readers.Test.csproj", "{A7DB39F9-9DF6-4452-9F1D-BEF3F1701F5C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Serialization.Writers.Test", "SabreTools.Serialization.Writers.Test\SabreTools.Serialization.Writers.Test.csproj", "{99619CA9-6D7D-4653-BD1E-8F586F219607}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -51,18 +69,6 @@ Global
 		{F3DEE31A-4726-464C-A90C-C19D78F51898}.Release|x64.Build.0 = Release|Any CPU
 		{F3DEE31A-4726-464C-A90C-C19D78F51898}.Release|x86.ActiveCfg = Release|Any CPU
 		{F3DEE31A-4726-464C-A90C-C19D78F51898}.Release|x86.Build.0 = Release|Any CPU
-		{B8A04C5E-A14F-4842-9035-2F6871A1DA10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B8A04C5E-A14F-4842-9035-2F6871A1DA10}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B8A04C5E-A14F-4842-9035-2F6871A1DA10}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B8A04C5E-A14F-4842-9035-2F6871A1DA10}.Debug|x64.Build.0 = Debug|Any CPU
-		{B8A04C5E-A14F-4842-9035-2F6871A1DA10}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B8A04C5E-A14F-4842-9035-2F6871A1DA10}.Debug|x86.Build.0 = Debug|Any CPU
-		{B8A04C5E-A14F-4842-9035-2F6871A1DA10}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B8A04C5E-A14F-4842-9035-2F6871A1DA10}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B8A04C5E-A14F-4842-9035-2F6871A1DA10}.Release|x64.ActiveCfg = Release|Any CPU
-		{B8A04C5E-A14F-4842-9035-2F6871A1DA10}.Release|x64.Build.0 = Release|Any CPU
-		{B8A04C5E-A14F-4842-9035-2F6871A1DA10}.Release|x86.ActiveCfg = Release|Any CPU
-		{B8A04C5E-A14F-4842-9035-2F6871A1DA10}.Release|x86.Build.0 = Release|Any CPU
 		{1565A8FD-1399-4CA7-A806-11FCD11EC687}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1565A8FD-1399-4CA7-A806-11FCD11EC687}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1565A8FD-1399-4CA7-A806-11FCD11EC687}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -111,6 +117,126 @@ Global
 		{537126F8-3735-460A-A18E-845C42975697}.Release|x64.Build.0 = Release|Any CPU
 		{537126F8-3735-460A-A18E-845C42975697}.Release|x86.ActiveCfg = Release|Any CPU
 		{537126F8-3735-460A-A18E-845C42975697}.Release|x86.Build.0 = Release|Any CPU
+		{5591D030-E723-4CDA-BC4E-0C010448FAE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5591D030-E723-4CDA-BC4E-0C010448FAE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5591D030-E723-4CDA-BC4E-0C010448FAE2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5591D030-E723-4CDA-BC4E-0C010448FAE2}.Debug|x64.Build.0 = Debug|Any CPU
+		{5591D030-E723-4CDA-BC4E-0C010448FAE2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5591D030-E723-4CDA-BC4E-0C010448FAE2}.Debug|x86.Build.0 = Debug|Any CPU
+		{5591D030-E723-4CDA-BC4E-0C010448FAE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5591D030-E723-4CDA-BC4E-0C010448FAE2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5591D030-E723-4CDA-BC4E-0C010448FAE2}.Release|x64.ActiveCfg = Release|Any CPU
+		{5591D030-E723-4CDA-BC4E-0C010448FAE2}.Release|x64.Build.0 = Release|Any CPU
+		{5591D030-E723-4CDA-BC4E-0C010448FAE2}.Release|x86.ActiveCfg = Release|Any CPU
+		{5591D030-E723-4CDA-BC4E-0C010448FAE2}.Release|x86.Build.0 = Release|Any CPU
+		{5972EA57-F29F-49D5-B632-DE48FB98755C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5972EA57-F29F-49D5-B632-DE48FB98755C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5972EA57-F29F-49D5-B632-DE48FB98755C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5972EA57-F29F-49D5-B632-DE48FB98755C}.Debug|x64.Build.0 = Debug|Any CPU
+		{5972EA57-F29F-49D5-B632-DE48FB98755C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5972EA57-F29F-49D5-B632-DE48FB98755C}.Debug|x86.Build.0 = Debug|Any CPU
+		{5972EA57-F29F-49D5-B632-DE48FB98755C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5972EA57-F29F-49D5-B632-DE48FB98755C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5972EA57-F29F-49D5-B632-DE48FB98755C}.Release|x64.ActiveCfg = Release|Any CPU
+		{5972EA57-F29F-49D5-B632-DE48FB98755C}.Release|x64.Build.0 = Release|Any CPU
+		{5972EA57-F29F-49D5-B632-DE48FB98755C}.Release|x86.ActiveCfg = Release|Any CPU
+		{5972EA57-F29F-49D5-B632-DE48FB98755C}.Release|x86.Build.0 = Release|Any CPU
+		{78C0FFA5-49FD-4BD2-A918-38A0AF43EEDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78C0FFA5-49FD-4BD2-A918-38A0AF43EEDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78C0FFA5-49FD-4BD2-A918-38A0AF43EEDE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{78C0FFA5-49FD-4BD2-A918-38A0AF43EEDE}.Debug|x64.Build.0 = Debug|Any CPU
+		{78C0FFA5-49FD-4BD2-A918-38A0AF43EEDE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{78C0FFA5-49FD-4BD2-A918-38A0AF43EEDE}.Debug|x86.Build.0 = Debug|Any CPU
+		{78C0FFA5-49FD-4BD2-A918-38A0AF43EEDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78C0FFA5-49FD-4BD2-A918-38A0AF43EEDE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78C0FFA5-49FD-4BD2-A918-38A0AF43EEDE}.Release|x64.ActiveCfg = Release|Any CPU
+		{78C0FFA5-49FD-4BD2-A918-38A0AF43EEDE}.Release|x64.Build.0 = Release|Any CPU
+		{78C0FFA5-49FD-4BD2-A918-38A0AF43EEDE}.Release|x86.ActiveCfg = Release|Any CPU
+		{78C0FFA5-49FD-4BD2-A918-38A0AF43EEDE}.Release|x86.Build.0 = Release|Any CPU
+		{09C97056-6F94-48CA-A468-15D1C6107029}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09C97056-6F94-48CA-A468-15D1C6107029}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09C97056-6F94-48CA-A468-15D1C6107029}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{09C97056-6F94-48CA-A468-15D1C6107029}.Debug|x64.Build.0 = Debug|Any CPU
+		{09C97056-6F94-48CA-A468-15D1C6107029}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{09C97056-6F94-48CA-A468-15D1C6107029}.Debug|x86.Build.0 = Debug|Any CPU
+		{09C97056-6F94-48CA-A468-15D1C6107029}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09C97056-6F94-48CA-A468-15D1C6107029}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09C97056-6F94-48CA-A468-15D1C6107029}.Release|x64.ActiveCfg = Release|Any CPU
+		{09C97056-6F94-48CA-A468-15D1C6107029}.Release|x64.Build.0 = Release|Any CPU
+		{09C97056-6F94-48CA-A468-15D1C6107029}.Release|x86.ActiveCfg = Release|Any CPU
+		{09C97056-6F94-48CA-A468-15D1C6107029}.Release|x86.Build.0 = Release|Any CPU
+		{FAFFB5E1-A24B-4591-B6A2-8CB2387FB82A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FAFFB5E1-A24B-4591-B6A2-8CB2387FB82A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FAFFB5E1-A24B-4591-B6A2-8CB2387FB82A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FAFFB5E1-A24B-4591-B6A2-8CB2387FB82A}.Debug|x64.Build.0 = Debug|Any CPU
+		{FAFFB5E1-A24B-4591-B6A2-8CB2387FB82A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FAFFB5E1-A24B-4591-B6A2-8CB2387FB82A}.Debug|x86.Build.0 = Debug|Any CPU
+		{FAFFB5E1-A24B-4591-B6A2-8CB2387FB82A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FAFFB5E1-A24B-4591-B6A2-8CB2387FB82A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FAFFB5E1-A24B-4591-B6A2-8CB2387FB82A}.Release|x64.ActiveCfg = Release|Any CPU
+		{FAFFB5E1-A24B-4591-B6A2-8CB2387FB82A}.Release|x64.Build.0 = Release|Any CPU
+		{FAFFB5E1-A24B-4591-B6A2-8CB2387FB82A}.Release|x86.ActiveCfg = Release|Any CPU
+		{FAFFB5E1-A24B-4591-B6A2-8CB2387FB82A}.Release|x86.Build.0 = Release|Any CPU
+		{3BD320A7-FEC0-4263-9FBF-2A3879762504}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BD320A7-FEC0-4263-9FBF-2A3879762504}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BD320A7-FEC0-4263-9FBF-2A3879762504}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3BD320A7-FEC0-4263-9FBF-2A3879762504}.Debug|x64.Build.0 = Debug|Any CPU
+		{3BD320A7-FEC0-4263-9FBF-2A3879762504}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3BD320A7-FEC0-4263-9FBF-2A3879762504}.Debug|x86.Build.0 = Debug|Any CPU
+		{3BD320A7-FEC0-4263-9FBF-2A3879762504}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3BD320A7-FEC0-4263-9FBF-2A3879762504}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BD320A7-FEC0-4263-9FBF-2A3879762504}.Release|x64.ActiveCfg = Release|Any CPU
+		{3BD320A7-FEC0-4263-9FBF-2A3879762504}.Release|x64.Build.0 = Release|Any CPU
+		{3BD320A7-FEC0-4263-9FBF-2A3879762504}.Release|x86.ActiveCfg = Release|Any CPU
+		{3BD320A7-FEC0-4263-9FBF-2A3879762504}.Release|x86.Build.0 = Release|Any CPU
+		{08B3F9E1-F18D-4DDD-A8A9-C1CF8A6DBECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08B3F9E1-F18D-4DDD-A8A9-C1CF8A6DBECC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08B3F9E1-F18D-4DDD-A8A9-C1CF8A6DBECC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{08B3F9E1-F18D-4DDD-A8A9-C1CF8A6DBECC}.Debug|x64.Build.0 = Debug|Any CPU
+		{08B3F9E1-F18D-4DDD-A8A9-C1CF8A6DBECC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{08B3F9E1-F18D-4DDD-A8A9-C1CF8A6DBECC}.Debug|x86.Build.0 = Debug|Any CPU
+		{08B3F9E1-F18D-4DDD-A8A9-C1CF8A6DBECC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08B3F9E1-F18D-4DDD-A8A9-C1CF8A6DBECC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08B3F9E1-F18D-4DDD-A8A9-C1CF8A6DBECC}.Release|x64.ActiveCfg = Release|Any CPU
+		{08B3F9E1-F18D-4DDD-A8A9-C1CF8A6DBECC}.Release|x64.Build.0 = Release|Any CPU
+		{08B3F9E1-F18D-4DDD-A8A9-C1CF8A6DBECC}.Release|x86.ActiveCfg = Release|Any CPU
+		{08B3F9E1-F18D-4DDD-A8A9-C1CF8A6DBECC}.Release|x86.Build.0 = Release|Any CPU
+		{F1BD0007-7C08-4B84-93D9-933690BA5296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1BD0007-7C08-4B84-93D9-933690BA5296}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1BD0007-7C08-4B84-93D9-933690BA5296}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F1BD0007-7C08-4B84-93D9-933690BA5296}.Debug|x64.Build.0 = Debug|Any CPU
+		{F1BD0007-7C08-4B84-93D9-933690BA5296}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F1BD0007-7C08-4B84-93D9-933690BA5296}.Debug|x86.Build.0 = Debug|Any CPU
+		{F1BD0007-7C08-4B84-93D9-933690BA5296}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1BD0007-7C08-4B84-93D9-933690BA5296}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1BD0007-7C08-4B84-93D9-933690BA5296}.Release|x64.ActiveCfg = Release|Any CPU
+		{F1BD0007-7C08-4B84-93D9-933690BA5296}.Release|x64.Build.0 = Release|Any CPU
+		{F1BD0007-7C08-4B84-93D9-933690BA5296}.Release|x86.ActiveCfg = Release|Any CPU
+		{F1BD0007-7C08-4B84-93D9-933690BA5296}.Release|x86.Build.0 = Release|Any CPU
+		{A7DB39F9-9DF6-4452-9F1D-BEF3F1701F5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7DB39F9-9DF6-4452-9F1D-BEF3F1701F5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7DB39F9-9DF6-4452-9F1D-BEF3F1701F5C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A7DB39F9-9DF6-4452-9F1D-BEF3F1701F5C}.Debug|x64.Build.0 = Debug|Any CPU
+		{A7DB39F9-9DF6-4452-9F1D-BEF3F1701F5C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A7DB39F9-9DF6-4452-9F1D-BEF3F1701F5C}.Debug|x86.Build.0 = Debug|Any CPU
+		{A7DB39F9-9DF6-4452-9F1D-BEF3F1701F5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7DB39F9-9DF6-4452-9F1D-BEF3F1701F5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7DB39F9-9DF6-4452-9F1D-BEF3F1701F5C}.Release|x64.ActiveCfg = Release|Any CPU
+		{A7DB39F9-9DF6-4452-9F1D-BEF3F1701F5C}.Release|x64.Build.0 = Release|Any CPU
+		{A7DB39F9-9DF6-4452-9F1D-BEF3F1701F5C}.Release|x86.ActiveCfg = Release|Any CPU
+		{A7DB39F9-9DF6-4452-9F1D-BEF3F1701F5C}.Release|x86.Build.0 = Release|Any CPU
+		{99619CA9-6D7D-4653-BD1E-8F586F219607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99619CA9-6D7D-4653-BD1E-8F586F219607}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99619CA9-6D7D-4653-BD1E-8F586F219607}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{99619CA9-6D7D-4653-BD1E-8F586F219607}.Debug|x64.Build.0 = Debug|Any CPU
+		{99619CA9-6D7D-4653-BD1E-8F586F219607}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{99619CA9-6D7D-4653-BD1E-8F586F219607}.Debug|x86.Build.0 = Debug|Any CPU
+		{99619CA9-6D7D-4653-BD1E-8F586F219607}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99619CA9-6D7D-4653-BD1E-8F586F219607}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99619CA9-6D7D-4653-BD1E-8F586F219607}.Release|x64.ActiveCfg = Release|Any CPU
+		{99619CA9-6D7D-4653-BD1E-8F586F219607}.Release|x64.Build.0 = Release|Any CPU
+		{99619CA9-6D7D-4653-BD1E-8F586F219607}.Release|x86.ActiveCfg = Release|Any CPU
+		{99619CA9-6D7D-4653-BD1E-8F586F219607}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/SabreTools.Serialization/Func.cs b/SabreTools.Serialization/Func.cs
deleted file mode 100644
index aba0cf0f..00000000
--- a/SabreTools.Serialization/Func.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-#if NET20
-
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-namespace SabreTools.Serialization
-{
-    internal delegate TResult Func<out TResult>();
-
-    internal delegate TResult Func<in T, out TResult>(T arg);
-
-    internal delegate TResult Func<in T1, in T2, out TResult>(T1 arg1, T2 arg2);
-
-    internal delegate TResult Func<in T1, in T2, in T3, out TResult>(T1 arg1, T2 arg2, T3 arg3);
-
-    internal delegate TResult Func<in T1, in T2, in T3, in T4, out TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4);
-
-    internal delegate TResult Func<in T1, in T2, in T3, in T4, in T5, out TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5);
-
-    internal delegate TResult Func<in T1, in T2, in T3, in T4, in T5, in T6, out TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6);
-
-    internal delegate TResult Func<in T1, in T2, in T3, in T4, in T5, in T6, in T7, out TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7);
-
-    internal delegate TResult Func<in T1, in T2, in T3, in T4, in T5, in T6, in T7, in T8, out TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8);
-
-    internal delegate TResult Func<in T1, in T2, in T3, in T4, in T5, in T6, in T7, in T8, in T9, out TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9);
-
-    internal delegate TResult Func<in T1, in T2, in T3, in T4, in T5, in T6, in T7, in T8, in T9, in T10, out TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9, T10 arg10);
-
-    internal delegate TResult Func<in T1, in T2, in T3, in T4, in T5, in T6, in T7, in T8, in T9, in T10, in T11, out TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9, T10 arg10, T11 arg11);
-
-    internal delegate TResult Func<in T1, in T2, in T3, in T4, in T5, in T6, in T7, in T8, in T9, in T10, in T11, in T12, out TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9, T10 arg10, T11 arg11, T12 arg12);
-
-    internal delegate TResult Func<in T1, in T2, in T3, in T4, in T5, in T6, in T7, in T8, in T9, in T10, in T11, in T12, in T13, out TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9, T10 arg10, T11 arg11, T12 arg12, T13 arg13);
-
-    internal delegate TResult Func<in T1, in T2, in T3, in T4, in T5, in T6, in T7, in T8, in T9, in T10, in T11, in T12, in T13, in T14, out TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9, T10 arg10, T11 arg11, T12 arg12, T13 arg13, T14 arg14);
-
-    internal delegate TResult Func<in T1, in T2, in T3, in T4, in T5, in T6, in T7, in T8, in T9, in T10, in T11, in T12, in T13, in T14, in T15, out TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9, T10 arg10, T11 arg11, T12 arg12, T13 arg13, T14 arg14, T15 arg15);
-
-    internal delegate TResult Func<in T1, in T2, in T3, in T4, in T5, in T6, in T7, in T8, in T9, in T10, in T11, in T12, in T13, in T14, in T15, in T16, out TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9, T10 arg10, T11 arg11, T12 arg12, T13 arg13, T14 arg14, T15 arg15, T16 arg16);
-}
-
-#endif
diff --git a/SabreTools.Serialization/SabreTools.Serialization.csproj b/SabreTools.Serialization/SabreTools.Serialization.csproj
index eef61df2..bc4f7cba 100644
--- a/SabreTools.Serialization/SabreTools.Serialization.csproj
+++ b/SabreTools.Serialization/SabreTools.Serialization.csproj
@@ -17,7 +17,7 @@
         <!-- Package Properties -->
         <Authors>Matt Nadareski</Authors>
         <Description>Serialization and deserialization helpers for various types</Description>
-        <Copyright>Copyright (c) Matt Nadareski 2019-2025</Copyright>
+        <Copyright>Copyright (c) Matt Nadareski 2019-2026</Copyright>
         <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <RepositoryUrl>https://github.com/SabreTools/SabreTools.Serialization</RepositoryUrl>
@@ -28,7 +28,7 @@
 
     <!-- These are needed for dealing with native Windows DLLs -->
     <ItemGroup>
-        <Content Include="runtimes\**\*">
+        <Content Include="..\runtimes\**\*">
             <PackagePath>%(Identity)</PackagePath>
             <Pack>true</Pack>
         </Content>
@@ -39,7 +39,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <InternalsVisibleTo Include="SabreTools.Serialization.Test" />
+        <Compile Include="..\SabreTools.Data.Extensions\*.cs" />
+        <Compile Include="..\SabreTools.Data.Models\**\*.cs" Exclude="..\SabreTools.Data.Models\obj\**\*.cs" />
+        <Compile Include="..\SabreTools.ObjectIdentifier\*.cs" />
+        <Compile Include="..\SabreTools.Serialization.CrossModel\*.cs" Exclude="..\SabreTools.Serialization.CrossModel\ExtensionAttribute.cs" />
+        <Compile Include="..\SabreTools.Serialization.Readers\*.cs" />
+        <Compile Include="..\SabreTools.Serialization.Writers\*.cs" Exclude="..\SabreTools.Serialization.Writers\ExtensionAttribute.cs" />
+        <Compile Include="..\SabreTools.Wrappers\*.cs" Exclude="..\SabreTools.Wrappers\ExtensionAttribute.cs" />
+        <Compile Include="..\SabreTools.Wrappers\_EXTERNAL\StormLibSharp\**\*.cs" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/SabreTools.Wrappers.Test/SabreTools.Wrappers.Test.csproj b/SabreTools.Wrappers.Test/SabreTools.Wrappers.Test.csproj
index be783d00..aaa03681 100644
--- a/SabreTools.Wrappers.Test/SabreTools.Wrappers.Test.csproj
+++ b/SabreTools.Wrappers.Test/SabreTools.Wrappers.Test.csproj
@@ -7,10 +7,6 @@
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\SabreTools.Serialization\SabreTools.Serialization.csproj" />
-    </ItemGroup>
-
     <ItemGroup>
         <None Remove="TestData\**" />
     </ItemGroup>
@@ -22,17 +18,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="8.0.0">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-        <PackageReference Include="SabreTools.Hashing" Version="[1.6.1]" />
+        <PackageReference Include="coverlet.collector" Version="8.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
         <PackageReference Include="xunit" Version="2.9.3" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\SabreTools.Wrappers\SabreTools.Wrappers.csproj" />
     </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/AACSMediaKeyBlock.Printing.cs b/SabreTools.Wrappers/AACSMediaKeyBlock.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/AACSMediaKeyBlock.Printing.cs
rename to SabreTools.Wrappers/AACSMediaKeyBlock.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/AACSMediaKeyBlock.cs b/SabreTools.Wrappers/AACSMediaKeyBlock.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/AACSMediaKeyBlock.cs
rename to SabreTools.Wrappers/AACSMediaKeyBlock.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.Extraction.cs b/SabreTools.Wrappers/Atari7800Cart.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.Extraction.cs
rename to SabreTools.Wrappers/Atari7800Cart.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.Printing.cs b/SabreTools.Wrappers/Atari7800Cart.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.Printing.cs
rename to SabreTools.Wrappers/Atari7800Cart.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.cs b/SabreTools.Wrappers/Atari7800Cart.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.cs
rename to SabreTools.Wrappers/Atari7800Cart.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.Extraction.cs b/SabreTools.Wrappers/AtariLynxCart.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.Extraction.cs
rename to SabreTools.Wrappers/AtariLynxCart.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.Printing.cs b/SabreTools.Wrappers/AtariLynxCart.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.Printing.cs
rename to SabreTools.Wrappers/AtariLynxCart.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.cs b/SabreTools.Wrappers/AtariLynxCart.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.cs
rename to SabreTools.Wrappers/AtariLynxCart.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/BDPlusSVM.Printing.cs b/SabreTools.Wrappers/BDPlusSVM.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/BDPlusSVM.Printing.cs
rename to SabreTools.Wrappers/BDPlusSVM.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/BDPlusSVM.cs b/SabreTools.Wrappers/BDPlusSVM.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/BDPlusSVM.cs
rename to SabreTools.Wrappers/BDPlusSVM.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/BFPK.Extraction.cs b/SabreTools.Wrappers/BFPK.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/BFPK.Extraction.cs
rename to SabreTools.Wrappers/BFPK.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/BFPK.Printing.cs b/SabreTools.Wrappers/BFPK.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/BFPK.Printing.cs
rename to SabreTools.Wrappers/BFPK.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/BFPK.cs b/SabreTools.Wrappers/BFPK.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/BFPK.cs
rename to SabreTools.Wrappers/BFPK.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/BSP.Extraction.cs b/SabreTools.Wrappers/BSP.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/BSP.Extraction.cs
rename to SabreTools.Wrappers/BSP.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/BSP.Printing.cs b/SabreTools.Wrappers/BSP.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/BSP.Printing.cs
rename to SabreTools.Wrappers/BSP.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/BSP.cs b/SabreTools.Wrappers/BSP.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/BSP.cs
rename to SabreTools.Wrappers/BSP.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/BZip2.Extraction.cs b/SabreTools.Wrappers/BZip2.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/BZip2.Extraction.cs
rename to SabreTools.Wrappers/BZip2.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/BZip2.cs b/SabreTools.Wrappers/BZip2.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/BZip2.cs
rename to SabreTools.Wrappers/BZip2.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/CDROM.cs b/SabreTools.Wrappers/CDROM.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/CDROM.cs
rename to SabreTools.Wrappers/CDROM.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/CFB.Extraction.cs b/SabreTools.Wrappers/CFB.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/CFB.Extraction.cs
rename to SabreTools.Wrappers/CFB.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/CFB.Printing.cs b/SabreTools.Wrappers/CFB.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/CFB.Printing.cs
rename to SabreTools.Wrappers/CFB.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/CFB.cs b/SabreTools.Wrappers/CFB.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/CFB.cs
rename to SabreTools.Wrappers/CFB.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/CHD.Printing.cs b/SabreTools.Wrappers/CHD.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/CHD.Printing.cs
rename to SabreTools.Wrappers/CHD.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/CHD.cs b/SabreTools.Wrappers/CHD.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/CHD.cs
rename to SabreTools.Wrappers/CHD.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/CIA.Printing.cs b/SabreTools.Wrappers/CIA.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/CIA.Printing.cs
rename to SabreTools.Wrappers/CIA.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/CIA.cs b/SabreTools.Wrappers/CIA.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/CIA.cs
rename to SabreTools.Wrappers/CIA.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/ConcreteAbstractSerializer.cs b/SabreTools.Wrappers/ConcreteAbstractSerializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/ConcreteAbstractSerializer.cs
rename to SabreTools.Wrappers/ConcreteAbstractSerializer.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/ConcreteInterfaceSerializer.cs b/SabreTools.Wrappers/ConcreteInterfaceSerializer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/ConcreteInterfaceSerializer.cs
rename to SabreTools.Wrappers/ConcreteInterfaceSerializer.cs
diff --git a/SabreTools.Wrappers/ExtensionAttribute.cs b/SabreTools.Wrappers/ExtensionAttribute.cs
new file mode 100644
index 00000000..b40aacab
--- /dev/null
+++ b/SabreTools.Wrappers/ExtensionAttribute.cs
@@ -0,0 +1,9 @@
+#if NET20
+
+namespace System.Runtime.CompilerServices
+{
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
+    internal sealed class ExtensionAttribute : Attribute {}
+}
+
+#endif
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/FDS.Extraction.cs b/SabreTools.Wrappers/FDS.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/FDS.Extraction.cs
rename to SabreTools.Wrappers/FDS.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/FDS.Printing.cs b/SabreTools.Wrappers/FDS.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/FDS.Printing.cs
rename to SabreTools.Wrappers/FDS.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/FDS.cs b/SabreTools.Wrappers/FDS.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/FDS.cs
rename to SabreTools.Wrappers/FDS.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/GCF.Extraction.cs b/SabreTools.Wrappers/GCF.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/GCF.Extraction.cs
rename to SabreTools.Wrappers/GCF.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/GCF.Printing.cs b/SabreTools.Wrappers/GCF.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/GCF.Printing.cs
rename to SabreTools.Wrappers/GCF.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/GCF.cs b/SabreTools.Wrappers/GCF.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/GCF.cs
rename to SabreTools.Wrappers/GCF.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/GZip.Extraction.cs b/SabreTools.Wrappers/GZip.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/GZip.Extraction.cs
rename to SabreTools.Wrappers/GZip.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/GZip.Printing.cs b/SabreTools.Wrappers/GZip.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/GZip.Printing.cs
rename to SabreTools.Wrappers/GZip.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/GZip.cs b/SabreTools.Wrappers/GZip.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/GZip.cs
rename to SabreTools.Wrappers/GZip.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/IExtractable.cs b/SabreTools.Wrappers/IExtractable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/IExtractable.cs
rename to SabreTools.Wrappers/IExtractable.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/IPrintable.cs b/SabreTools.Wrappers/IPrintable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/IPrintable.cs
rename to SabreTools.Wrappers/IPrintable.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/IRD.Printing.cs b/SabreTools.Wrappers/IRD.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/IRD.Printing.cs
rename to SabreTools.Wrappers/IRD.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/IRD.cs b/SabreTools.Wrappers/IRD.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/IRD.cs
rename to SabreTools.Wrappers/IRD.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/ISO9660.Extraction.cs b/SabreTools.Wrappers/ISO9660.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/ISO9660.Extraction.cs
rename to SabreTools.Wrappers/ISO9660.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/ISO9660.Printing.cs b/SabreTools.Wrappers/ISO9660.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/ISO9660.Printing.cs
rename to SabreTools.Wrappers/ISO9660.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/ISO9660.cs b/SabreTools.Wrappers/ISO9660.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/ISO9660.cs
rename to SabreTools.Wrappers/ISO9660.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/IWrapper.cs b/SabreTools.Wrappers/IWrapper.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/IWrapper.cs
rename to SabreTools.Wrappers/IWrapper.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/IWrapperT.cs b/SabreTools.Wrappers/IWrapperT.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/IWrapperT.cs
rename to SabreTools.Wrappers/IWrapperT.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.Extraction.cs b/SabreTools.Wrappers/InstallShieldArchiveV3.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.Extraction.cs
rename to SabreTools.Wrappers/InstallShieldArchiveV3.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.Printing.cs b/SabreTools.Wrappers/InstallShieldArchiveV3.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.Printing.cs
rename to SabreTools.Wrappers/InstallShieldArchiveV3.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.cs b/SabreTools.Wrappers/InstallShieldArchiveV3.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.cs
rename to SabreTools.Wrappers/InstallShieldArchiveV3.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.Extraction.cs b/SabreTools.Wrappers/InstallShieldCabinet.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.Extraction.cs
rename to SabreTools.Wrappers/InstallShieldCabinet.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.Printing.cs b/SabreTools.Wrappers/InstallShieldCabinet.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.Printing.cs
rename to SabreTools.Wrappers/InstallShieldCabinet.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.cs b/SabreTools.Wrappers/InstallShieldCabinet.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.cs
rename to SabreTools.Wrappers/InstallShieldCabinet.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldExecutable.Extraction.cs b/SabreTools.Wrappers/InstallShieldExecutable.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/InstallShieldExecutable.Extraction.cs
rename to SabreTools.Wrappers/InstallShieldExecutable.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/InstallShieldExecutable.cs b/SabreTools.Wrappers/InstallShieldExecutable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/InstallShieldExecutable.cs
rename to SabreTools.Wrappers/InstallShieldExecutable.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/LDSCRYPT.cs b/SabreTools.Wrappers/LDSCRYPT.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/LDSCRYPT.cs
rename to SabreTools.Wrappers/LDSCRYPT.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.Extraction.cs b/SabreTools.Wrappers/LZKWAJ.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.Extraction.cs
rename to SabreTools.Wrappers/LZKWAJ.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.Printing.cs b/SabreTools.Wrappers/LZKWAJ.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.Printing.cs
rename to SabreTools.Wrappers/LZKWAJ.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.cs b/SabreTools.Wrappers/LZKWAJ.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.cs
rename to SabreTools.Wrappers/LZKWAJ.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.Extraction.cs b/SabreTools.Wrappers/LZQBasic.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.Extraction.cs
rename to SabreTools.Wrappers/LZQBasic.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.Printing.cs b/SabreTools.Wrappers/LZQBasic.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.Printing.cs
rename to SabreTools.Wrappers/LZQBasic.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.cs b/SabreTools.Wrappers/LZQBasic.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.cs
rename to SabreTools.Wrappers/LZQBasic.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.Extraction.cs b/SabreTools.Wrappers/LZSZDD.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.Extraction.cs
rename to SabreTools.Wrappers/LZSZDD.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.Printing.cs b/SabreTools.Wrappers/LZSZDD.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.Printing.cs
rename to SabreTools.Wrappers/LZSZDD.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.cs b/SabreTools.Wrappers/LZSZDD.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.cs
rename to SabreTools.Wrappers/LZSZDD.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/LinearExecutable.Printing.cs b/SabreTools.Wrappers/LinearExecutable.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/LinearExecutable.Printing.cs
rename to SabreTools.Wrappers/LinearExecutable.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/LinearExecutable.cs b/SabreTools.Wrappers/LinearExecutable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/LinearExecutable.cs
rename to SabreTools.Wrappers/LinearExecutable.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/MSDOS.Printing.cs b/SabreTools.Wrappers/MSDOS.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/MSDOS.Printing.cs
rename to SabreTools.Wrappers/MSDOS.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/MSDOS.cs b/SabreTools.Wrappers/MSDOS.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/MSDOS.cs
rename to SabreTools.Wrappers/MSDOS.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.Extraction.cs b/SabreTools.Wrappers/MicrosoftCabinet.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.Extraction.cs
rename to SabreTools.Wrappers/MicrosoftCabinet.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.Printing.cs b/SabreTools.Wrappers/MicrosoftCabinet.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.Printing.cs
rename to SabreTools.Wrappers/MicrosoftCabinet.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.cs b/SabreTools.Wrappers/MicrosoftCabinet.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.cs
rename to SabreTools.Wrappers/MicrosoftCabinet.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.Extraction.cs b/SabreTools.Wrappers/MoPaQ.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.Extraction.cs
rename to SabreTools.Wrappers/MoPaQ.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.Printing.cs b/SabreTools.Wrappers/MoPaQ.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.Printing.cs
rename to SabreTools.Wrappers/MoPaQ.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.cs b/SabreTools.Wrappers/MoPaQ.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.cs
rename to SabreTools.Wrappers/MoPaQ.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/N3DS.Encryption.cs b/SabreTools.Wrappers/N3DS.Encryption.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/N3DS.Encryption.cs
rename to SabreTools.Wrappers/N3DS.Encryption.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/N3DS.Printing.cs b/SabreTools.Wrappers/N3DS.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/N3DS.Printing.cs
rename to SabreTools.Wrappers/N3DS.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/N3DS.cs b/SabreTools.Wrappers/N3DS.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/N3DS.cs
rename to SabreTools.Wrappers/N3DS.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/NCF.Printing.cs b/SabreTools.Wrappers/NCF.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/NCF.Printing.cs
rename to SabreTools.Wrappers/NCF.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/NCF.cs b/SabreTools.Wrappers/NCF.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/NCF.cs
rename to SabreTools.Wrappers/NCF.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/NESCart.Extraction.cs b/SabreTools.Wrappers/NESCart.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/NESCart.Extraction.cs
rename to SabreTools.Wrappers/NESCart.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/NESCart.Printing.cs b/SabreTools.Wrappers/NESCart.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/NESCart.Printing.cs
rename to SabreTools.Wrappers/NESCart.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/NESCart.cs b/SabreTools.Wrappers/NESCart.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/NESCart.cs
rename to SabreTools.Wrappers/NESCart.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.Extraction.cs b/SabreTools.Wrappers/NewExecutable.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.Extraction.cs
rename to SabreTools.Wrappers/NewExecutable.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.Printing.cs b/SabreTools.Wrappers/NewExecutable.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.Printing.cs
rename to SabreTools.Wrappers/NewExecutable.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.cs b/SabreTools.Wrappers/NewExecutable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.cs
rename to SabreTools.Wrappers/NewExecutable.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/Nitro.Encryption.cs b/SabreTools.Wrappers/Nitro.Encryption.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/Nitro.Encryption.cs
rename to SabreTools.Wrappers/Nitro.Encryption.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/Nitro.Printing.cs b/SabreTools.Wrappers/Nitro.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/Nitro.Printing.cs
rename to SabreTools.Wrappers/Nitro.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/Nitro.cs b/SabreTools.Wrappers/Nitro.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/Nitro.cs
rename to SabreTools.Wrappers/Nitro.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/ObjectExtensions.cs b/SabreTools.Wrappers/ObjectExtensions.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/ObjectExtensions.cs
rename to SabreTools.Wrappers/ObjectExtensions.cs
diff --git a/SabreTools.Serialization/OldDotNet.cs b/SabreTools.Wrappers/OldDotNet.cs
similarity index 97%
rename from SabreTools.Serialization/OldDotNet.cs
rename to SabreTools.Wrappers/OldDotNet.cs
index 8a42b209..d9b113c5 100644
--- a/SabreTools.Serialization/OldDotNet.cs
+++ b/SabreTools.Wrappers/OldDotNet.cs
@@ -3,7 +3,7 @@
 using System;
 using System.IO;
 
-namespace SabreTools.Serialization
+namespace SabreTools.Wrappers
 {
     /// <summary>
     /// Derived from the mscorlib code from .NET Framework 4.0
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PAK.Extraction.cs b/SabreTools.Wrappers/PAK.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PAK.Extraction.cs
rename to SabreTools.Wrappers/PAK.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PAK.Printing.cs b/SabreTools.Wrappers/PAK.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PAK.Printing.cs
rename to SabreTools.Wrappers/PAK.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PAK.cs b/SabreTools.Wrappers/PAK.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PAK.cs
rename to SabreTools.Wrappers/PAK.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PFF.Extraction.cs b/SabreTools.Wrappers/PFF.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PFF.Extraction.cs
rename to SabreTools.Wrappers/PFF.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PFF.Printing.cs b/SabreTools.Wrappers/PFF.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PFF.Printing.cs
rename to SabreTools.Wrappers/PFF.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PFF.cs b/SabreTools.Wrappers/PFF.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PFF.cs
rename to SabreTools.Wrappers/PFF.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PIC.Printing.cs b/SabreTools.Wrappers/PIC.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PIC.Printing.cs
rename to SabreTools.Wrappers/PIC.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PIC.cs b/SabreTools.Wrappers/PIC.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PIC.cs
rename to SabreTools.Wrappers/PIC.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PKZIP.Extraction.cs b/SabreTools.Wrappers/PKZIP.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PKZIP.Extraction.cs
rename to SabreTools.Wrappers/PKZIP.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PKZIP.Printing.cs b/SabreTools.Wrappers/PKZIP.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PKZIP.Printing.cs
rename to SabreTools.Wrappers/PKZIP.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PKZIP.cs b/SabreTools.Wrappers/PKZIP.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PKZIP.cs
rename to SabreTools.Wrappers/PKZIP.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PlayJAudioFile.Printing.cs b/SabreTools.Wrappers/PlayJAudioFile.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PlayJAudioFile.Printing.cs
rename to SabreTools.Wrappers/PlayJAudioFile.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PlayJAudioFile.cs b/SabreTools.Wrappers/PlayJAudioFile.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PlayJAudioFile.cs
rename to SabreTools.Wrappers/PlayJAudioFile.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PlayJPlaylist.Printing.cs b/SabreTools.Wrappers/PlayJPlaylist.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PlayJPlaylist.Printing.cs
rename to SabreTools.Wrappers/PlayJPlaylist.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PlayJPlaylist.cs b/SabreTools.Wrappers/PlayJPlaylist.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PlayJPlaylist.cs
rename to SabreTools.Wrappers/PlayJPlaylist.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PortableExecutable.Extraction.cs b/SabreTools.Wrappers/PortableExecutable.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PortableExecutable.Extraction.cs
rename to SabreTools.Wrappers/PortableExecutable.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PortableExecutable.Printing.cs b/SabreTools.Wrappers/PortableExecutable.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PortableExecutable.Printing.cs
rename to SabreTools.Wrappers/PortableExecutable.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/PortableExecutable.cs b/SabreTools.Wrappers/PortableExecutable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/PortableExecutable.cs
rename to SabreTools.Wrappers/PortableExecutable.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/Printer.cs b/SabreTools.Wrappers/Printer.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/Printer.cs
rename to SabreTools.Wrappers/Printer.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/QD.Printing.cs b/SabreTools.Wrappers/QD.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/QD.Printing.cs
rename to SabreTools.Wrappers/QD.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/QD.cs b/SabreTools.Wrappers/QD.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/QD.cs
rename to SabreTools.Wrappers/QD.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/Quantum.Extraction.cs b/SabreTools.Wrappers/Quantum.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/Quantum.Extraction.cs
rename to SabreTools.Wrappers/Quantum.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/Quantum.Printing.cs b/SabreTools.Wrappers/Quantum.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/Quantum.Printing.cs
rename to SabreTools.Wrappers/Quantum.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/Quantum.cs b/SabreTools.Wrappers/Quantum.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/Quantum.cs
rename to SabreTools.Wrappers/Quantum.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/RAR.Extraction.cs b/SabreTools.Wrappers/RAR.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/RAR.Extraction.cs
rename to SabreTools.Wrappers/RAR.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/RAR.cs b/SabreTools.Wrappers/RAR.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/RAR.cs
rename to SabreTools.Wrappers/RAR.cs
diff --git a/SabreTools.Wrappers/README.MD b/SabreTools.Wrappers/README.MD
new file mode 100644
index 00000000..6b5d3e07
--- /dev/null
+++ b/SabreTools.Wrappers/README.MD
@@ -0,0 +1,11 @@
+# SabreTools.Wrappers
+
+This library contains "wrapper" classes that combine both a model type and a reader with extension properties and methods. Models are defined in `SabreTools.Data.Models` and readers are defined in `SabreTools.Serialization.Readers`.
+
+Common extension functionality includes:
+
+- Exposing model fields
+- Transformed model fields and generated properties
+- Extension methods for reference or conversion
+- Format information printing
+- Content extraction
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/RealArcadeInstaller.cs b/SabreTools.Wrappers/RealArcadeInstaller.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/RealArcadeInstaller.cs
rename to SabreTools.Wrappers/RealArcadeInstaller.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/RealArcadeMezzanine.cs b/SabreTools.Wrappers/RealArcadeMezzanine.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/RealArcadeMezzanine.cs
rename to SabreTools.Wrappers/RealArcadeMezzanine.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/SFFS.Printing.cs b/SabreTools.Wrappers/SFFS.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/SFFS.Printing.cs
rename to SabreTools.Wrappers/SFFS.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/SFFS.cs b/SabreTools.Wrappers/SFFS.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/SFFS.cs
rename to SabreTools.Wrappers/SFFS.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/SGA.Extraction.cs b/SabreTools.Wrappers/SGA.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/SGA.Extraction.cs
rename to SabreTools.Wrappers/SGA.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/SGA.Printing.cs b/SabreTools.Wrappers/SGA.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/SGA.Printing.cs
rename to SabreTools.Wrappers/SGA.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/SGA.cs b/SabreTools.Wrappers/SGA.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/SGA.cs
rename to SabreTools.Wrappers/SGA.cs
diff --git a/SabreTools.Wrappers/SabreTools.Wrappers.csproj b/SabreTools.Wrappers/SabreTools.Wrappers.csproj
new file mode 100644
index 00000000..87af7437
--- /dev/null
+++ b/SabreTools.Wrappers/SabreTools.Wrappers.csproj
@@ -0,0 +1,56 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <!-- Assembly Properties -->
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <CheckEolTargetFramework>false</CheckEolTargetFramework>
+        <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+        <IncludeSymbols>true</IncludeSymbols>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <Version>2.3.0</Version>
+
+        <!-- Package Properties -->
+        <Authors>Matt Nadareski</Authors>
+        <Description>Classes that wrap serialization and models to allow for including extension properties</Description>
+        <Copyright>Copyright (c) Matt Nadareski 2019-2026</Copyright>
+        <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <RepositoryUrl>https://github.com/SabreTools/SabreTools.Serialization</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>serialization models wrappers printers</PackageTags>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>
+
+    <!-- These are needed for dealing with native Windows DLLs -->
+    <ItemGroup>
+        <Content Include="..\runtimes\**\*">
+            <PackagePath>%(Identity)</PackagePath>
+            <Pack>true</Pack>
+        </Content>
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Include="README.md" Pack="true" PackagePath="" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="GrindCore" Version="0.7.0" />
+        <PackageReference Include="GrindCore.SharpCompress" Version="0.46.2" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+        <PackageReference Include="SabreTools.Hashing" Version="[1.6.1]" />
+        <PackageReference Include="SabreTools.IO" Version="[1.9.1]" />
+     </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\SabreTools.Data.Extensions\SabreTools.Data.Extensions.csproj" />
+      <ProjectReference Include="..\SabreTools.Data.Models\SabreTools.Data.Models.csproj" />
+      <ProjectReference Include="..\SabreTools.ObjectIdentifier\SabreTools.ObjectIdentifier.csproj" />
+      <ProjectReference Include="..\SabreTools.Serialization.Readers\SabreTools.Serialization.Readers.csproj" />
+    </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/SecuROMDFA.Printing.cs b/SabreTools.Wrappers/SecuROMDFA.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/SecuROMDFA.Printing.cs
rename to SabreTools.Wrappers/SecuROMDFA.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/SecuROMDFA.cs b/SabreTools.Wrappers/SecuROMDFA.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/SecuROMDFA.cs
rename to SabreTools.Wrappers/SecuROMDFA.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/SecuROMMatroschkaPackage.Extraction.cs b/SabreTools.Wrappers/SecuROMMatroschkaPackage.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/SecuROMMatroschkaPackage.Extraction.cs
rename to SabreTools.Wrappers/SecuROMMatroschkaPackage.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/SecuROMMatroschkaPackage.Printing.cs b/SabreTools.Wrappers/SecuROMMatroschkaPackage.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/SecuROMMatroschkaPackage.Printing.cs
rename to SabreTools.Wrappers/SecuROMMatroschkaPackage.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/SecuROMMatroschkaPackage.cs b/SabreTools.Wrappers/SecuROMMatroschkaPackage.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/SecuROMMatroschkaPackage.cs
rename to SabreTools.Wrappers/SecuROMMatroschkaPackage.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/SevenZip.Extraction.cs b/SabreTools.Wrappers/SevenZip.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/SevenZip.Extraction.cs
rename to SabreTools.Wrappers/SevenZip.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/SevenZip.cs b/SabreTools.Wrappers/SevenZip.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/SevenZip.cs
rename to SabreTools.Wrappers/SevenZip.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/Skeleton.Extraction.cs b/SabreTools.Wrappers/Skeleton.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/Skeleton.Extraction.cs
rename to SabreTools.Wrappers/Skeleton.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/Skeleton.Printing.cs b/SabreTools.Wrappers/Skeleton.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/Skeleton.Printing.cs
rename to SabreTools.Wrappers/Skeleton.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/Skeleton.cs b/SabreTools.Wrappers/Skeleton.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/Skeleton.cs
rename to SabreTools.Wrappers/Skeleton.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/SkuSis.cs b/SabreTools.Wrappers/SkuSis.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/SkuSis.cs
rename to SabreTools.Wrappers/SkuSis.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/TapeArchive.Extraction.cs b/SabreTools.Wrappers/TapeArchive.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/TapeArchive.Extraction.cs
rename to SabreTools.Wrappers/TapeArchive.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/TapeArchive.Printing.cs b/SabreTools.Wrappers/TapeArchive.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/TapeArchive.Printing.cs
rename to SabreTools.Wrappers/TapeArchive.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/TapeArchive.cs b/SabreTools.Wrappers/TapeArchive.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/TapeArchive.cs
rename to SabreTools.Wrappers/TapeArchive.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/VBSP.Extraction.cs b/SabreTools.Wrappers/VBSP.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/VBSP.Extraction.cs
rename to SabreTools.Wrappers/VBSP.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/VBSP.Printing.cs b/SabreTools.Wrappers/VBSP.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/VBSP.Printing.cs
rename to SabreTools.Wrappers/VBSP.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/VBSP.cs b/SabreTools.Wrappers/VBSP.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/VBSP.cs
rename to SabreTools.Wrappers/VBSP.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/VPK.Extraction.cs b/SabreTools.Wrappers/VPK.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/VPK.Extraction.cs
rename to SabreTools.Wrappers/VPK.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/VPK.Printing.cs b/SabreTools.Wrappers/VPK.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/VPK.Printing.cs
rename to SabreTools.Wrappers/VPK.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/VPK.cs b/SabreTools.Wrappers/VPK.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/VPK.cs
rename to SabreTools.Wrappers/VPK.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/WAD3.Extraction.cs b/SabreTools.Wrappers/WAD3.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/WAD3.Extraction.cs
rename to SabreTools.Wrappers/WAD3.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/WAD3.Printing.cs b/SabreTools.Wrappers/WAD3.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/WAD3.Printing.cs
rename to SabreTools.Wrappers/WAD3.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/WAD3.cs b/SabreTools.Wrappers/WAD3.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/WAD3.cs
rename to SabreTools.Wrappers/WAD3.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/WiseOverlayHeader.Extraction.cs b/SabreTools.Wrappers/WiseOverlayHeader.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/WiseOverlayHeader.Extraction.cs
rename to SabreTools.Wrappers/WiseOverlayHeader.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/WiseOverlayHeader.Printing.cs b/SabreTools.Wrappers/WiseOverlayHeader.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/WiseOverlayHeader.Printing.cs
rename to SabreTools.Wrappers/WiseOverlayHeader.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/WiseOverlayHeader.cs b/SabreTools.Wrappers/WiseOverlayHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/WiseOverlayHeader.cs
rename to SabreTools.Wrappers/WiseOverlayHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/WiseScript.Printing.cs b/SabreTools.Wrappers/WiseScript.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/WiseScript.Printing.cs
rename to SabreTools.Wrappers/WiseScript.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/WiseScript.cs b/SabreTools.Wrappers/WiseScript.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/WiseScript.cs
rename to SabreTools.Wrappers/WiseScript.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/WiseSectionHeader.Extraction.cs b/SabreTools.Wrappers/WiseSectionHeader.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/WiseSectionHeader.Extraction.cs
rename to SabreTools.Wrappers/WiseSectionHeader.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/WiseSectionHeader.Printing.cs b/SabreTools.Wrappers/WiseSectionHeader.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/WiseSectionHeader.Printing.cs
rename to SabreTools.Wrappers/WiseSectionHeader.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/WiseSectionHeader.cs b/SabreTools.Wrappers/WiseSectionHeader.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/WiseSectionHeader.cs
rename to SabreTools.Wrappers/WiseSectionHeader.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/WrapperBase.cs b/SabreTools.Wrappers/WrapperBase.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/WrapperBase.cs
rename to SabreTools.Wrappers/WrapperBase.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/WrapperBaseT.cs b/SabreTools.Wrappers/WrapperBaseT.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/WrapperBaseT.cs
rename to SabreTools.Wrappers/WrapperBaseT.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/WrapperFactory.cs b/SabreTools.Wrappers/WrapperFactory.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/WrapperFactory.cs
rename to SabreTools.Wrappers/WrapperFactory.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/WrapperType.cs b/SabreTools.Wrappers/WrapperType.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/WrapperType.cs
rename to SabreTools.Wrappers/WrapperType.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/XMID.Printing.cs b/SabreTools.Wrappers/XMID.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/XMID.Printing.cs
rename to SabreTools.Wrappers/XMID.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/XMID.cs b/SabreTools.Wrappers/XMID.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/XMID.cs
rename to SabreTools.Wrappers/XMID.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/XZ.Extraction.cs b/SabreTools.Wrappers/XZ.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/XZ.Extraction.cs
rename to SabreTools.Wrappers/XZ.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/XZ.Printing.cs b/SabreTools.Wrappers/XZ.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/XZ.Printing.cs
rename to SabreTools.Wrappers/XZ.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/XZ.cs b/SabreTools.Wrappers/XZ.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/XZ.cs
rename to SabreTools.Wrappers/XZ.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/XZP.Extraction.cs b/SabreTools.Wrappers/XZP.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/XZP.Extraction.cs
rename to SabreTools.Wrappers/XZP.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/XZP.Printing.cs b/SabreTools.Wrappers/XZP.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/XZP.Printing.cs
rename to SabreTools.Wrappers/XZP.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/XZP.cs b/SabreTools.Wrappers/XZP.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/XZP.cs
rename to SabreTools.Wrappers/XZP.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/XboxExecutable.Printing.cs b/SabreTools.Wrappers/XboxExecutable.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/XboxExecutable.Printing.cs
rename to SabreTools.Wrappers/XboxExecutable.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/XboxExecutable.cs b/SabreTools.Wrappers/XboxExecutable.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/XboxExecutable.cs
rename to SabreTools.Wrappers/XboxExecutable.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/XeMID.Printing.cs b/SabreTools.Wrappers/XeMID.Printing.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/XeMID.Printing.cs
rename to SabreTools.Wrappers/XeMID.Printing.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/XeMID.cs b/SabreTools.Wrappers/XeMID.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/XeMID.cs
rename to SabreTools.Wrappers/XeMID.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/ZSTD.Extraction.cs b/SabreTools.Wrappers/ZSTD.Extraction.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/ZSTD.Extraction.cs
rename to SabreTools.Wrappers/ZSTD.Extraction.cs
diff --git a/SabreTools.Serialization/SabreTools.Wrappers/ZSTD.cs b/SabreTools.Wrappers/ZSTD.cs
similarity index 100%
rename from SabreTools.Serialization/SabreTools.Wrappers/ZSTD.cs
rename to SabreTools.Wrappers/ZSTD.cs
diff --git a/SabreTools.Serialization/_EXTERNAL/README.MD b/SabreTools.Wrappers/_EXTERNAL/README.MD
similarity index 100%
rename from SabreTools.Serialization/_EXTERNAL/README.MD
rename to SabreTools.Wrappers/_EXTERNAL/README.MD
diff --git a/SabreTools.Serialization/_EXTERNAL/StormLibSharp/MpqArchive.cs b/SabreTools.Wrappers/_EXTERNAL/StormLibSharp/MpqArchive.cs
similarity index 100%
rename from SabreTools.Serialization/_EXTERNAL/StormLibSharp/MpqArchive.cs
rename to SabreTools.Wrappers/_EXTERNAL/StormLibSharp/MpqArchive.cs
diff --git a/SabreTools.Serialization/_EXTERNAL/StormLibSharp/MpqArchiveCompactingEventArgs.cs b/SabreTools.Wrappers/_EXTERNAL/StormLibSharp/MpqArchiveCompactingEventArgs.cs
similarity index 100%
rename from SabreTools.Serialization/_EXTERNAL/StormLibSharp/MpqArchiveCompactingEventArgs.cs
rename to SabreTools.Wrappers/_EXTERNAL/StormLibSharp/MpqArchiveCompactingEventArgs.cs
diff --git a/SabreTools.Serialization/_EXTERNAL/StormLibSharp/MpqFileStream.cs b/SabreTools.Wrappers/_EXTERNAL/StormLibSharp/MpqFileStream.cs
similarity index 100%
rename from SabreTools.Serialization/_EXTERNAL/StormLibSharp/MpqFileStream.cs
rename to SabreTools.Wrappers/_EXTERNAL/StormLibSharp/MpqFileStream.cs
diff --git a/SabreTools.Serialization/_EXTERNAL/StormLibSharp/Native/Callbacks.cs b/SabreTools.Wrappers/_EXTERNAL/StormLibSharp/Native/Callbacks.cs
similarity index 100%
rename from SabreTools.Serialization/_EXTERNAL/StormLibSharp/Native/Callbacks.cs
rename to SabreTools.Wrappers/_EXTERNAL/StormLibSharp/Native/Callbacks.cs
diff --git a/SabreTools.Serialization/_EXTERNAL/StormLibSharp/Native/MpqArchiveSafeHandle.cs b/SabreTools.Wrappers/_EXTERNAL/StormLibSharp/Native/MpqArchiveSafeHandle.cs
similarity index 100%
rename from SabreTools.Serialization/_EXTERNAL/StormLibSharp/Native/MpqArchiveSafeHandle.cs
rename to SabreTools.Wrappers/_EXTERNAL/StormLibSharp/Native/MpqArchiveSafeHandle.cs
diff --git a/SabreTools.Serialization/_EXTERNAL/StormLibSharp/Native/MpqFileSafeHandle.cs b/SabreTools.Wrappers/_EXTERNAL/StormLibSharp/Native/MpqFileSafeHandle.cs
similarity index 100%
rename from SabreTools.Serialization/_EXTERNAL/StormLibSharp/Native/MpqFileSafeHandle.cs
rename to SabreTools.Wrappers/_EXTERNAL/StormLibSharp/Native/MpqFileSafeHandle.cs
diff --git a/SabreTools.Serialization/_EXTERNAL/StormLibSharp/Native/NativeMethods.cs b/SabreTools.Wrappers/_EXTERNAL/StormLibSharp/Native/NativeMethods.cs
similarity index 99%
rename from SabreTools.Serialization/_EXTERNAL/StormLibSharp/Native/NativeMethods.cs
rename to SabreTools.Wrappers/_EXTERNAL/StormLibSharp/Native/NativeMethods.cs
index d84c7cce..2af0bbc8 100644
--- a/SabreTools.Serialization/_EXTERNAL/StormLibSharp/Native/NativeMethods.cs
+++ b/SabreTools.Wrappers/_EXTERNAL/StormLibSharp/Native/NativeMethods.cs
@@ -462,6 +462,8 @@ namespace StormLibSharp.Native
         #endregion
     }
 
+#pragma warning disable CS0649
+
 #pragma warning disable CS0169
 #pragma warning disable IDE0044
 #pragma warning disable IDE0051
@@ -523,4 +525,5 @@ namespace StormLibSharp.Native
         public uint dwFileKey;
         public uint dwFilePos;
     }
+#pragma warning restore CS0649
 }
diff --git a/SabreTools.Serialization/_EXTERNAL/StormLibSharp/Native/SFileInfoClass.cs b/SabreTools.Wrappers/_EXTERNAL/StormLibSharp/Native/SFileInfoClass.cs
similarity index 100%
rename from SabreTools.Serialization/_EXTERNAL/StormLibSharp/Native/SFileInfoClass.cs
rename to SabreTools.Wrappers/_EXTERNAL/StormLibSharp/Native/SFileInfoClass.cs
diff --git a/SabreTools.Serialization/_EXTERNAL/StormLibSharp/Native/SFileOpenArchiveFlags.cs b/SabreTools.Wrappers/_EXTERNAL/StormLibSharp/Native/SFileOpenArchiveFlags.cs
similarity index 100%
rename from SabreTools.Serialization/_EXTERNAL/StormLibSharp/Native/SFileOpenArchiveFlags.cs
rename to SabreTools.Wrappers/_EXTERNAL/StormLibSharp/Native/SFileOpenArchiveFlags.cs
diff --git a/SabreTools.Serialization/_EXTERNAL/StormLibSharp/Native/Win32Methods.cs b/SabreTools.Wrappers/_EXTERNAL/StormLibSharp/Native/Win32Methods.cs
similarity index 100%
rename from SabreTools.Serialization/_EXTERNAL/StormLibSharp/Native/Win32Methods.cs
rename to SabreTools.Wrappers/_EXTERNAL/StormLibSharp/Native/Win32Methods.cs
diff --git a/SabreTools.Serialization/runtimes/win-x64/native/StormLib.dll b/runtimes/win-x64/native/StormLib.dll
similarity index 100%
rename from SabreTools.Serialization/runtimes/win-x64/native/StormLib.dll
rename to runtimes/win-x64/native/StormLib.dll
diff --git a/SabreTools.Serialization/runtimes/win-x86/native/StormLib.dll b/runtimes/win-x86/native/StormLib.dll
similarity index 100%
rename from SabreTools.Serialization/runtimes/win-x86/native/StormLib.dll
rename to runtimes/win-x86/native/StormLib.dll