diff --git a/.github/workflows/build_nupkg.yml b/.github/workflows/build_nupkg.yml
index c52e9fbf..d8ebd2b3 100644
--- a/.github/workflows/build_nupkg.yml
+++ b/.github/workflows/build_nupkg.yml
@@ -28,13 +28,13 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: 'Nuget Package'
- path: 'bin/Release/*.nupkg'
+ path: 'SabreTools.Serialization/bin/Release/*.nupkg'
- name: Upload to rolling
uses: ncipollo/release-action@v1.14.0
with:
allowUpdates: True
- artifacts: 'bin/Release/*.nupkg'
+ artifacts: 'SabreTools.Serialization/bin/Release/*.nupkg'
body: 'Last built commit: ${{ github.sha }}'
name: 'Rolling Release'
prerelease: True
diff --git a/SabreTools.Serialization.sln b/SabreTools.Serialization.sln
index 8cc7c0e1..8d6cceda 100644
--- a/SabreTools.Serialization.sln
+++ b/SabreTools.Serialization.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Serialization", "SabreTools.Serialization.csproj", "{5B688801-5F36-483E-B2E8-F219BA5923A2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Serialization", "SabreTools.Serialization/SabreTools.Serialization.csproj", "{5B688801-5F36-483E-B2E8-F219BA5923A2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/AttractMode.cs b/SabreTools.Serialization/AttractMode.cs
similarity index 100%
rename from AttractMode.cs
rename to SabreTools.Serialization/AttractMode.cs
diff --git a/Bytes/AACS.Deserializer.cs b/SabreTools.Serialization/Bytes/AACS.Deserializer.cs
similarity index 100%
rename from Bytes/AACS.Deserializer.cs
rename to SabreTools.Serialization/Bytes/AACS.Deserializer.cs
diff --git a/Bytes/BDPlus.Deserializer.cs b/SabreTools.Serialization/Bytes/BDPlus.Deserializer.cs
similarity index 100%
rename from Bytes/BDPlus.Deserializer.cs
rename to SabreTools.Serialization/Bytes/BDPlus.Deserializer.cs
diff --git a/Bytes/BFPK.Deserializer.cs b/SabreTools.Serialization/Bytes/BFPK.Deserializer.cs
similarity index 100%
rename from Bytes/BFPK.Deserializer.cs
rename to SabreTools.Serialization/Bytes/BFPK.Deserializer.cs
diff --git a/Bytes/BSP.Deserializer.cs b/SabreTools.Serialization/Bytes/BSP.Deserializer.cs
similarity index 100%
rename from Bytes/BSP.Deserializer.cs
rename to SabreTools.Serialization/Bytes/BSP.Deserializer.cs
diff --git a/Bytes/CFB.Deserializer.cs b/SabreTools.Serialization/Bytes/CFB.Deserializer.cs
similarity index 100%
rename from Bytes/CFB.Deserializer.cs
rename to SabreTools.Serialization/Bytes/CFB.Deserializer.cs
diff --git a/Bytes/CIA.Deserializer.cs b/SabreTools.Serialization/Bytes/CIA.Deserializer.cs
similarity index 100%
rename from Bytes/CIA.Deserializer.cs
rename to SabreTools.Serialization/Bytes/CIA.Deserializer.cs
diff --git a/Bytes/GCF.Deserializer.cs b/SabreTools.Serialization/Bytes/GCF.Deserializer.cs
similarity index 100%
rename from Bytes/GCF.Deserializer.cs
rename to SabreTools.Serialization/Bytes/GCF.Deserializer.cs
diff --git a/Bytes/IRD.Deserializer.cs b/SabreTools.Serialization/Bytes/IRD.Deserializer.cs
similarity index 100%
rename from Bytes/IRD.Deserializer.cs
rename to SabreTools.Serialization/Bytes/IRD.Deserializer.cs
diff --git a/Bytes/InstallShieldCabinet.Deserializer.cs b/SabreTools.Serialization/Bytes/InstallShieldCabinet.Deserializer.cs
similarity index 100%
rename from Bytes/InstallShieldCabinet.Deserializer.cs
rename to SabreTools.Serialization/Bytes/InstallShieldCabinet.Deserializer.cs
diff --git a/Bytes/LinearExecutable.Deserializer.cs b/SabreTools.Serialization/Bytes/LinearExecutable.Deserializer.cs
similarity index 100%
rename from Bytes/LinearExecutable.Deserializer.cs
rename to SabreTools.Serialization/Bytes/LinearExecutable.Deserializer.cs
diff --git a/Bytes/MSDOS.Deserializer.cs b/SabreTools.Serialization/Bytes/MSDOS.Deserializer.cs
similarity index 100%
rename from Bytes/MSDOS.Deserializer.cs
rename to SabreTools.Serialization/Bytes/MSDOS.Deserializer.cs
diff --git a/Bytes/MicrosoftCabinet.Deserializer.cs b/SabreTools.Serialization/Bytes/MicrosoftCabinet.Deserializer.cs
similarity index 100%
rename from Bytes/MicrosoftCabinet.Deserializer.cs
rename to SabreTools.Serialization/Bytes/MicrosoftCabinet.Deserializer.cs
diff --git a/Bytes/MoPaQ.Deserializer.cs b/SabreTools.Serialization/Bytes/MoPaQ.Deserializer.cs
similarity index 100%
rename from Bytes/MoPaQ.Deserializer.cs
rename to SabreTools.Serialization/Bytes/MoPaQ.Deserializer.cs
diff --git a/Bytes/N3DS.Deserializer.cs b/SabreTools.Serialization/Bytes/N3DS.Deserializer.cs
similarity index 100%
rename from Bytes/N3DS.Deserializer.cs
rename to SabreTools.Serialization/Bytes/N3DS.Deserializer.cs
diff --git a/Bytes/NCF.Deserializer.cs b/SabreTools.Serialization/Bytes/NCF.Deserializer.cs
similarity index 100%
rename from Bytes/NCF.Deserializer.cs
rename to SabreTools.Serialization/Bytes/NCF.Deserializer.cs
diff --git a/Bytes/NewExecutable.Deserializer.cs b/SabreTools.Serialization/Bytes/NewExecutable.Deserializer.cs
similarity index 100%
rename from Bytes/NewExecutable.Deserializer.cs
rename to SabreTools.Serialization/Bytes/NewExecutable.Deserializer.cs
diff --git a/Bytes/Nitro.Deserializer.cs b/SabreTools.Serialization/Bytes/Nitro.Deserializer.cs
similarity index 100%
rename from Bytes/Nitro.Deserializer.cs
rename to SabreTools.Serialization/Bytes/Nitro.Deserializer.cs
diff --git a/Bytes/PAK.Deserializer.cs b/SabreTools.Serialization/Bytes/PAK.Deserializer.cs
similarity index 100%
rename from Bytes/PAK.Deserializer.cs
rename to SabreTools.Serialization/Bytes/PAK.Deserializer.cs
diff --git a/Bytes/PFF.Deserializer.cs b/SabreTools.Serialization/Bytes/PFF.Deserializer.cs
similarity index 100%
rename from Bytes/PFF.Deserializer.cs
rename to SabreTools.Serialization/Bytes/PFF.Deserializer.cs
diff --git a/Bytes/PlayJAudio.Deserializer.cs b/SabreTools.Serialization/Bytes/PlayJAudio.Deserializer.cs
similarity index 100%
rename from Bytes/PlayJAudio.Deserializer.cs
rename to SabreTools.Serialization/Bytes/PlayJAudio.Deserializer.cs
diff --git a/Bytes/PlayJPlaylist.Deserializer.cs b/SabreTools.Serialization/Bytes/PlayJPlaylist.Deserializer.cs
similarity index 100%
rename from Bytes/PlayJPlaylist.Deserializer.cs
rename to SabreTools.Serialization/Bytes/PlayJPlaylist.Deserializer.cs
diff --git a/Bytes/PortableExecutable.Deserializer.cs b/SabreTools.Serialization/Bytes/PortableExecutable.Deserializer.cs
similarity index 100%
rename from Bytes/PortableExecutable.Deserializer.cs
rename to SabreTools.Serialization/Bytes/PortableExecutable.Deserializer.cs
diff --git a/Bytes/Quantum.Deserializer.cs b/SabreTools.Serialization/Bytes/Quantum.Deserializer.cs
similarity index 100%
rename from Bytes/Quantum.Deserializer.cs
rename to SabreTools.Serialization/Bytes/Quantum.Deserializer.cs
diff --git a/Bytes/SGA.Deserializer.cs b/SabreTools.Serialization/Bytes/SGA.Deserializer.cs
similarity index 100%
rename from Bytes/SGA.Deserializer.cs
rename to SabreTools.Serialization/Bytes/SGA.Deserializer.cs
diff --git a/Bytes/VBSP.Deserializer.cs b/SabreTools.Serialization/Bytes/VBSP.Deserializer.cs
similarity index 100%
rename from Bytes/VBSP.Deserializer.cs
rename to SabreTools.Serialization/Bytes/VBSP.Deserializer.cs
diff --git a/Bytes/VPK.Deserializer.cs b/SabreTools.Serialization/Bytes/VPK.Deserializer.cs
similarity index 100%
rename from Bytes/VPK.Deserializer.cs
rename to SabreTools.Serialization/Bytes/VPK.Deserializer.cs
diff --git a/Bytes/WAD.Deserializer.cs b/SabreTools.Serialization/Bytes/WAD.Deserializer.cs
similarity index 100%
rename from Bytes/WAD.Deserializer.cs
rename to SabreTools.Serialization/Bytes/WAD.Deserializer.cs
diff --git a/Bytes/XCP.Deserializer.cs b/SabreTools.Serialization/Bytes/XCP.Deserializer.cs
similarity index 100%
rename from Bytes/XCP.Deserializer.cs
rename to SabreTools.Serialization/Bytes/XCP.Deserializer.cs
diff --git a/CrossModel/ArchiveDotOrg.Deserializer.cs b/SabreTools.Serialization/CrossModel/ArchiveDotOrg.Deserializer.cs
similarity index 100%
rename from CrossModel/ArchiveDotOrg.Deserializer.cs
rename to SabreTools.Serialization/CrossModel/ArchiveDotOrg.Deserializer.cs
diff --git a/CrossModel/ArchiveDotOrg.Serializer.cs b/SabreTools.Serialization/CrossModel/ArchiveDotOrg.Serializer.cs
similarity index 100%
rename from CrossModel/ArchiveDotOrg.Serializer.cs
rename to SabreTools.Serialization/CrossModel/ArchiveDotOrg.Serializer.cs
diff --git a/CrossModel/AttractMode.Deserializer.cs b/SabreTools.Serialization/CrossModel/AttractMode.Deserializer.cs
similarity index 100%
rename from CrossModel/AttractMode.Deserializer.cs
rename to SabreTools.Serialization/CrossModel/AttractMode.Deserializer.cs
diff --git a/CrossModel/AttractMode.Serializer.cs b/SabreTools.Serialization/CrossModel/AttractMode.Serializer.cs
similarity index 100%
rename from CrossModel/AttractMode.Serializer.cs
rename to SabreTools.Serialization/CrossModel/AttractMode.Serializer.cs
diff --git a/CrossModel/ClrMamePro.Deserializer.cs b/SabreTools.Serialization/CrossModel/ClrMamePro.Deserializer.cs
similarity index 100%
rename from CrossModel/ClrMamePro.Deserializer.cs
rename to SabreTools.Serialization/CrossModel/ClrMamePro.Deserializer.cs
diff --git a/CrossModel/ClrMamePro.Serializer.cs b/SabreTools.Serialization/CrossModel/ClrMamePro.Serializer.cs
similarity index 100%
rename from CrossModel/ClrMamePro.Serializer.cs
rename to SabreTools.Serialization/CrossModel/ClrMamePro.Serializer.cs
diff --git a/CrossModel/DosCenter.Deserializer.cs b/SabreTools.Serialization/CrossModel/DosCenter.Deserializer.cs
similarity index 100%
rename from CrossModel/DosCenter.Deserializer.cs
rename to SabreTools.Serialization/CrossModel/DosCenter.Deserializer.cs
diff --git a/CrossModel/DosCenter.Serializer.cs b/SabreTools.Serialization/CrossModel/DosCenter.Serializer.cs
similarity index 100%
rename from CrossModel/DosCenter.Serializer.cs
rename to SabreTools.Serialization/CrossModel/DosCenter.Serializer.cs
diff --git a/CrossModel/EverdriveSMDB.Deserializer.cs b/SabreTools.Serialization/CrossModel/EverdriveSMDB.Deserializer.cs
similarity index 100%
rename from CrossModel/EverdriveSMDB.Deserializer.cs
rename to SabreTools.Serialization/CrossModel/EverdriveSMDB.Deserializer.cs
diff --git a/CrossModel/EverdriveSMDB.Serializer.cs b/SabreTools.Serialization/CrossModel/EverdriveSMDB.Serializer.cs
similarity index 100%
rename from CrossModel/EverdriveSMDB.Serializer.cs
rename to SabreTools.Serialization/CrossModel/EverdriveSMDB.Serializer.cs
diff --git a/CrossModel/Hashfile.Deserializer.cs b/SabreTools.Serialization/CrossModel/Hashfile.Deserializer.cs
similarity index 100%
rename from CrossModel/Hashfile.Deserializer.cs
rename to SabreTools.Serialization/CrossModel/Hashfile.Deserializer.cs
diff --git a/CrossModel/Hashfile.Serializer.cs b/SabreTools.Serialization/CrossModel/Hashfile.Serializer.cs
similarity index 100%
rename from CrossModel/Hashfile.Serializer.cs
rename to SabreTools.Serialization/CrossModel/Hashfile.Serializer.cs
diff --git a/CrossModel/Listrom.Deserializer.cs b/SabreTools.Serialization/CrossModel/Listrom.Deserializer.cs
similarity index 100%
rename from CrossModel/Listrom.Deserializer.cs
rename to SabreTools.Serialization/CrossModel/Listrom.Deserializer.cs
diff --git a/CrossModel/Listrom.Serializer.cs b/SabreTools.Serialization/CrossModel/Listrom.Serializer.cs
similarity index 100%
rename from CrossModel/Listrom.Serializer.cs
rename to SabreTools.Serialization/CrossModel/Listrom.Serializer.cs
diff --git a/CrossModel/Listxml.Deserializer.cs b/SabreTools.Serialization/CrossModel/Listxml.Deserializer.cs
similarity index 100%
rename from CrossModel/Listxml.Deserializer.cs
rename to SabreTools.Serialization/CrossModel/Listxml.Deserializer.cs
diff --git a/CrossModel/Listxml.Serializer.cs b/SabreTools.Serialization/CrossModel/Listxml.Serializer.cs
similarity index 100%
rename from CrossModel/Listxml.Serializer.cs
rename to SabreTools.Serialization/CrossModel/Listxml.Serializer.cs
diff --git a/CrossModel/Logiqx.Deserializer.cs b/SabreTools.Serialization/CrossModel/Logiqx.Deserializer.cs
similarity index 100%
rename from CrossModel/Logiqx.Deserializer.cs
rename to SabreTools.Serialization/CrossModel/Logiqx.Deserializer.cs
diff --git a/CrossModel/Logiqx.Serializer.cs b/SabreTools.Serialization/CrossModel/Logiqx.Serializer.cs
similarity index 100%
rename from CrossModel/Logiqx.Serializer.cs
rename to SabreTools.Serialization/CrossModel/Logiqx.Serializer.cs
diff --git a/CrossModel/M1.Deserializer.cs b/SabreTools.Serialization/CrossModel/M1.Deserializer.cs
similarity index 100%
rename from CrossModel/M1.Deserializer.cs
rename to SabreTools.Serialization/CrossModel/M1.Deserializer.cs
diff --git a/CrossModel/M1.Serializer.cs b/SabreTools.Serialization/CrossModel/M1.Serializer.cs
similarity index 100%
rename from CrossModel/M1.Serializer.cs
rename to SabreTools.Serialization/CrossModel/M1.Serializer.cs
diff --git a/CrossModel/OfflineList.Deserializer.cs b/SabreTools.Serialization/CrossModel/OfflineList.Deserializer.cs
similarity index 100%
rename from CrossModel/OfflineList.Deserializer.cs
rename to SabreTools.Serialization/CrossModel/OfflineList.Deserializer.cs
diff --git a/CrossModel/OfflineList.Serializer.cs b/SabreTools.Serialization/CrossModel/OfflineList.Serializer.cs
similarity index 100%
rename from CrossModel/OfflineList.Serializer.cs
rename to SabreTools.Serialization/CrossModel/OfflineList.Serializer.cs
diff --git a/CrossModel/OpenMSX.Deserializer.cs b/SabreTools.Serialization/CrossModel/OpenMSX.Deserializer.cs
similarity index 100%
rename from CrossModel/OpenMSX.Deserializer.cs
rename to SabreTools.Serialization/CrossModel/OpenMSX.Deserializer.cs
diff --git a/CrossModel/OpenMSX.Serializer.cs b/SabreTools.Serialization/CrossModel/OpenMSX.Serializer.cs
similarity index 100%
rename from CrossModel/OpenMSX.Serializer.cs
rename to SabreTools.Serialization/CrossModel/OpenMSX.Serializer.cs
diff --git a/CrossModel/RomCenter.Deserializer.cs b/SabreTools.Serialization/CrossModel/RomCenter.Deserializer.cs
similarity index 100%
rename from CrossModel/RomCenter.Deserializer.cs
rename to SabreTools.Serialization/CrossModel/RomCenter.Deserializer.cs
diff --git a/CrossModel/RomCenter.Serializer.cs b/SabreTools.Serialization/CrossModel/RomCenter.Serializer.cs
similarity index 100%
rename from CrossModel/RomCenter.Serializer.cs
rename to SabreTools.Serialization/CrossModel/RomCenter.Serializer.cs
diff --git a/CrossModel/SeparatedValue.Deserializer.cs b/SabreTools.Serialization/CrossModel/SeparatedValue.Deserializer.cs
similarity index 100%
rename from CrossModel/SeparatedValue.Deserializer.cs
rename to SabreTools.Serialization/CrossModel/SeparatedValue.Deserializer.cs
diff --git a/CrossModel/SeparatedValue.Serializer.cs b/SabreTools.Serialization/CrossModel/SeparatedValue.Serializer.cs
similarity index 100%
rename from CrossModel/SeparatedValue.Serializer.cs
rename to SabreTools.Serialization/CrossModel/SeparatedValue.Serializer.cs
diff --git a/CrossModel/SoftwareList.Deserializer.cs b/SabreTools.Serialization/CrossModel/SoftwareList.Deserializer.cs
similarity index 100%
rename from CrossModel/SoftwareList.Deserializer.cs
rename to SabreTools.Serialization/CrossModel/SoftwareList.Deserializer.cs
diff --git a/CrossModel/SoftwareList.Serializer.cs b/SabreTools.Serialization/CrossModel/SoftwareList.Serializer.cs
similarity index 100%
rename from CrossModel/SoftwareList.Serializer.cs
rename to SabreTools.Serialization/CrossModel/SoftwareList.Serializer.cs
diff --git a/Enums.cs b/SabreTools.Serialization/Enums.cs
similarity index 100%
rename from Enums.cs
rename to SabreTools.Serialization/Enums.cs
diff --git a/Extensions.NewExecutable.cs b/SabreTools.Serialization/Extensions.NewExecutable.cs
similarity index 100%
rename from Extensions.NewExecutable.cs
rename to SabreTools.Serialization/Extensions.NewExecutable.cs
diff --git a/Extensions.PortableExecutable.cs b/SabreTools.Serialization/Extensions.PortableExecutable.cs
similarity index 100%
rename from Extensions.PortableExecutable.cs
rename to SabreTools.Serialization/Extensions.PortableExecutable.cs
diff --git a/Files/ArchiveDotOrg.Deserializer.cs b/SabreTools.Serialization/Files/ArchiveDotOrg.Deserializer.cs
similarity index 100%
rename from Files/ArchiveDotOrg.Deserializer.cs
rename to SabreTools.Serialization/Files/ArchiveDotOrg.Deserializer.cs
diff --git a/Files/ArchiveDotOrg.Serializer.cs b/SabreTools.Serialization/Files/ArchiveDotOrg.Serializer.cs
similarity index 100%
rename from Files/ArchiveDotOrg.Serializer.cs
rename to SabreTools.Serialization/Files/ArchiveDotOrg.Serializer.cs
diff --git a/Files/AttractMode.Deserializer.cs b/SabreTools.Serialization/Files/AttractMode.Deserializer.cs
similarity index 100%
rename from Files/AttractMode.Deserializer.cs
rename to SabreTools.Serialization/Files/AttractMode.Deserializer.cs
diff --git a/Files/AttractMode.Serializer.cs b/SabreTools.Serialization/Files/AttractMode.Serializer.cs
similarity index 100%
rename from Files/AttractMode.Serializer.cs
rename to SabreTools.Serialization/Files/AttractMode.Serializer.cs
diff --git a/Files/Catalog.Deserializer.cs b/SabreTools.Serialization/Files/Catalog.Deserializer.cs
similarity index 100%
rename from Files/Catalog.Deserializer.cs
rename to SabreTools.Serialization/Files/Catalog.Deserializer.cs
diff --git a/Files/Catalog.Serializer.cs b/SabreTools.Serialization/Files/Catalog.Serializer.cs
similarity index 100%
rename from Files/Catalog.Serializer.cs
rename to SabreTools.Serialization/Files/Catalog.Serializer.cs
diff --git a/Files/ClrMamePro.Deserializer.cs b/SabreTools.Serialization/Files/ClrMamePro.Deserializer.cs
similarity index 100%
rename from Files/ClrMamePro.Deserializer.cs
rename to SabreTools.Serialization/Files/ClrMamePro.Deserializer.cs
diff --git a/Files/ClrMamePro.Serializer.cs b/SabreTools.Serialization/Files/ClrMamePro.Serializer.cs
similarity index 100%
rename from Files/ClrMamePro.Serializer.cs
rename to SabreTools.Serialization/Files/ClrMamePro.Serializer.cs
diff --git a/Files/CueSheet.Deserializer.cs b/SabreTools.Serialization/Files/CueSheet.Deserializer.cs
similarity index 100%
rename from Files/CueSheet.Deserializer.cs
rename to SabreTools.Serialization/Files/CueSheet.Deserializer.cs
diff --git a/Files/CueSheet.Serializer.cs b/SabreTools.Serialization/Files/CueSheet.Serializer.cs
similarity index 100%
rename from Files/CueSheet.Serializer.cs
rename to SabreTools.Serialization/Files/CueSheet.Serializer.cs
diff --git a/Files/DosCenter.Deserializer.cs b/SabreTools.Serialization/Files/DosCenter.Deserializer.cs
similarity index 100%
rename from Files/DosCenter.Deserializer.cs
rename to SabreTools.Serialization/Files/DosCenter.Deserializer.cs
diff --git a/Files/DosCenter.Serializer.cs b/SabreTools.Serialization/Files/DosCenter.Serializer.cs
similarity index 100%
rename from Files/DosCenter.Serializer.cs
rename to SabreTools.Serialization/Files/DosCenter.Serializer.cs
diff --git a/Files/EverdriveSMDB.Deserializer.cs b/SabreTools.Serialization/Files/EverdriveSMDB.Deserializer.cs
similarity index 100%
rename from Files/EverdriveSMDB.Deserializer.cs
rename to SabreTools.Serialization/Files/EverdriveSMDB.Deserializer.cs
diff --git a/Files/EverdriveSMDB.Serializer.cs b/SabreTools.Serialization/Files/EverdriveSMDB.Serializer.cs
similarity index 100%
rename from Files/EverdriveSMDB.Serializer.cs
rename to SabreTools.Serialization/Files/EverdriveSMDB.Serializer.cs
diff --git a/Files/Hashfile.Deserializer.cs b/SabreTools.Serialization/Files/Hashfile.Deserializer.cs
similarity index 100%
rename from Files/Hashfile.Deserializer.cs
rename to SabreTools.Serialization/Files/Hashfile.Deserializer.cs
diff --git a/Files/Hashfile.Serializer.cs b/SabreTools.Serialization/Files/Hashfile.Serializer.cs
similarity index 100%
rename from Files/Hashfile.Serializer.cs
rename to SabreTools.Serialization/Files/Hashfile.Serializer.cs
diff --git a/Files/IRD.Deserializer.cs b/SabreTools.Serialization/Files/IRD.Deserializer.cs
similarity index 100%
rename from Files/IRD.Deserializer.cs
rename to SabreTools.Serialization/Files/IRD.Deserializer.cs
diff --git a/Files/IRD.Serializer.cs b/SabreTools.Serialization/Files/IRD.Serializer.cs
similarity index 100%
rename from Files/IRD.Serializer.cs
rename to SabreTools.Serialization/Files/IRD.Serializer.cs
diff --git a/Files/JsonFile.Deserializer.cs b/SabreTools.Serialization/Files/JsonFile.Deserializer.cs
similarity index 100%
rename from Files/JsonFile.Deserializer.cs
rename to SabreTools.Serialization/Files/JsonFile.Deserializer.cs
diff --git a/Files/JsonFile.Serializer.cs b/SabreTools.Serialization/Files/JsonFile.Serializer.cs
similarity index 100%
rename from Files/JsonFile.Serializer.cs
rename to SabreTools.Serialization/Files/JsonFile.Serializer.cs
diff --git a/Files/Listrom.Deserializer.cs b/SabreTools.Serialization/Files/Listrom.Deserializer.cs
similarity index 100%
rename from Files/Listrom.Deserializer.cs
rename to SabreTools.Serialization/Files/Listrom.Deserializer.cs
diff --git a/Files/Listrom.Serializer.cs b/SabreTools.Serialization/Files/Listrom.Serializer.cs
similarity index 100%
rename from Files/Listrom.Serializer.cs
rename to SabreTools.Serialization/Files/Listrom.Serializer.cs
diff --git a/Files/Listxml.Deserializer.cs b/SabreTools.Serialization/Files/Listxml.Deserializer.cs
similarity index 100%
rename from Files/Listxml.Deserializer.cs
rename to SabreTools.Serialization/Files/Listxml.Deserializer.cs
diff --git a/Files/Listxml.Serializer.cs b/SabreTools.Serialization/Files/Listxml.Serializer.cs
similarity index 100%
rename from Files/Listxml.Serializer.cs
rename to SabreTools.Serialization/Files/Listxml.Serializer.cs
diff --git a/Files/Logiqx.Deserializer.cs b/SabreTools.Serialization/Files/Logiqx.Deserializer.cs
similarity index 100%
rename from Files/Logiqx.Deserializer.cs
rename to SabreTools.Serialization/Files/Logiqx.Deserializer.cs
diff --git a/Files/Logiqx.Serializer.cs b/SabreTools.Serialization/Files/Logiqx.Serializer.cs
similarity index 100%
rename from Files/Logiqx.Serializer.cs
rename to SabreTools.Serialization/Files/Logiqx.Serializer.cs
diff --git a/Files/M1.Deserializer.cs b/SabreTools.Serialization/Files/M1.Deserializer.cs
similarity index 100%
rename from Files/M1.Deserializer.cs
rename to SabreTools.Serialization/Files/M1.Deserializer.cs
diff --git a/Files/M1.Serializer.cs b/SabreTools.Serialization/Files/M1.Serializer.cs
similarity index 100%
rename from Files/M1.Serializer.cs
rename to SabreTools.Serialization/Files/M1.Serializer.cs
diff --git a/Files/OfflineList.Deserializer.cs b/SabreTools.Serialization/Files/OfflineList.Deserializer.cs
similarity index 100%
rename from Files/OfflineList.Deserializer.cs
rename to SabreTools.Serialization/Files/OfflineList.Deserializer.cs
diff --git a/Files/OfflineList.Serializer.cs b/SabreTools.Serialization/Files/OfflineList.Serializer.cs
similarity index 100%
rename from Files/OfflineList.Serializer.cs
rename to SabreTools.Serialization/Files/OfflineList.Serializer.cs
diff --git a/Files/OpenMSX.Deserializer.cs b/SabreTools.Serialization/Files/OpenMSX.Deserializer.cs
similarity index 100%
rename from Files/OpenMSX.Deserializer.cs
rename to SabreTools.Serialization/Files/OpenMSX.Deserializer.cs
diff --git a/Files/OpenMSX.Serializer.cs b/SabreTools.Serialization/Files/OpenMSX.Serializer.cs
similarity index 100%
rename from Files/OpenMSX.Serializer.cs
rename to SabreTools.Serialization/Files/OpenMSX.Serializer.cs
diff --git a/Files/PIC.Deserializer.cs b/SabreTools.Serialization/Files/PIC.Deserializer.cs
similarity index 100%
rename from Files/PIC.Deserializer.cs
rename to SabreTools.Serialization/Files/PIC.Deserializer.cs
diff --git a/Files/PIC.Serializer.cs b/SabreTools.Serialization/Files/PIC.Serializer.cs
similarity index 100%
rename from Files/PIC.Serializer.cs
rename to SabreTools.Serialization/Files/PIC.Serializer.cs
diff --git a/Files/RomCenter.Deserializer.cs b/SabreTools.Serialization/Files/RomCenter.Deserializer.cs
similarity index 100%
rename from Files/RomCenter.Deserializer.cs
rename to SabreTools.Serialization/Files/RomCenter.Deserializer.cs
diff --git a/Files/RomCenter.Serializer.cs b/SabreTools.Serialization/Files/RomCenter.Serializer.cs
similarity index 100%
rename from Files/RomCenter.Serializer.cs
rename to SabreTools.Serialization/Files/RomCenter.Serializer.cs
diff --git a/Files/SeparatedValue.Deserializer.cs b/SabreTools.Serialization/Files/SeparatedValue.Deserializer.cs
similarity index 100%
rename from Files/SeparatedValue.Deserializer.cs
rename to SabreTools.Serialization/Files/SeparatedValue.Deserializer.cs
diff --git a/Files/SeparatedValue.Serializer.cs b/SabreTools.Serialization/Files/SeparatedValue.Serializer.cs
similarity index 100%
rename from Files/SeparatedValue.Serializer.cs
rename to SabreTools.Serialization/Files/SeparatedValue.Serializer.cs
diff --git a/Files/SoftwareList.Deserializer.cs b/SabreTools.Serialization/Files/SoftwareList.Deserializer.cs
similarity index 100%
rename from Files/SoftwareList.Deserializer.cs
rename to SabreTools.Serialization/Files/SoftwareList.Deserializer.cs
diff --git a/Files/SoftwareList.Serializer.cs b/SabreTools.Serialization/Files/SoftwareList.Serializer.cs
similarity index 100%
rename from Files/SoftwareList.Serializer.cs
rename to SabreTools.Serialization/Files/SoftwareList.Serializer.cs
diff --git a/Files/XmlFile.Deserializer.cs b/SabreTools.Serialization/Files/XmlFile.Deserializer.cs
similarity index 100%
rename from Files/XmlFile.Deserializer.cs
rename to SabreTools.Serialization/Files/XmlFile.Deserializer.cs
diff --git a/Files/XmlFile.Serializer.cs b/SabreTools.Serialization/Files/XmlFile.Serializer.cs
similarity index 100%
rename from Files/XmlFile.Serializer.cs
rename to SabreTools.Serialization/Files/XmlFile.Serializer.cs
diff --git a/Interfaces/IByteSerializer.cs b/SabreTools.Serialization/Interfaces/IByteSerializer.cs
similarity index 100%
rename from Interfaces/IByteSerializer.cs
rename to SabreTools.Serialization/Interfaces/IByteSerializer.cs
diff --git a/Interfaces/IFileSerializer.cs b/SabreTools.Serialization/Interfaces/IFileSerializer.cs
similarity index 100%
rename from Interfaces/IFileSerializer.cs
rename to SabreTools.Serialization/Interfaces/IFileSerializer.cs
diff --git a/Interfaces/IModelSerializer.cs b/SabreTools.Serialization/Interfaces/IModelSerializer.cs
similarity index 100%
rename from Interfaces/IModelSerializer.cs
rename to SabreTools.Serialization/Interfaces/IModelSerializer.cs
diff --git a/Interfaces/IStreamSerializer.cs b/SabreTools.Serialization/Interfaces/IStreamSerializer.cs
similarity index 100%
rename from Interfaces/IStreamSerializer.cs
rename to SabreTools.Serialization/Interfaces/IStreamSerializer.cs
diff --git a/Interfaces/IStringSerializer.cs b/SabreTools.Serialization/Interfaces/IStringSerializer.cs
similarity index 100%
rename from Interfaces/IStringSerializer.cs
rename to SabreTools.Serialization/Interfaces/IStringSerializer.cs
diff --git a/Interfaces/IWrapper.cs b/SabreTools.Serialization/Interfaces/IWrapper.cs
similarity index 100%
rename from Interfaces/IWrapper.cs
rename to SabreTools.Serialization/Interfaces/IWrapper.cs
diff --git a/Internal.cs b/SabreTools.Serialization/Internal.cs
similarity index 100%
rename from Internal.cs
rename to SabreTools.Serialization/Internal.cs
diff --git a/Logiqx.cs b/SabreTools.Serialization/Logiqx.cs
similarity index 100%
rename from Logiqx.cs
rename to SabreTools.Serialization/Logiqx.cs
diff --git a/OldDotNet.cs b/SabreTools.Serialization/OldDotNet.cs
similarity index 100%
rename from OldDotNet.cs
rename to SabreTools.Serialization/OldDotNet.cs
diff --git a/OpenMSX.cs b/SabreTools.Serialization/OpenMSX.cs
similarity index 100%
rename from OpenMSX.cs
rename to SabreTools.Serialization/OpenMSX.cs
diff --git a/PathProcessor.cs b/SabreTools.Serialization/PathProcessor.cs
similarity index 100%
rename from PathProcessor.cs
rename to SabreTools.Serialization/PathProcessor.cs
diff --git a/SabreTools.Serialization.csproj b/SabreTools.Serialization/SabreTools.Serialization.csproj
similarity index 95%
rename from SabreTools.Serialization.csproj
rename to SabreTools.Serialization/SabreTools.Serialization.csproj
index 8dabf2a5..515d46ee 100644
--- a/SabreTools.Serialization.csproj
+++ b/SabreTools.Serialization/SabreTools.Serialization.csproj
@@ -23,7 +23,7 @@
-
+
diff --git a/SeparatedValue.cs b/SabreTools.Serialization/SeparatedValue.cs
similarity index 100%
rename from SeparatedValue.cs
rename to SabreTools.Serialization/SeparatedValue.cs
diff --git a/SoftwareList.cs b/SabreTools.Serialization/SoftwareList.cs
similarity index 100%
rename from SoftwareList.cs
rename to SabreTools.Serialization/SoftwareList.cs
diff --git a/Streams/AACS.Deserializer.cs b/SabreTools.Serialization/Streams/AACS.Deserializer.cs
similarity index 100%
rename from Streams/AACS.Deserializer.cs
rename to SabreTools.Serialization/Streams/AACS.Deserializer.cs
diff --git a/Streams/AACS.Serializer.cs b/SabreTools.Serialization/Streams/AACS.Serializer.cs
similarity index 100%
rename from Streams/AACS.Serializer.cs
rename to SabreTools.Serialization/Streams/AACS.Serializer.cs
diff --git a/Streams/ArchiveDotOrg.Deserializer.cs b/SabreTools.Serialization/Streams/ArchiveDotOrg.Deserializer.cs
similarity index 100%
rename from Streams/ArchiveDotOrg.Deserializer.cs
rename to SabreTools.Serialization/Streams/ArchiveDotOrg.Deserializer.cs
diff --git a/Streams/ArchiveDotOrg.Serializer.cs b/SabreTools.Serialization/Streams/ArchiveDotOrg.Serializer.cs
similarity index 100%
rename from Streams/ArchiveDotOrg.Serializer.cs
rename to SabreTools.Serialization/Streams/ArchiveDotOrg.Serializer.cs
diff --git a/Streams/AttractMode.Deserializer.cs b/SabreTools.Serialization/Streams/AttractMode.Deserializer.cs
similarity index 100%
rename from Streams/AttractMode.Deserializer.cs
rename to SabreTools.Serialization/Streams/AttractMode.Deserializer.cs
diff --git a/Streams/AttractMode.Serializer.cs b/SabreTools.Serialization/Streams/AttractMode.Serializer.cs
similarity index 100%
rename from Streams/AttractMode.Serializer.cs
rename to SabreTools.Serialization/Streams/AttractMode.Serializer.cs
diff --git a/Streams/BDPlus.Deserializer.cs b/SabreTools.Serialization/Streams/BDPlus.Deserializer.cs
similarity index 100%
rename from Streams/BDPlus.Deserializer.cs
rename to SabreTools.Serialization/Streams/BDPlus.Deserializer.cs
diff --git a/Streams/BDPlus.Serializer.cs b/SabreTools.Serialization/Streams/BDPlus.Serializer.cs
similarity index 100%
rename from Streams/BDPlus.Serializer.cs
rename to SabreTools.Serialization/Streams/BDPlus.Serializer.cs
diff --git a/Streams/BFPK.Deserializer.cs b/SabreTools.Serialization/Streams/BFPK.Deserializer.cs
similarity index 100%
rename from Streams/BFPK.Deserializer.cs
rename to SabreTools.Serialization/Streams/BFPK.Deserializer.cs
diff --git a/Streams/BFPK.Serializer.cs b/SabreTools.Serialization/Streams/BFPK.Serializer.cs
similarity index 100%
rename from Streams/BFPK.Serializer.cs
rename to SabreTools.Serialization/Streams/BFPK.Serializer.cs
diff --git a/Streams/BSP.Deserializer.cs b/SabreTools.Serialization/Streams/BSP.Deserializer.cs
similarity index 100%
rename from Streams/BSP.Deserializer.cs
rename to SabreTools.Serialization/Streams/BSP.Deserializer.cs
diff --git a/Streams/BSP.Serializer.cs b/SabreTools.Serialization/Streams/BSP.Serializer.cs
similarity index 100%
rename from Streams/BSP.Serializer.cs
rename to SabreTools.Serialization/Streams/BSP.Serializer.cs
diff --git a/Streams/CFB.Deserializer.cs b/SabreTools.Serialization/Streams/CFB.Deserializer.cs
similarity index 100%
rename from Streams/CFB.Deserializer.cs
rename to SabreTools.Serialization/Streams/CFB.Deserializer.cs
diff --git a/Streams/CFB.Serializer.cs b/SabreTools.Serialization/Streams/CFB.Serializer.cs
similarity index 100%
rename from Streams/CFB.Serializer.cs
rename to SabreTools.Serialization/Streams/CFB.Serializer.cs
diff --git a/Streams/CIA.Deserializer.cs b/SabreTools.Serialization/Streams/CIA.Deserializer.cs
similarity index 100%
rename from Streams/CIA.Deserializer.cs
rename to SabreTools.Serialization/Streams/CIA.Deserializer.cs
diff --git a/Streams/CIA.Serializer.cs b/SabreTools.Serialization/Streams/CIA.Serializer.cs
similarity index 100%
rename from Streams/CIA.Serializer.cs
rename to SabreTools.Serialization/Streams/CIA.Serializer.cs
diff --git a/Streams/Catalog.Deserializer.cs b/SabreTools.Serialization/Streams/Catalog.Deserializer.cs
similarity index 100%
rename from Streams/Catalog.Deserializer.cs
rename to SabreTools.Serialization/Streams/Catalog.Deserializer.cs
diff --git a/Streams/Catalog.Serializer.cs b/SabreTools.Serialization/Streams/Catalog.Serializer.cs
similarity index 100%
rename from Streams/Catalog.Serializer.cs
rename to SabreTools.Serialization/Streams/Catalog.Serializer.cs
diff --git a/Streams/ClrMamePro.Deserializer.cs b/SabreTools.Serialization/Streams/ClrMamePro.Deserializer.cs
similarity index 100%
rename from Streams/ClrMamePro.Deserializer.cs
rename to SabreTools.Serialization/Streams/ClrMamePro.Deserializer.cs
diff --git a/Streams/ClrMamePro.Serializer.cs b/SabreTools.Serialization/Streams/ClrMamePro.Serializer.cs
similarity index 100%
rename from Streams/ClrMamePro.Serializer.cs
rename to SabreTools.Serialization/Streams/ClrMamePro.Serializer.cs
diff --git a/Streams/CueSheet.Deserializer.cs b/SabreTools.Serialization/Streams/CueSheet.Deserializer.cs
similarity index 100%
rename from Streams/CueSheet.Deserializer.cs
rename to SabreTools.Serialization/Streams/CueSheet.Deserializer.cs
diff --git a/Streams/CueSheet.Serializer.cs b/SabreTools.Serialization/Streams/CueSheet.Serializer.cs
similarity index 100%
rename from Streams/CueSheet.Serializer.cs
rename to SabreTools.Serialization/Streams/CueSheet.Serializer.cs
diff --git a/Streams/DosCenter.Deserializer.cs b/SabreTools.Serialization/Streams/DosCenter.Deserializer.cs
similarity index 100%
rename from Streams/DosCenter.Deserializer.cs
rename to SabreTools.Serialization/Streams/DosCenter.Deserializer.cs
diff --git a/Streams/DosCenter.Serializer.cs b/SabreTools.Serialization/Streams/DosCenter.Serializer.cs
similarity index 100%
rename from Streams/DosCenter.Serializer.cs
rename to SabreTools.Serialization/Streams/DosCenter.Serializer.cs
diff --git a/Streams/EverdriveSMDB.Deserializer.cs b/SabreTools.Serialization/Streams/EverdriveSMDB.Deserializer.cs
similarity index 100%
rename from Streams/EverdriveSMDB.Deserializer.cs
rename to SabreTools.Serialization/Streams/EverdriveSMDB.Deserializer.cs
diff --git a/Streams/EverdriveSMDB.Serializer.cs b/SabreTools.Serialization/Streams/EverdriveSMDB.Serializer.cs
similarity index 100%
rename from Streams/EverdriveSMDB.Serializer.cs
rename to SabreTools.Serialization/Streams/EverdriveSMDB.Serializer.cs
diff --git a/Streams/GCF.Deserializer.cs b/SabreTools.Serialization/Streams/GCF.Deserializer.cs
similarity index 100%
rename from Streams/GCF.Deserializer.cs
rename to SabreTools.Serialization/Streams/GCF.Deserializer.cs
diff --git a/Streams/GCF.Serializer.cs b/SabreTools.Serialization/Streams/GCF.Serializer.cs
similarity index 100%
rename from Streams/GCF.Serializer.cs
rename to SabreTools.Serialization/Streams/GCF.Serializer.cs
diff --git a/Streams/HashFile.Deserializer.cs b/SabreTools.Serialization/Streams/HashFile.Deserializer.cs
similarity index 100%
rename from Streams/HashFile.Deserializer.cs
rename to SabreTools.Serialization/Streams/HashFile.Deserializer.cs
diff --git a/Streams/Hashfile.Serializer.cs b/SabreTools.Serialization/Streams/Hashfile.Serializer.cs
similarity index 100%
rename from Streams/Hashfile.Serializer.cs
rename to SabreTools.Serialization/Streams/Hashfile.Serializer.cs
diff --git a/Streams/IRD.Deserializer.cs b/SabreTools.Serialization/Streams/IRD.Deserializer.cs
similarity index 100%
rename from Streams/IRD.Deserializer.cs
rename to SabreTools.Serialization/Streams/IRD.Deserializer.cs
diff --git a/Streams/IRD.Serializer.cs b/SabreTools.Serialization/Streams/IRD.Serializer.cs
similarity index 100%
rename from Streams/IRD.Serializer.cs
rename to SabreTools.Serialization/Streams/IRD.Serializer.cs
diff --git a/Streams/InstallShieldCabinet.Deserializer.cs b/SabreTools.Serialization/Streams/InstallShieldCabinet.Deserializer.cs
similarity index 100%
rename from Streams/InstallShieldCabinet.Deserializer.cs
rename to SabreTools.Serialization/Streams/InstallShieldCabinet.Deserializer.cs
diff --git a/Streams/InstallShieldCabinet.Serializer.cs b/SabreTools.Serialization/Streams/InstallShieldCabinet.Serializer.cs
similarity index 100%
rename from Streams/InstallShieldCabinet.Serializer.cs
rename to SabreTools.Serialization/Streams/InstallShieldCabinet.Serializer.cs
diff --git a/Streams/JsonFile.Deserializer.cs b/SabreTools.Serialization/Streams/JsonFile.Deserializer.cs
similarity index 100%
rename from Streams/JsonFile.Deserializer.cs
rename to SabreTools.Serialization/Streams/JsonFile.Deserializer.cs
diff --git a/Streams/JsonFile.Serializer.cs b/SabreTools.Serialization/Streams/JsonFile.Serializer.cs
similarity index 100%
rename from Streams/JsonFile.Serializer.cs
rename to SabreTools.Serialization/Streams/JsonFile.Serializer.cs
diff --git a/Streams/LinearExecutable.Deserializer.cs b/SabreTools.Serialization/Streams/LinearExecutable.Deserializer.cs
similarity index 100%
rename from Streams/LinearExecutable.Deserializer.cs
rename to SabreTools.Serialization/Streams/LinearExecutable.Deserializer.cs
diff --git a/Streams/LinearExecutable.Serializer.cs b/SabreTools.Serialization/Streams/LinearExecutable.Serializer.cs
similarity index 100%
rename from Streams/LinearExecutable.Serializer.cs
rename to SabreTools.Serialization/Streams/LinearExecutable.Serializer.cs
diff --git a/Streams/Listrom.Deserializer.cs b/SabreTools.Serialization/Streams/Listrom.Deserializer.cs
similarity index 100%
rename from Streams/Listrom.Deserializer.cs
rename to SabreTools.Serialization/Streams/Listrom.Deserializer.cs
diff --git a/Streams/Listrom.Serializer.cs b/SabreTools.Serialization/Streams/Listrom.Serializer.cs
similarity index 100%
rename from Streams/Listrom.Serializer.cs
rename to SabreTools.Serialization/Streams/Listrom.Serializer.cs
diff --git a/Streams/Listxml.Deserializer.cs b/SabreTools.Serialization/Streams/Listxml.Deserializer.cs
similarity index 100%
rename from Streams/Listxml.Deserializer.cs
rename to SabreTools.Serialization/Streams/Listxml.Deserializer.cs
diff --git a/Streams/Listxml.Serializer.cs b/SabreTools.Serialization/Streams/Listxml.Serializer.cs
similarity index 100%
rename from Streams/Listxml.Serializer.cs
rename to SabreTools.Serialization/Streams/Listxml.Serializer.cs
diff --git a/Streams/Logiqx.Deserializer.cs b/SabreTools.Serialization/Streams/Logiqx.Deserializer.cs
similarity index 100%
rename from Streams/Logiqx.Deserializer.cs
rename to SabreTools.Serialization/Streams/Logiqx.Deserializer.cs
diff --git a/Streams/Logiqx.Serializer.cs b/SabreTools.Serialization/Streams/Logiqx.Serializer.cs
similarity index 100%
rename from Streams/Logiqx.Serializer.cs
rename to SabreTools.Serialization/Streams/Logiqx.Serializer.cs
diff --git a/Streams/M1.Deserializer.cs b/SabreTools.Serialization/Streams/M1.Deserializer.cs
similarity index 100%
rename from Streams/M1.Deserializer.cs
rename to SabreTools.Serialization/Streams/M1.Deserializer.cs
diff --git a/Streams/M1.Serializer.cs b/SabreTools.Serialization/Streams/M1.Serializer.cs
similarity index 100%
rename from Streams/M1.Serializer.cs
rename to SabreTools.Serialization/Streams/M1.Serializer.cs
diff --git a/Streams/MSDOS.Deserializer.cs b/SabreTools.Serialization/Streams/MSDOS.Deserializer.cs
similarity index 100%
rename from Streams/MSDOS.Deserializer.cs
rename to SabreTools.Serialization/Streams/MSDOS.Deserializer.cs
diff --git a/Streams/MSDOS.Serializer.cs b/SabreTools.Serialization/Streams/MSDOS.Serializer.cs
similarity index 100%
rename from Streams/MSDOS.Serializer.cs
rename to SabreTools.Serialization/Streams/MSDOS.Serializer.cs
diff --git a/Streams/MicrosoftCabinet.Deserializer.cs b/SabreTools.Serialization/Streams/MicrosoftCabinet.Deserializer.cs
similarity index 100%
rename from Streams/MicrosoftCabinet.Deserializer.cs
rename to SabreTools.Serialization/Streams/MicrosoftCabinet.Deserializer.cs
diff --git a/Streams/MicrosoftCabinet.Serializer.cs b/SabreTools.Serialization/Streams/MicrosoftCabinet.Serializer.cs
similarity index 100%
rename from Streams/MicrosoftCabinet.Serializer.cs
rename to SabreTools.Serialization/Streams/MicrosoftCabinet.Serializer.cs
diff --git a/Streams/MoPaQ.Deserializer.cs b/SabreTools.Serialization/Streams/MoPaQ.Deserializer.cs
similarity index 100%
rename from Streams/MoPaQ.Deserializer.cs
rename to SabreTools.Serialization/Streams/MoPaQ.Deserializer.cs
diff --git a/Streams/MoPaQ.Serializer.cs b/SabreTools.Serialization/Streams/MoPaQ.Serializer.cs
similarity index 100%
rename from Streams/MoPaQ.Serializer.cs
rename to SabreTools.Serialization/Streams/MoPaQ.Serializer.cs
diff --git a/Streams/N3DS.Deserializer.cs b/SabreTools.Serialization/Streams/N3DS.Deserializer.cs
similarity index 100%
rename from Streams/N3DS.Deserializer.cs
rename to SabreTools.Serialization/Streams/N3DS.Deserializer.cs
diff --git a/Streams/N3DS.Serializer.cs b/SabreTools.Serialization/Streams/N3DS.Serializer.cs
similarity index 100%
rename from Streams/N3DS.Serializer.cs
rename to SabreTools.Serialization/Streams/N3DS.Serializer.cs
diff --git a/Streams/NCF.Deserialization.cs b/SabreTools.Serialization/Streams/NCF.Deserialization.cs
similarity index 100%
rename from Streams/NCF.Deserialization.cs
rename to SabreTools.Serialization/Streams/NCF.Deserialization.cs
diff --git a/Streams/NCF.Serialization.cs b/SabreTools.Serialization/Streams/NCF.Serialization.cs
similarity index 100%
rename from Streams/NCF.Serialization.cs
rename to SabreTools.Serialization/Streams/NCF.Serialization.cs
diff --git a/Streams/NewExecutable.Deserializer.cs b/SabreTools.Serialization/Streams/NewExecutable.Deserializer.cs
similarity index 100%
rename from Streams/NewExecutable.Deserializer.cs
rename to SabreTools.Serialization/Streams/NewExecutable.Deserializer.cs
diff --git a/Streams/NewExecutable.Serializer.cs b/SabreTools.Serialization/Streams/NewExecutable.Serializer.cs
similarity index 100%
rename from Streams/NewExecutable.Serializer.cs
rename to SabreTools.Serialization/Streams/NewExecutable.Serializer.cs
diff --git a/Streams/Nitro.Deserializer.cs b/SabreTools.Serialization/Streams/Nitro.Deserializer.cs
similarity index 100%
rename from Streams/Nitro.Deserializer.cs
rename to SabreTools.Serialization/Streams/Nitro.Deserializer.cs
diff --git a/Streams/Nitro.Serializer.cs b/SabreTools.Serialization/Streams/Nitro.Serializer.cs
similarity index 100%
rename from Streams/Nitro.Serializer.cs
rename to SabreTools.Serialization/Streams/Nitro.Serializer.cs
diff --git a/Streams/OfflineList.Deserializer.cs b/SabreTools.Serialization/Streams/OfflineList.Deserializer.cs
similarity index 100%
rename from Streams/OfflineList.Deserializer.cs
rename to SabreTools.Serialization/Streams/OfflineList.Deserializer.cs
diff --git a/Streams/OfflineList.Serializer.cs b/SabreTools.Serialization/Streams/OfflineList.Serializer.cs
similarity index 100%
rename from Streams/OfflineList.Serializer.cs
rename to SabreTools.Serialization/Streams/OfflineList.Serializer.cs
diff --git a/Streams/OpenMSX.Deserializer.cs b/SabreTools.Serialization/Streams/OpenMSX.Deserializer.cs
similarity index 100%
rename from Streams/OpenMSX.Deserializer.cs
rename to SabreTools.Serialization/Streams/OpenMSX.Deserializer.cs
diff --git a/Streams/OpenMSX.Serializer.cs b/SabreTools.Serialization/Streams/OpenMSX.Serializer.cs
similarity index 100%
rename from Streams/OpenMSX.Serializer.cs
rename to SabreTools.Serialization/Streams/OpenMSX.Serializer.cs
diff --git a/Streams/PAK.Deserializer.cs b/SabreTools.Serialization/Streams/PAK.Deserializer.cs
similarity index 100%
rename from Streams/PAK.Deserializer.cs
rename to SabreTools.Serialization/Streams/PAK.Deserializer.cs
diff --git a/Streams/PAK.Serializer.cs b/SabreTools.Serialization/Streams/PAK.Serializer.cs
similarity index 100%
rename from Streams/PAK.Serializer.cs
rename to SabreTools.Serialization/Streams/PAK.Serializer.cs
diff --git a/Streams/PFF.Deserializer.cs b/SabreTools.Serialization/Streams/PFF.Deserializer.cs
similarity index 100%
rename from Streams/PFF.Deserializer.cs
rename to SabreTools.Serialization/Streams/PFF.Deserializer.cs
diff --git a/Streams/PFF.Serializer.cs b/SabreTools.Serialization/Streams/PFF.Serializer.cs
similarity index 100%
rename from Streams/PFF.Serializer.cs
rename to SabreTools.Serialization/Streams/PFF.Serializer.cs
diff --git a/Streams/PIC.Deserializer.cs b/SabreTools.Serialization/Streams/PIC.Deserializer.cs
similarity index 100%
rename from Streams/PIC.Deserializer.cs
rename to SabreTools.Serialization/Streams/PIC.Deserializer.cs
diff --git a/Streams/PIC.Serializer.cs b/SabreTools.Serialization/Streams/PIC.Serializer.cs
similarity index 100%
rename from Streams/PIC.Serializer.cs
rename to SabreTools.Serialization/Streams/PIC.Serializer.cs
diff --git a/Streams/PlayJAudio.Deserializer.cs b/SabreTools.Serialization/Streams/PlayJAudio.Deserializer.cs
similarity index 100%
rename from Streams/PlayJAudio.Deserializer.cs
rename to SabreTools.Serialization/Streams/PlayJAudio.Deserializer.cs
diff --git a/Streams/PlayJAudio.Serializer.cs b/SabreTools.Serialization/Streams/PlayJAudio.Serializer.cs
similarity index 100%
rename from Streams/PlayJAudio.Serializer.cs
rename to SabreTools.Serialization/Streams/PlayJAudio.Serializer.cs
diff --git a/Streams/PlayJPlaylist.Deserializer.cs b/SabreTools.Serialization/Streams/PlayJPlaylist.Deserializer.cs
similarity index 100%
rename from Streams/PlayJPlaylist.Deserializer.cs
rename to SabreTools.Serialization/Streams/PlayJPlaylist.Deserializer.cs
diff --git a/Streams/PlayJPlaylist.Serializer.cs b/SabreTools.Serialization/Streams/PlayJPlaylist.Serializer.cs
similarity index 100%
rename from Streams/PlayJPlaylist.Serializer.cs
rename to SabreTools.Serialization/Streams/PlayJPlaylist.Serializer.cs
diff --git a/Streams/PortableExecutable.Deserializer.cs b/SabreTools.Serialization/Streams/PortableExecutable.Deserializer.cs
similarity index 100%
rename from Streams/PortableExecutable.Deserializer.cs
rename to SabreTools.Serialization/Streams/PortableExecutable.Deserializer.cs
diff --git a/Streams/PortableExecutable.Serializer.cs b/SabreTools.Serialization/Streams/PortableExecutable.Serializer.cs
similarity index 100%
rename from Streams/PortableExecutable.Serializer.cs
rename to SabreTools.Serialization/Streams/PortableExecutable.Serializer.cs
diff --git a/Streams/Quantum.Deserializer.cs b/SabreTools.Serialization/Streams/Quantum.Deserializer.cs
similarity index 100%
rename from Streams/Quantum.Deserializer.cs
rename to SabreTools.Serialization/Streams/Quantum.Deserializer.cs
diff --git a/Streams/Quantum.Serializer.cs b/SabreTools.Serialization/Streams/Quantum.Serializer.cs
similarity index 100%
rename from Streams/Quantum.Serializer.cs
rename to SabreTools.Serialization/Streams/Quantum.Serializer.cs
diff --git a/Streams/RomCenter.Deserializer.cs b/SabreTools.Serialization/Streams/RomCenter.Deserializer.cs
similarity index 100%
rename from Streams/RomCenter.Deserializer.cs
rename to SabreTools.Serialization/Streams/RomCenter.Deserializer.cs
diff --git a/Streams/RomCenter.Serializer.cs b/SabreTools.Serialization/Streams/RomCenter.Serializer.cs
similarity index 100%
rename from Streams/RomCenter.Serializer.cs
rename to SabreTools.Serialization/Streams/RomCenter.Serializer.cs
diff --git a/Streams/SGA.Deserializer.cs b/SabreTools.Serialization/Streams/SGA.Deserializer.cs
similarity index 100%
rename from Streams/SGA.Deserializer.cs
rename to SabreTools.Serialization/Streams/SGA.Deserializer.cs
diff --git a/Streams/SGA.Serializer.cs b/SabreTools.Serialization/Streams/SGA.Serializer.cs
similarity index 100%
rename from Streams/SGA.Serializer.cs
rename to SabreTools.Serialization/Streams/SGA.Serializer.cs
diff --git a/Streams/SeparatedValue.Deserializer.cs b/SabreTools.Serialization/Streams/SeparatedValue.Deserializer.cs
similarity index 100%
rename from Streams/SeparatedValue.Deserializer.cs
rename to SabreTools.Serialization/Streams/SeparatedValue.Deserializer.cs
diff --git a/Streams/SeparatedValue.Serializer.cs b/SabreTools.Serialization/Streams/SeparatedValue.Serializer.cs
similarity index 100%
rename from Streams/SeparatedValue.Serializer.cs
rename to SabreTools.Serialization/Streams/SeparatedValue.Serializer.cs
diff --git a/Streams/SoftwareList.Deserializer.cs b/SabreTools.Serialization/Streams/SoftwareList.Deserializer.cs
similarity index 100%
rename from Streams/SoftwareList.Deserializer.cs
rename to SabreTools.Serialization/Streams/SoftwareList.Deserializer.cs
diff --git a/Streams/SoftwareList.Serializer.cs b/SabreTools.Serialization/Streams/SoftwareList.Serializer.cs
similarity index 100%
rename from Streams/SoftwareList.Serializer.cs
rename to SabreTools.Serialization/Streams/SoftwareList.Serializer.cs
diff --git a/Streams/VBSP.Deserializer.cs b/SabreTools.Serialization/Streams/VBSP.Deserializer.cs
similarity index 100%
rename from Streams/VBSP.Deserializer.cs
rename to SabreTools.Serialization/Streams/VBSP.Deserializer.cs
diff --git a/Streams/VBSP.Serializer.cs b/SabreTools.Serialization/Streams/VBSP.Serializer.cs
similarity index 100%
rename from Streams/VBSP.Serializer.cs
rename to SabreTools.Serialization/Streams/VBSP.Serializer.cs
diff --git a/Streams/VPK.Deserializer.cs b/SabreTools.Serialization/Streams/VPK.Deserializer.cs
similarity index 100%
rename from Streams/VPK.Deserializer.cs
rename to SabreTools.Serialization/Streams/VPK.Deserializer.cs
diff --git a/Streams/VPK.Serializer.cs b/SabreTools.Serialization/Streams/VPK.Serializer.cs
similarity index 100%
rename from Streams/VPK.Serializer.cs
rename to SabreTools.Serialization/Streams/VPK.Serializer.cs
diff --git a/Streams/WAD.Deserializer.cs b/SabreTools.Serialization/Streams/WAD.Deserializer.cs
similarity index 100%
rename from Streams/WAD.Deserializer.cs
rename to SabreTools.Serialization/Streams/WAD.Deserializer.cs
diff --git a/Streams/WAD.Serializer.cs b/SabreTools.Serialization/Streams/WAD.Serializer.cs
similarity index 100%
rename from Streams/WAD.Serializer.cs
rename to SabreTools.Serialization/Streams/WAD.Serializer.cs
diff --git a/Streams/XCP.Deserializer.cs b/SabreTools.Serialization/Streams/XCP.Deserializer.cs
similarity index 100%
rename from Streams/XCP.Deserializer.cs
rename to SabreTools.Serialization/Streams/XCP.Deserializer.cs
diff --git a/Streams/XCP.Serializer.cs b/SabreTools.Serialization/Streams/XCP.Serializer.cs
similarity index 100%
rename from Streams/XCP.Serializer.cs
rename to SabreTools.Serialization/Streams/XCP.Serializer.cs
diff --git a/Streams/XmlFile.Deserializer.cs b/SabreTools.Serialization/Streams/XmlFile.Deserializer.cs
similarity index 100%
rename from Streams/XmlFile.Deserializer.cs
rename to SabreTools.Serialization/Streams/XmlFile.Deserializer.cs
diff --git a/Streams/XmlFile.Serializer.cs b/SabreTools.Serialization/Streams/XmlFile.Serializer.cs
similarity index 100%
rename from Streams/XmlFile.Serializer.cs
rename to SabreTools.Serialization/Streams/XmlFile.Serializer.cs
diff --git a/Strings/XMID.Deserializer.cs b/SabreTools.Serialization/Strings/XMID.Deserializer.cs
similarity index 100%
rename from Strings/XMID.Deserializer.cs
rename to SabreTools.Serialization/Strings/XMID.Deserializer.cs
diff --git a/Strings/XMID.Serializer.cs b/SabreTools.Serialization/Strings/XMID.Serializer.cs
similarity index 100%
rename from Strings/XMID.Serializer.cs
rename to SabreTools.Serialization/Strings/XMID.Serializer.cs
diff --git a/Strings/XeMID.Deserializer.cs b/SabreTools.Serialization/Strings/XeMID.Deserializer.cs
similarity index 100%
rename from Strings/XeMID.Deserializer.cs
rename to SabreTools.Serialization/Strings/XeMID.Deserializer.cs
diff --git a/Strings/XeMID.Serializer.cs b/SabreTools.Serialization/Strings/XeMID.Serializer.cs
similarity index 100%
rename from Strings/XeMID.Serializer.cs
rename to SabreTools.Serialization/Strings/XeMID.Serializer.cs
diff --git a/Wrappers/AACSMediaKeyBlock.cs b/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs
similarity index 100%
rename from Wrappers/AACSMediaKeyBlock.cs
rename to SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs
diff --git a/Wrappers/BDPlusSVM.cs b/SabreTools.Serialization/Wrappers/BDPlusSVM.cs
similarity index 100%
rename from Wrappers/BDPlusSVM.cs
rename to SabreTools.Serialization/Wrappers/BDPlusSVM.cs
diff --git a/Wrappers/BFPK.cs b/SabreTools.Serialization/Wrappers/BFPK.cs
similarity index 100%
rename from Wrappers/BFPK.cs
rename to SabreTools.Serialization/Wrappers/BFPK.cs
diff --git a/Wrappers/BSP.cs b/SabreTools.Serialization/Wrappers/BSP.cs
similarity index 100%
rename from Wrappers/BSP.cs
rename to SabreTools.Serialization/Wrappers/BSP.cs
diff --git a/Wrappers/CFB.cs b/SabreTools.Serialization/Wrappers/CFB.cs
similarity index 100%
rename from Wrappers/CFB.cs
rename to SabreTools.Serialization/Wrappers/CFB.cs
diff --git a/Wrappers/CIA.cs b/SabreTools.Serialization/Wrappers/CIA.cs
similarity index 100%
rename from Wrappers/CIA.cs
rename to SabreTools.Serialization/Wrappers/CIA.cs
diff --git a/Wrappers/ConcreteInterfaceSerializer.cs b/SabreTools.Serialization/Wrappers/ConcreteInterfaceSerializer.cs
similarity index 100%
rename from Wrappers/ConcreteInterfaceSerializer.cs
rename to SabreTools.Serialization/Wrappers/ConcreteInterfaceSerializer.cs
diff --git a/Wrappers/Enums.cs b/SabreTools.Serialization/Wrappers/Enums.cs
similarity index 100%
rename from Wrappers/Enums.cs
rename to SabreTools.Serialization/Wrappers/Enums.cs
diff --git a/Wrappers/GCF.cs b/SabreTools.Serialization/Wrappers/GCF.cs
similarity index 100%
rename from Wrappers/GCF.cs
rename to SabreTools.Serialization/Wrappers/GCF.cs
diff --git a/Wrappers/IRD.cs b/SabreTools.Serialization/Wrappers/IRD.cs
similarity index 100%
rename from Wrappers/IRD.cs
rename to SabreTools.Serialization/Wrappers/IRD.cs
diff --git a/Wrappers/InstallShieldCabinet.cs b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs
similarity index 100%
rename from Wrappers/InstallShieldCabinet.cs
rename to SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs
diff --git a/Wrappers/LinearExecutable.cs b/SabreTools.Serialization/Wrappers/LinearExecutable.cs
similarity index 100%
rename from Wrappers/LinearExecutable.cs
rename to SabreTools.Serialization/Wrappers/LinearExecutable.cs
diff --git a/Wrappers/MSDOS.cs b/SabreTools.Serialization/Wrappers/MSDOS.cs
similarity index 100%
rename from Wrappers/MSDOS.cs
rename to SabreTools.Serialization/Wrappers/MSDOS.cs
diff --git a/Wrappers/MicrosoftCabinet.cs b/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs
similarity index 100%
rename from Wrappers/MicrosoftCabinet.cs
rename to SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs
diff --git a/Wrappers/N3DS.cs b/SabreTools.Serialization/Wrappers/N3DS.cs
similarity index 100%
rename from Wrappers/N3DS.cs
rename to SabreTools.Serialization/Wrappers/N3DS.cs
diff --git a/Wrappers/NCF.cs b/SabreTools.Serialization/Wrappers/NCF.cs
similarity index 100%
rename from Wrappers/NCF.cs
rename to SabreTools.Serialization/Wrappers/NCF.cs
diff --git a/Wrappers/NewExecutable.cs b/SabreTools.Serialization/Wrappers/NewExecutable.cs
similarity index 100%
rename from Wrappers/NewExecutable.cs
rename to SabreTools.Serialization/Wrappers/NewExecutable.cs
diff --git a/Wrappers/Nitro.cs b/SabreTools.Serialization/Wrappers/Nitro.cs
similarity index 100%
rename from Wrappers/Nitro.cs
rename to SabreTools.Serialization/Wrappers/Nitro.cs
diff --git a/Wrappers/PAK.cs b/SabreTools.Serialization/Wrappers/PAK.cs
similarity index 100%
rename from Wrappers/PAK.cs
rename to SabreTools.Serialization/Wrappers/PAK.cs
diff --git a/Wrappers/PFF.cs b/SabreTools.Serialization/Wrappers/PFF.cs
similarity index 100%
rename from Wrappers/PFF.cs
rename to SabreTools.Serialization/Wrappers/PFF.cs
diff --git a/Wrappers/PlayJAudioFile.cs b/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs
similarity index 100%
rename from Wrappers/PlayJAudioFile.cs
rename to SabreTools.Serialization/Wrappers/PlayJAudioFile.cs
diff --git a/Wrappers/PortableExecutable.cs b/SabreTools.Serialization/Wrappers/PortableExecutable.cs
similarity index 100%
rename from Wrappers/PortableExecutable.cs
rename to SabreTools.Serialization/Wrappers/PortableExecutable.cs
diff --git a/Wrappers/Quantum.cs b/SabreTools.Serialization/Wrappers/Quantum.cs
similarity index 100%
rename from Wrappers/Quantum.cs
rename to SabreTools.Serialization/Wrappers/Quantum.cs
diff --git a/Wrappers/SGA.cs b/SabreTools.Serialization/Wrappers/SGA.cs
similarity index 100%
rename from Wrappers/SGA.cs
rename to SabreTools.Serialization/Wrappers/SGA.cs
diff --git a/Wrappers/VBSP.cs b/SabreTools.Serialization/Wrappers/VBSP.cs
similarity index 100%
rename from Wrappers/VBSP.cs
rename to SabreTools.Serialization/Wrappers/VBSP.cs
diff --git a/Wrappers/VPK.cs b/SabreTools.Serialization/Wrappers/VPK.cs
similarity index 100%
rename from Wrappers/VPK.cs
rename to SabreTools.Serialization/Wrappers/VPK.cs
diff --git a/Wrappers/WAD.cs b/SabreTools.Serialization/Wrappers/WAD.cs
similarity index 100%
rename from Wrappers/WAD.cs
rename to SabreTools.Serialization/Wrappers/WAD.cs
diff --git a/Wrappers/WrapperBase.cs b/SabreTools.Serialization/Wrappers/WrapperBase.cs
similarity index 100%
rename from Wrappers/WrapperBase.cs
rename to SabreTools.Serialization/Wrappers/WrapperBase.cs
diff --git a/Wrappers/XMID.cs b/SabreTools.Serialization/Wrappers/XMID.cs
similarity index 100%
rename from Wrappers/XMID.cs
rename to SabreTools.Serialization/Wrappers/XMID.cs
diff --git a/Wrappers/XZP.cs b/SabreTools.Serialization/Wrappers/XZP.cs
similarity index 100%
rename from Wrappers/XZP.cs
rename to SabreTools.Serialization/Wrappers/XZP.cs
diff --git a/Wrappers/XeMID.cs b/SabreTools.Serialization/Wrappers/XeMID.cs
similarity index 100%
rename from Wrappers/XeMID.cs
rename to SabreTools.Serialization/Wrappers/XeMID.cs