Wrappers to its own namespace

ExtractionTool/Features/MainFeature.cs

@@ -4,7 +4,7 @@ using SabreTools.CommandLine;
 using SabreTools.CommandLine.Inputs;
 using SabreTools.IO.Extensions;
 using SabreTools.Serialization;
-using SabreTools.Serialization.Wrappers;
+using SabreTools.Wrappers;
 
 namespace ExtractionTool.Features
 {

InfoPrint/Features/MainFeature.cs

@@ -6,7 +6,7 @@ using SabreTools.CommandLine.Inputs;
 using SabreTools.Hashing;
 using SabreTools.IO.Extensions;
 using SabreTools.Serialization;
-using SabreTools.Serialization.Wrappers;
+using SabreTools.Wrappers;
 
 namespace InfoPrint.Features
 {

README.MD

@@ -103,10 +103,10 @@ Below is a table representing the various non-conversion interfaces that are imp
 
 | Interface Name | Purpose |
 | --- | --- |
-| `SabreTools.Serialization.Wrappers.IExtractable` | Marks a wrapper as able to be extracted |
-| `SabreTools.Serialization.Wrappers.IPrintable` | Marks a wrapper as able to print model information |
-| `SabreTools.Serialization.Wrappers.IWrapper` | Represents an item with a description and JSON serializable state, allowing for extensions |
-| `SabreTools.Serialization.Wrappers.IWrapper<TModel>` | Wraps a model with source data, allowing for extensions |
+| `SabreTools.Wrappers.IExtractable` | Marks a wrapper as able to be extracted |
+| `SabreTools.Wrappers.IPrintable` | Marks a wrapper as able to print model information |
+| `SabreTools.Wrappers.IWrapper` | Represents an item with a description and JSON serializable state, allowing for extensions |
+| `SabreTools.Wrappers.IWrapper<TModel>` | Wraps a `TModel` with source data, allowing for extensions |
 
 ## Namespaces
 
@@ -120,5 +120,5 @@ Below is a table of all namespaces within the library and what they represent
 | `SabreTools.ObjectIdentifier` | Object Identifier (OID) parsing |
 | `SabreTools.Serialization.CrossModel` | Convert between models; mainly used for metadata files converting to and from a common, `Dictionary`-based model |
 | `SabreTools.Serialization.Readers` | Convert from external sources to models |
-| `SabreTools.Serialization.Wrappers` | Classes that wrap serialization and models to allow for including extension properties |
 | `SabreTools.Serialization.Writers` | Convert from models to external sources |
+| `SabreTools.Wrappers` | Classes that wrap serialization and models to allow for including extension properties |

SabreTools.Serialization.Test/SabreTools.Serialization.Test.csproj

@@ -11,16 +11,6 @@
         <ProjectReference Include="..\SabreTools.Serialization\SabreTools.Serialization.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-        <None Remove="TestData\**" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Content Include="TestData\**">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </Content>
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="coverlet.collector" Version="8.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

SabreTools.Serialization.sln

@@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.ObjectIdentifier
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Data.Extensions.Test", "SabreTools.Data.Extensions.Test\SabreTools.Data.Extensions.Test.csproj", "{06842E33-CAE6-4E00-B48B-525DE73DF10E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Wrappers.Test", "SabreTools.Wrappers.Test\SabreTools.Wrappers.Test.csproj", "{537126F8-3735-460A-A18E-845C42975697}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,6 +99,18 @@ Global
 		{06842E33-CAE6-4E00-B48B-525DE73DF10E}.Release|x64.Build.0 = Release|Any CPU
 		{06842E33-CAE6-4E00-B48B-525DE73DF10E}.Release|x86.ActiveCfg = Release|Any CPU
 		{06842E33-CAE6-4E00-B48B-525DE73DF10E}.Release|x86.Build.0 = Release|Any CPU
+		{537126F8-3735-460A-A18E-845C42975697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{537126F8-3735-460A-A18E-845C42975697}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{537126F8-3735-460A-A18E-845C42975697}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{537126F8-3735-460A-A18E-845C42975697}.Debug|x64.Build.0 = Debug|Any CPU
+		{537126F8-3735-460A-A18E-845C42975697}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{537126F8-3735-460A-A18E-845C42975697}.Debug|x86.Build.0 = Debug|Any CPU
+		{537126F8-3735-460A-A18E-845C42975697}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{537126F8-3735-460A-A18E-845C42975697}.Release|Any CPU.Build.0 = Release|Any CPU
+		{537126F8-3735-460A-A18E-845C42975697}.Release|x64.ActiveCfg = Release|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

SabreTools.Serialization/Printer.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Text;
-using SabreTools.Serialization.Wrappers;
+using SabreTools.Wrappers;
 
 namespace SabreTools.Serialization
 {

SabreTools.Serialization/SabreTools.Wrappers/AACSMediaKeyBlock.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.AACS;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class AACSMediaKeyBlock : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/AACSMediaKeyBlock.cs

@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using SabreTools.Data.Models.AACS;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class AACSMediaKeyBlock : WrapperBase<MediaKeyBlock>
     {
@@ -106,7 +106,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.AACS().Deserialize(data);
+                var model = new Serialization.Readers.AACS().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.Extraction.cs

@@ -3,7 +3,7 @@ using System.IO;
 using SabreTools.Data.Models.Atari7800;
 using SabreTools.IO.Extensions;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class Atari7800Cart : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.Atari7800;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class Atari7800Cart : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/Atari7800Cart.cs

@@ -2,7 +2,7 @@ using System.IO;
 using System.Text;
 using SabreTools.Data.Models.Atari7800;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class Atari7800Cart : WrapperBase<Cart>
     {
@@ -130,7 +130,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.Atari7800Cart().Deserialize(data);
+                var model = new Serialization.Readers.Atari7800Cart().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.Extraction.cs

@@ -3,7 +3,7 @@ using System.IO;
 using SabreTools.Data.Models.AtariLynx;
 using SabreTools.IO.Extensions;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class AtariLynxCart : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.AtariLynx;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class AtariLynxCart : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/AtariLynxCart.cs

@@ -2,7 +2,7 @@ using System.IO;
 using System.Text;
 using SabreTools.Data.Models.AtariLynx;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class AtariLynxCart : WrapperBase<Cart>
     {
@@ -103,7 +103,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.AtariLynxCart().Deserialize(data);
+                var model = new Serialization.Readers.AtariLynxCart().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/BDPlusSVM.Printing.cs

@@ -1,7 +1,7 @@
 using System.Text;
 using SabreTools.Data.Extensions;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class BDPlusSVM : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/BDPlusSVM.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.BDPlus;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class BDPlusSVM : WrapperBase<SVM>
     {
@@ -82,7 +82,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.BDPlus().Deserialize(data);
+                var model = new Serialization.Readers.BDPlus().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/BFPK.Extraction.cs

@@ -1,8 +1,11 @@
 using System;
 using System.IO;
 using SabreTools.IO.Compression.Deflate;
+#if NET20 || NET35
+using SabreTools.Serialization;
+#endif
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class BFPK : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/BFPK.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.BFPK;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class BFPK : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/BFPK.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.BFPK;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class BFPK : WrapperBase<Archive>
     {
@@ -80,7 +80,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.BFPK().Deserialize(data);
+                var model = new Serialization.Readers.BFPK().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/BSP.Extraction.cs

@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using SabreTools.Data.Models.BSP;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class BSP : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/BSP.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.BSP;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class BSP : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/BSP.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.BSP;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class BSP : WrapperBase<BspFile>
     {
@@ -80,7 +80,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.BSP().Deserialize(data);
+                var model = new Serialization.Readers.BSP().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/BZip2.Extraction.cs

@@ -1,8 +1,11 @@
 using System;
 using System.IO;
 using SabreTools.IO.Compression.BZip2;
+#if NET20 || NET35
+using SabreTools.Serialization;
+#endif
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     /// <summary>
     /// This is a shell wrapper; one that does not contain

SabreTools.Serialization/SabreTools.Wrappers/BZip2.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.BZip2;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     /// <summary>
     /// This is a shell wrapper; one that does not contain

SabreTools.Serialization/SabreTools.Wrappers/CDROM.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.ISO9660;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class CDROM : ISO9660
     {
@@ -77,7 +77,7 @@ namespace SabreTools.Serialization.Wrappers
                 long currentOffset = userData.Position;
 
                 // Deserialize just the sub-stream
-                var model = new Readers.ISO9660().Deserialize(userData);
+                var model = new Serialization.Readers.ISO9660().Deserialize(userData);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/CFB.Extraction.cs

@@ -6,7 +6,7 @@ using SabreTools.Data.Models.CFB;
 using SabreTools.IO.Extensions;
 #endif
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class CFB : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/CFB.Printing.cs

@@ -3,7 +3,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.CFB;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class CFB : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/CFB.cs

@@ -4,7 +4,7 @@ using System.IO;
 using SabreTools.Data.Models.CFB;
 using SabreTools.IO.Extensions;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class CFB : WrapperBase<Binary>
     {
@@ -126,7 +126,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.CFB().Deserialize(data);
+                var model = new Serialization.Readers.CFB().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/CHD.Printing.cs

@@ -4,7 +4,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.CHD;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class CHD : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/CHD.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.CHD;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class CHD : WrapperBase<Header>
     {
@@ -118,7 +118,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.CHD().Deserialize(data);
+                var model = new Serialization.Readers.CHD().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/CIA.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.N3DS;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class CIA : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/CIA.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.N3DS;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class CIA : WrapperBase<Data.Models.N3DS.CIA>
     {
@@ -73,7 +73,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.CIA().Deserialize(data);
+                var model = new Serialization.Readers.CIA().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/ConcreteAbstractSerializer.cs

@@ -5,7 +5,7 @@ using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     /// <summary>
     /// Serializer class for abstract classes

SabreTools.Serialization/SabreTools.Wrappers/ConcreteInterfaceSerializer.cs

@@ -5,7 +5,7 @@ using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     /// <summary>
     /// Serializer class for interfaces

SabreTools.Serialization/SabreTools.Wrappers/FDS.Extraction.cs

@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using SabreTools.IO.Extensions;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class FDS : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/FDS.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.NES;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class FDS : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/FDS.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.NES;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class FDS : WrapperBase<Data.Models.NES.FDS>
     {
@@ -83,7 +83,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.FDS().Deserialize(data);
+                var model = new Serialization.Readers.FDS().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/GCF.Extraction.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class GCF : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/GCF.Printing.cs

@@ -3,7 +3,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.GCF;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class GCF : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/GCF.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.IO;
 using SabreTools.Data.Models.GCF;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class GCF : WrapperBase<Data.Models.GCF.File>
     {
@@ -203,7 +203,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.GCF().Deserialize(data);
+                var model = new Serialization.Readers.GCF().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/GZip.Extraction.cs

@@ -3,8 +3,11 @@ using System.IO;
 using SabreTools.Data.Models.GZIP;
 using SabreTools.IO.Compression.Deflate;
 using SabreTools.IO.Extensions;
+#if NET20 || NET35
+using SabreTools.Serialization;
+#endif
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class GZip : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/GZip.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.GZIP;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class GZip : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/GZip.cs

@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.Data.Models.GZIP;
 using SabreTools.IO.Extensions;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class GZip : WrapperBase<Archive>
     {
@@ -229,7 +229,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.GZip().Deserialize(data);
+                var model = new Serialization.Readers.GZip().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/IExtractable.cs

@@ -1,4 +1,4 @@
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     /// <summary>
     /// Represents an item that is extractable

SabreTools.Serialization/SabreTools.Wrappers/IPrintable.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     /// <summary>
     /// Marks a wrapper as being able to print model information

SabreTools.Serialization/SabreTools.Wrappers/IRD.Printing.cs

@@ -1,7 +1,7 @@
 using System.Text;
 using SabreTools.Data.Extensions;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class IRD : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/IRD.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class IRD : WrapperBase<Data.Models.IRD.File>
     {
@@ -72,7 +72,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.IRD().Deserialize(data);
+                var model = new Serialization.Readers.IRD().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/ISO9660.Extraction.cs

@@ -6,7 +6,7 @@ using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.ISO9660;
 using SabreTools.IO.Extensions;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class ISO9660 : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/ISO9660.Printing.cs

@@ -5,7 +5,7 @@ using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.ISO9660;
 using SabreTools.IO.Extensions;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class ISO9660 : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/ISO9660.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.IO;
 using SabreTools.Data.Models.ISO9660;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class ISO9660 : WrapperBase<Volume>
     {
@@ -90,7 +90,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.ISO9660().Deserialize(data);
+                var model = new Serialization.Readers.ISO9660().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/IWrapper.cs

@@ -1,4 +1,4 @@
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     /// <summary>
     /// Represents a wrapper around a top-level model

SabreTools.Serialization/SabreTools.Wrappers/IWrapperT.cs

@@ -1,4 +1,4 @@
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     /// <summary>
     /// Represents a wrapper around a top-level model

SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.Extraction.cs

@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using SabreTools.IO.Compression.Blast;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     /// <remarks>
     /// Reference (de)compressor: https://www.sac.sk/download/pack/icomp95.zip

SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.InstallShieldArchiveV3;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class InstallShieldArchiveV3 : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/InstallShieldArchiveV3.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.IO;
 using SabreTools.Data.Models.InstallShieldArchiveV3;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     /// <remarks>
     /// Reference (de)compressor: https://www.sac.sk/download/pack/icomp95.zip
@@ -164,7 +164,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.InstallShieldArchiveV3().Deserialize(data);
+                var model = new Serialization.Readers.InstallShieldArchiveV3().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.Extraction.cs

@@ -8,7 +8,7 @@ using SabreTools.IO.Extensions;
 using static SabreTools.Data.Models.InstallShieldCabinet.Constants;
 
 #pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute'
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class InstallShieldCabinet : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.Printing.cs

@@ -3,7 +3,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.InstallShieldCabinet;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class InstallShieldCabinet : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/InstallShieldCabinet.cs

@@ -3,7 +3,7 @@ using System.IO;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.InstallShieldCabinet;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class InstallShieldCabinet : WrapperBase<Cabinet>
     {
@@ -127,7 +127,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.InstallShieldCabinet().Deserialize(data);
+                var model = new Serialization.Readers.InstallShieldCabinet().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/InstallShieldExecutable.Extraction.cs

@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using SabreTools.IO.Extensions;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class InstallShieldExecutable : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/InstallShieldExecutable.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.InstallShieldExecutable;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class InstallShieldExecutable : WrapperBase<SFX>
     {
@@ -80,7 +80,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.InstallShieldExecutable().Deserialize(data);
+                var model = new Serialization.Readers.InstallShieldExecutable().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/LDSCRYPT.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.LDSCRYPT;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     /// <summary>
     /// This is a shell wrapper; one that does not contain

SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.Extraction.cs

@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using SabreTools.IO.Compression.SZDD;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class LZKWAJ : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.LZ;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class LZKWAJ : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/LZKWAJ.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.LZ;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class LZKWAJ : WrapperBase<KWAJFile>
     {
@@ -89,7 +89,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.LZKWAJ().Deserialize(data);
+                var model = new Serialization.Readers.LZKWAJ().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.Extraction.cs

@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using SabreTools.IO.Compression.SZDD;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class LZQBasic : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.LZ;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class LZQBasic : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/LZQBasic.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.LZ;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class LZQBasic : WrapperBase<QBasicFile>
     {
@@ -73,7 +73,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.LZQBasic().Deserialize(data);
+                var model = new Serialization.Readers.LZQBasic().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.Extraction.cs

@@ -3,7 +3,7 @@ using System.IO;
 using SabreTools.IO.Compression.SZDD;
 
 #pragma warning disable CA1866 // Use char overload
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class LZSZDD : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.LZ;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class LZSZDD : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/LZSZDD.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.LZ;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class LZSZDD : WrapperBase<SZDDFile>
     {
@@ -80,7 +80,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.LZSZDD().Deserialize(data);
+                var model = new Serialization.Readers.LZSZDD().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/LinearExecutable.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.LinearExecutable;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class LinearExecutable : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/LinearExecutable.cs

@@ -4,7 +4,7 @@ using SabreTools.Data.Models.LinearExecutable;
 using SabreTools.IO.Extensions;
 
 #pragma warning disable IDE0330 // Use 'System.Threading.Lock'
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class LinearExecutable : WrapperBase<Executable>
     {
@@ -125,7 +125,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.LinearExecutable().Deserialize(data);
+                var model = new Serialization.Readers.LinearExecutable().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/MSDOS.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.MSDOS;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class MSDOS : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/MSDOS.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.MSDOS;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class MSDOS : WrapperBase<Executable>
     {
@@ -73,7 +73,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.MSDOS().Deserialize(data);
+                var model = new Serialization.Readers.MSDOS().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.Extraction.cs

@@ -6,7 +6,7 @@ using SabreTools.IO.Compression.MSZIP;
 using SabreTools.IO.Extensions;
 
 #pragma warning disable CA1822 // Mark members as static
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class MicrosoftCabinet : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.MicrosoftCabinet;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class MicrosoftCabinet : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/MicrosoftCabinet.cs

@@ -4,7 +4,7 @@ using SabreTools.Data.Models.MicrosoftCabinet;
 using SabreTools.IO.Compression.MSZIP;
 using SabreTools.IO.Extensions;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class MicrosoftCabinet : WrapperBase<Cabinet>
     {
@@ -101,7 +101,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.MicrosoftCabinet().Deserialize(data);
+                var model = new Serialization.Readers.MicrosoftCabinet().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.Extraction.cs

@@ -3,7 +3,7 @@ using System.IO;
 using StormLibSharp;
 using static SabreTools.Data.Models.MoPaQ.Constants;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class MoPaQ : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.MoPaQ;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class MoPaQ : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/MoPaQ.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.MoPaQ;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class MoPaQ : WrapperBase<Archive>
     {
@@ -101,7 +101,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.MoPaQ().Deserialize(data);
+                var model = new Serialization.Readers.MoPaQ().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/N3DS.Encryption.cs

@@ -1,7 +1,7 @@
 using System;
 using static SabreTools.Data.Models.N3DS.Constants;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class N3DS
     {

SabreTools.Serialization/SabreTools.Wrappers/N3DS.Printing.cs

@@ -3,7 +3,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.N3DS;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class N3DS : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/N3DS.cs

@@ -3,7 +3,7 @@ using System.IO;
 using SabreTools.Data.Models.N3DS;
 using static SabreTools.Data.Models.N3DS.Constants;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class N3DS : WrapperBase<Cart>
     {
@@ -259,7 +259,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.N3DS().Deserialize(data);
+                var model = new Serialization.Readers.N3DS().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/NCF.Printing.cs

@@ -3,7 +3,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.NCF;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class NCF : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/NCF.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class NCF : WrapperBase<Data.Models.NCF.File>
     {
@@ -72,7 +72,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.NCF().Deserialize(data);
+                var model = new Serialization.Readers.NCF().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/NESCart.Extraction.cs

@@ -3,7 +3,7 @@ using System.IO;
 using SabreTools.Data.Models.NES;
 using SabreTools.IO.Extensions;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class NESCart : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/NESCart.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.NES;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class NESCart : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/NESCart.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.NES;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class NESCart : WrapperBase<Cart>
     {
@@ -436,7 +436,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.NESCart().Deserialize(data);
+                var model = new Serialization.Readers.NESCart().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.Extraction.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using SabreTools.IO.Extensions;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class NewExecutable : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.Printing.cs

@@ -3,7 +3,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.NewExecutable;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class NewExecutable : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/NewExecutable.cs

@@ -5,7 +5,7 @@ using SabreTools.Data.Models.NewExecutable;
 using SabreTools.IO.Extensions;
 
 #pragma warning disable IDE0330 // Use 'System.Threading.Lock'
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class NewExecutable : WrapperBase<Executable>
     {
@@ -66,7 +66,7 @@ namespace SabreTools.Serialization.Wrappers
                             lock (_dataSourceLock)
                             {
                                 _dataSource.SeekIfPossible(offset, SeekOrigin.Begin);
-                                var relocationData = Readers.NewExecutable.ParsePerSegmentData(_dataSource);
+                                var relocationData = Serialization.Readers.NewExecutable.ParsePerSegmentData(_dataSource);
 
                                 offset = _dataSource.Position;
                             }
@@ -366,7 +366,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.NewExecutable().Deserialize(data);
+                var model = new Serialization.Readers.NewExecutable().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/Nitro.Encryption.cs

@@ -2,7 +2,7 @@
 using SabreTools.Data.Models.Nitro;
 using SabreTools.IO.Extensions;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class Nitro
     {

SabreTools.Serialization/SabreTools.Wrappers/Nitro.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.Nitro;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class Nitro : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/Nitro.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.Nitro;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class Nitro : WrapperBase<Cart>
     {
@@ -86,7 +86,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.Nitro().Deserialize(data);
+                var model = new Serialization.Readers.Nitro().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/ObjectExtensions.cs

@@ -2,7 +2,7 @@
 
 using System;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     /// <summary>
     /// Extensions for generic object types

SabreTools.Serialization/SabreTools.Wrappers/PAK.Extraction.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class PAK : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/PAK.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.PAK;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class PAK : IPrintable
     {

SabreTools.Serialization/SabreTools.Wrappers/PAK.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using SabreTools.Data.Models.PAK;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class PAK : WrapperBase<Data.Models.PAK.File>
     {
@@ -80,7 +80,7 @@ namespace SabreTools.Serialization.Wrappers
                 // Cache the current offset
                 long currentOffset = data.Position;
 
-                var model = new Readers.PAK().Deserialize(data);
+                var model = new Serialization.Readers.PAK().Deserialize(data);
                 if (model is null)
                     return null;
 

SabreTools.Serialization/SabreTools.Wrappers/PFF.Extraction.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class PFF : IExtractable
     {

SabreTools.Serialization/SabreTools.Wrappers/PFF.Printing.cs

@@ -2,7 +2,7 @@ using System.Text;
 using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.PFF;
 
-namespace SabreTools.Serialization.Wrappers
+namespace SabreTools.Wrappers
 {
     public partial class PFF : IPrintable
     {