diff --git a/SabreTools.RedumpLib/RedumpOrg/Attributes/SystemAttribute.cs b/SabreTools.RedumpLib.Legacy/Attributes/SystemAttribute.cs
similarity index 96%
rename from SabreTools.RedumpLib/RedumpOrg/Attributes/SystemAttribute.cs
rename to SabreTools.RedumpLib.Legacy/Attributes/SystemAttribute.cs
index 1c660a6..06f5b35 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Attributes/SystemAttribute.cs
+++ b/SabreTools.RedumpLib.Legacy/Attributes/SystemAttribute.cs
@@ -1,7 +1,7 @@
 using SabreTools.RedumpLib.Attributes;
 using SabreTools.RedumpLib.Data;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Attributes
+namespace SabreTools.RedumpLib.Legacy.Attributes
 {
     /// <summary>
     /// Attribute specifc to Redump System values
diff --git a/SabreTools.RedumpLib/RedumpOrg/Converters/LanguageSelectionConverter.cs b/SabreTools.RedumpLib.Legacy/Converters/LanguageSelectionConverter.cs
similarity index 94%
rename from SabreTools.RedumpLib/RedumpOrg/Converters/LanguageSelectionConverter.cs
rename to SabreTools.RedumpLib.Legacy/Converters/LanguageSelectionConverter.cs
index 73190b5..17a0bf8 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Converters/LanguageSelectionConverter.cs
+++ b/SabreTools.RedumpLib.Legacy/Converters/LanguageSelectionConverter.cs
@@ -2,9 +2,9 @@ using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SabreTools.RedumpLib.RedumpOrg.Data;
+using SabreTools.RedumpLib.Legacy.Data;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Converters
+namespace SabreTools.RedumpLib.Legacy.Converters
 {
     /// <summary>
     /// Serialize LanguageSelection enum values
diff --git a/SabreTools.RedumpLib/RedumpOrg/Converters/PhysicalSystemConverter.cs b/SabreTools.RedumpLib.Legacy/Converters/PhysicalSystemConverter.cs
similarity index 91%
rename from SabreTools.RedumpLib/RedumpOrg/Converters/PhysicalSystemConverter.cs
rename to SabreTools.RedumpLib.Legacy/Converters/PhysicalSystemConverter.cs
index ad34fb0..c77b8c6 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Converters/PhysicalSystemConverter.cs
+++ b/SabreTools.RedumpLib.Legacy/Converters/PhysicalSystemConverter.cs
@@ -1,9 +1,9 @@
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SabreTools.RedumpLib.RedumpOrg.Data;
+using SabreTools.RedumpLib.Legacy.Data;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Converters
+namespace SabreTools.RedumpLib.Legacy.Converters
 {
     /// <summary>
     /// Serialize PhysicalSystem enum values
diff --git a/SabreTools.RedumpLib/RedumpOrg/Converters/RegionConverter.cs b/SabreTools.RedumpLib.Legacy/Converters/RegionConverter.cs
similarity index 91%
rename from SabreTools.RedumpLib/RedumpOrg/Converters/RegionConverter.cs
rename to SabreTools.RedumpLib.Legacy/Converters/RegionConverter.cs
index 774aa1b..74d08ea 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Converters/RegionConverter.cs
+++ b/SabreTools.RedumpLib.Legacy/Converters/RegionConverter.cs
@@ -1,9 +1,9 @@
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SabreTools.RedumpLib.RedumpOrg.Data;
+using SabreTools.RedumpLib.Legacy.Data;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Converters
+namespace SabreTools.RedumpLib.Legacy.Converters
 {
     /// <summary>
     /// Serialize Region enum values
diff --git a/SabreTools.RedumpLib/RedumpOrg/Data/Constants.cs b/SabreTools.RedumpLib.Legacy/Data/Constants.cs
similarity index 99%
rename from SabreTools.RedumpLib/RedumpOrg/Data/Constants.cs
rename to SabreTools.RedumpLib.Legacy/Data/Constants.cs
index 487f125..eb7ecb6 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Data/Constants.cs
+++ b/SabreTools.RedumpLib.Legacy/Data/Constants.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Data
+namespace SabreTools.RedumpLib.Legacy.Data
 {
     public static class Constants
     {
diff --git a/SabreTools.RedumpLib/RedumpOrg/Data/Enumerations.cs b/SabreTools.RedumpLib.Legacy/Data/Enumerations.cs
similarity index 99%
rename from SabreTools.RedumpLib/RedumpOrg/Data/Enumerations.cs
rename to SabreTools.RedumpLib.Legacy/Data/Enumerations.cs
index 79f1cc4..1b17e61 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Data/Enumerations.cs
+++ b/SabreTools.RedumpLib.Legacy/Data/Enumerations.cs
@@ -1,9 +1,9 @@
 using SabreTools.RedumpLib.Data;
-using SabreTools.RedumpLib.RedumpOrg.Attributes;
+using SabreTools.RedumpLib.Legacy.Attributes;
 using HumanReadableAttribute = SabreTools.RedumpLib.Attributes.HumanReadableAttribute;
 using LanguageCodeAttribute = SabreTools.RedumpLib.Attributes.LanguageCodeAttribute;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Data
+namespace SabreTools.RedumpLib.Legacy.Data
 {
     /// <summary>
     /// List of all disc subpaths
diff --git a/SabreTools.RedumpLib/RedumpOrg/Data/Extensions.cs b/SabreTools.RedumpLib.Legacy/Data/Extensions.cs
similarity index 99%
rename from SabreTools.RedumpLib/RedumpOrg/Data/Extensions.cs
rename to SabreTools.RedumpLib.Legacy/Data/Extensions.cs
index a73712a..beb406e 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Data/Extensions.cs
+++ b/SabreTools.RedumpLib.Legacy/Data/Extensions.cs
@@ -2,10 +2,10 @@ using System;
 using System.Collections.Generic;
 using SabreTools.RedumpLib.Attributes;
 using MediaType = SabreTools.RedumpLib.Data.MediaType;
-using SystemAttribute = SabreTools.RedumpLib.RedumpOrg.Attributes.SystemAttribute;
+using SystemAttribute = SabreTools.RedumpLib.Legacy.Attributes.SystemAttribute;
 using SystemCategory = SabreTools.RedumpLib.Data.SystemCategory;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Data
+namespace SabreTools.RedumpLib.Legacy.Data
 {
     /// <summary>
     /// Information pertaining to Redump systems
diff --git a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/CommonDiscInfoSection.cs b/SabreTools.RedumpLib.Legacy/Data/Sections/CommonDiscInfoSection.cs
similarity index 99%
rename from SabreTools.RedumpLib/RedumpOrg/Data/Sections/CommonDiscInfoSection.cs
rename to SabreTools.RedumpLib.Legacy/Data/Sections/CommonDiscInfoSection.cs
index a50e407..90ccf40 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/CommonDiscInfoSection.cs
+++ b/SabreTools.RedumpLib.Legacy/Data/Sections/CommonDiscInfoSection.cs
@@ -6,7 +6,7 @@ using DiscCategory = SabreTools.RedumpLib.Data.DiscCategory;
 using MediaType = SabreTools.RedumpLib.Data.MediaType;
 using SiteCode = SabreTools.RedumpLib.Data.SiteCode;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Data.Sections
+namespace SabreTools.RedumpLib.Legacy.Data.Sections
 {
     /// <summary>
     /// Common disc info section of New Disc Form
diff --git a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/CopyProtectionSection.cs b/SabreTools.RedumpLib.Legacy/Data/Sections/CopyProtectionSection.cs
similarity index 97%
rename from SabreTools.RedumpLib/RedumpOrg/Data/Sections/CopyProtectionSection.cs
rename to SabreTools.RedumpLib.Legacy/Data/Sections/CopyProtectionSection.cs
index a699a02..18583d3 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/CopyProtectionSection.cs
+++ b/SabreTools.RedumpLib.Legacy/Data/Sections/CopyProtectionSection.cs
@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 using SabreTools.RedumpLib.Converters;
 using SabreTools.RedumpLib.Data;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Data.Sections
+namespace SabreTools.RedumpLib.Legacy.Data.Sections
 {
     /// <summary>
     /// Copy protection section of New Disc form
diff --git a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/DumpersAndStatusSection.cs b/SabreTools.RedumpLib.Legacy/Data/Sections/DumpersAndStatusSection.cs
similarity index 94%
rename from SabreTools.RedumpLib/RedumpOrg/Data/Sections/DumpersAndStatusSection.cs
rename to SabreTools.RedumpLib.Legacy/Data/Sections/DumpersAndStatusSection.cs
index ba4dadf..4982668 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/DumpersAndStatusSection.cs
+++ b/SabreTools.RedumpLib.Legacy/Data/Sections/DumpersAndStatusSection.cs
@@ -2,7 +2,7 @@ using System;
 using Newtonsoft.Json;
 using SabreTools.RedumpLib.Data;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Data.Sections
+namespace SabreTools.RedumpLib.Legacy.Data.Sections
 {
     /// <summary>
     /// Dumpers and status section of New Disc form (Moderator only)
diff --git a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/DumpingInfoSection.cs b/SabreTools.RedumpLib.Legacy/Data/Sections/DumpingInfoSection.cs
similarity index 97%
rename from SabreTools.RedumpLib/RedumpOrg/Data/Sections/DumpingInfoSection.cs
rename to SabreTools.RedumpLib.Legacy/Data/Sections/DumpingInfoSection.cs
index 412d7dd..30ef70b 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/DumpingInfoSection.cs
+++ b/SabreTools.RedumpLib.Legacy/Data/Sections/DumpingInfoSection.cs
@@ -1,7 +1,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Data.Sections
+namespace SabreTools.RedumpLib.Legacy.Data.Sections
 {
     /// <summary>
     /// Dumping info section for moderation
diff --git a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/EDCSection.cs b/SabreTools.RedumpLib.Legacy/Data/Sections/EDCSection.cs
similarity index 91%
rename from SabreTools.RedumpLib/RedumpOrg/Data/Sections/EDCSection.cs
rename to SabreTools.RedumpLib.Legacy/Data/Sections/EDCSection.cs
index ad59ff3..bcef1f3 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/EDCSection.cs
+++ b/SabreTools.RedumpLib.Legacy/Data/Sections/EDCSection.cs
@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 using SabreTools.RedumpLib.Converters;
 using SabreTools.RedumpLib.Data;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Data.Sections
+namespace SabreTools.RedumpLib.Legacy.Data.Sections
 {
     /// <summary>
     /// EDC section of New Disc form (PSX only)
diff --git a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/ExtrasSection.cs b/SabreTools.RedumpLib.Legacy/Data/Sections/ExtrasSection.cs
similarity index 96%
rename from SabreTools.RedumpLib/RedumpOrg/Data/Sections/ExtrasSection.cs
rename to SabreTools.RedumpLib.Legacy/Data/Sections/ExtrasSection.cs
index 6706923..096c801 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/ExtrasSection.cs
+++ b/SabreTools.RedumpLib.Legacy/Data/Sections/ExtrasSection.cs
@@ -1,7 +1,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Data.Sections
+namespace SabreTools.RedumpLib.Legacy.Data.Sections
 {
     /// <summary>
     /// Extras section of New Disc form
diff --git a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/ParentCloneRelationshipSection.cs b/SabreTools.RedumpLib.Legacy/Data/Sections/ParentCloneRelationshipSection.cs
similarity index 93%
rename from SabreTools.RedumpLib/RedumpOrg/Data/Sections/ParentCloneRelationshipSection.cs
rename to SabreTools.RedumpLib.Legacy/Data/Sections/ParentCloneRelationshipSection.cs
index 6f27fc2..c347b05 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/ParentCloneRelationshipSection.cs
+++ b/SabreTools.RedumpLib.Legacy/Data/Sections/ParentCloneRelationshipSection.cs
@@ -1,7 +1,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Data.Sections
+namespace SabreTools.RedumpLib.Legacy.Data.Sections
 {
     /// <summary>
     /// Parent/Clone relationship section of New Disc form
diff --git a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/SizeAndChecksumsSection.cs b/SabreTools.RedumpLib.Legacy/Data/Sections/SizeAndChecksumsSection.cs
similarity index 95%
rename from SabreTools.RedumpLib/RedumpOrg/Data/Sections/SizeAndChecksumsSection.cs
rename to SabreTools.RedumpLib.Legacy/Data/Sections/SizeAndChecksumsSection.cs
index d121ca6..51db296 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/SizeAndChecksumsSection.cs
+++ b/SabreTools.RedumpLib.Legacy/Data/Sections/SizeAndChecksumsSection.cs
@@ -1,7 +1,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Data.Sections
+namespace SabreTools.RedumpLib.Legacy.Data.Sections
 {
     /// <summary>
     /// Size &amp; checksums section of New Disc form (DVD/BD/UMD-based)
diff --git a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/TracksAndWriteOffsetsSection.cs b/SabreTools.RedumpLib.Legacy/Data/Sections/TracksAndWriteOffsetsSection.cs
similarity index 96%
rename from SabreTools.RedumpLib/RedumpOrg/Data/Sections/TracksAndWriteOffsetsSection.cs
rename to SabreTools.RedumpLib.Legacy/Data/Sections/TracksAndWriteOffsetsSection.cs
index c84c257..21f4751 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/TracksAndWriteOffsetsSection.cs
+++ b/SabreTools.RedumpLib.Legacy/Data/Sections/TracksAndWriteOffsetsSection.cs
@@ -1,7 +1,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Data.Sections
+namespace SabreTools.RedumpLib.Legacy.Data.Sections
 {
     /// <summary>
     /// Tracks and write offsets section of New Disc form (CD/GD-based)
diff --git a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/VersionAndEditionsSection.cs b/SabreTools.RedumpLib.Legacy/Data/Sections/VersionAndEditionsSection.cs
similarity index 95%
rename from SabreTools.RedumpLib/RedumpOrg/Data/Sections/VersionAndEditionsSection.cs
rename to SabreTools.RedumpLib.Legacy/Data/Sections/VersionAndEditionsSection.cs
index f13bd60..d6246c6 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Data/Sections/VersionAndEditionsSection.cs
+++ b/SabreTools.RedumpLib.Legacy/Data/Sections/VersionAndEditionsSection.cs
@@ -1,7 +1,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Data.Sections
+namespace SabreTools.RedumpLib.Legacy.Data.Sections
 {
     /// <summary>
     /// Version and editions section of New Disc form
diff --git a/SabreTools.RedumpLib/RedumpOrg/Data/SubmissionInfo.cs b/SabreTools.RedumpLib.Legacy/Data/SubmissionInfo.cs
similarity index 98%
rename from SabreTools.RedumpLib/RedumpOrg/Data/SubmissionInfo.cs
rename to SabreTools.RedumpLib.Legacy/Data/SubmissionInfo.cs
index f1dd1fc..e496855 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Data/SubmissionInfo.cs
+++ b/SabreTools.RedumpLib.Legacy/Data/SubmissionInfo.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using SabreTools.RedumpLib.RedumpOrg.Data.Sections;
+using SabreTools.RedumpLib.Legacy.Data.Sections;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Data
+namespace SabreTools.RedumpLib.Legacy.Data
 {
     /// <summary>
     /// redump.org submission page information
diff --git a/SabreTools.RedumpLib.Legacy/SabreTools.RedumpLib.Legacy.csproj b/SabreTools.RedumpLib.Legacy/SabreTools.RedumpLib.Legacy.csproj
new file mode 100644
index 0000000..9559633
--- /dev/null
+++ b/SabreTools.RedumpLib.Legacy/SabreTools.RedumpLib.Legacy.csproj
@@ -0,0 +1,43 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <!-- Assembly Properties -->
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <IncludeSymbols>true</IncludeSymbols>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <Version>2.0.8</Version>
+
+        <!-- Package Properties -->
+        <Authors>Matt Nadareski</Authors>
+        <Description>Code to interact with redump.org</Description>
+        <Copyright>Copyright (c) Matt Nadareski 2020-2026</Copyright>
+        <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <RepositoryUrl>https://github.com/SabreTools/SabreTools.RedumpLib</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>web client redump</PackageTags>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <InternalsVisibleTo Include="SabreTools.RedumpLib.Test" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Include="../README.md" Pack="true" PackagePath="" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\SabreTools.RedumpLib\SabreTools.RedumpLib.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="MinAsyncBridge" Version="0.12.4" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))" />
+        <PackageReference Include="Net35.Actions" Version="1.4.0" Condition="$(TargetFramework.StartsWith(`net2`))" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+    </ItemGroup>
+
+</Project>
diff --git a/SabreTools.RedumpLib/RedumpOrg/Tools/Builder.cs b/SabreTools.RedumpLib.Legacy/Tools/Builder.cs
similarity index 98%
rename from SabreTools.RedumpLib/RedumpOrg/Tools/Builder.cs
rename to SabreTools.RedumpLib.Legacy/Tools/Builder.cs
index a809e00..50f6d05 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Tools/Builder.cs
+++ b/SabreTools.RedumpLib.Legacy/Tools/Builder.cs
@@ -6,11 +6,12 @@ using System.Net;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using SabreTools.RedumpLib.Data;
-using Constants = SabreTools.RedumpLib.RedumpOrg.Data.Constants;
-using Language = SabreTools.RedumpLib.RedumpOrg.Data.Language;
-using SubmissionInfo = SabreTools.RedumpLib.RedumpOrg.Data.SubmissionInfo;
+using SabreTools.RedumpLib.Legacy.Web;
+using Constants = SabreTools.RedumpLib.Legacy.Data.Constants;
+using Language = SabreTools.RedumpLib.Legacy.Data.Language;
+using SubmissionInfo = SabreTools.RedumpLib.Legacy.Data.SubmissionInfo;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Tools
+namespace SabreTools.RedumpLib.Legacy.Tools
 {
     public static class Builder
     {
diff --git a/SabreTools.RedumpLib/RedumpOrg/Tools/Formatter.cs b/SabreTools.RedumpLib.Legacy/Tools/Formatter.cs
similarity index 99%
rename from SabreTools.RedumpLib/RedumpOrg/Tools/Formatter.cs
rename to SabreTools.RedumpLib.Legacy/Tools/Formatter.cs
index 7daadcc..105ae64 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Tools/Formatter.cs
+++ b/SabreTools.RedumpLib.Legacy/Tools/Formatter.cs
@@ -3,12 +3,12 @@ using System.Collections.Generic;
 using System.Text;
 using System.Text.RegularExpressions;
 using SabreTools.RedumpLib.Data;
-using SabreTools.RedumpLib.RedumpOrg.Data;
-using SabreTools.RedumpLib.RedumpOrg.Data.Sections;
-using PhysicalSystem = SabreTools.RedumpLib.RedumpOrg.Data.PhysicalSystem;
-using SubmissionInfo = SabreTools.RedumpLib.RedumpOrg.Data.SubmissionInfo;
+using SabreTools.RedumpLib.Legacy.Data;
+using SabreTools.RedumpLib.Legacy.Data.Sections;
+using PhysicalSystem = SabreTools.RedumpLib.Legacy.Data.PhysicalSystem;
+using SubmissionInfo = SabreTools.RedumpLib.Legacy.Data.SubmissionInfo;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Tools
+namespace SabreTools.RedumpLib.Legacy.Tools
 {
     public static class Formatter
     {
diff --git a/SabreTools.RedumpLib/RedumpOrg/Tools/Validator.cs b/SabreTools.RedumpLib.Legacy/Tools/Validator.cs
similarity index 95%
rename from SabreTools.RedumpLib/RedumpOrg/Tools/Validator.cs
rename to SabreTools.RedumpLib.Legacy/Tools/Validator.cs
index 12ae3aa..4286a1d 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Tools/Validator.cs
+++ b/SabreTools.RedumpLib.Legacy/Tools/Validator.cs
@@ -1,10 +1,11 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using SabreTools.RedumpLib.Data;
-using Constants = SabreTools.RedumpLib.RedumpOrg.Data.Constants;
-using SubmissionInfo = SabreTools.RedumpLib.RedumpOrg.Data.SubmissionInfo;
+using SabreTools.RedumpLib.Legacy.Web;
+using Constants = SabreTools.RedumpLib.Legacy.Data.Constants;
+using SubmissionInfo = SabreTools.RedumpLib.Legacy.Data.SubmissionInfo;
 
-namespace SabreTools.RedumpLib.RedumpOrg.Tools
+namespace SabreTools.RedumpLib.Legacy.Tools
 {
     public static class Validator
     {
diff --git a/SabreTools.RedumpLib/RedumpOrg/Client.cs b/SabreTools.RedumpLib.Legacy/Web/Client.cs
similarity index 99%
rename from SabreTools.RedumpLib/RedumpOrg/Client.cs
rename to SabreTools.RedumpLib.Legacy/Web/Client.cs
index fcdb8f0..b06f46e 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Client.cs
+++ b/SabreTools.RedumpLib.Legacy/Web/Client.cs
@@ -10,16 +10,16 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using SabreTools.RedumpLib.Data;
-using SabreTools.RedumpLib.RedumpOrg.Data;
+using SabreTools.RedumpLib.Legacy.Data;
 using SabreTools.RedumpLib.Web;
-using Constants = SabreTools.RedumpLib.RedumpOrg.Data.Constants;
-using DiscSubpath = SabreTools.RedumpLib.RedumpOrg.Data.DiscSubpath;
-using Language = SabreTools.RedumpLib.RedumpOrg.Data.Language;
-using PackType = SabreTools.RedumpLib.RedumpOrg.Data.PackType;
-using PhysicalSystem = SabreTools.RedumpLib.RedumpOrg.Data.PhysicalSystem;
-using Region = SabreTools.RedumpLib.RedumpOrg.Data.Region;
+using Constants = SabreTools.RedumpLib.Legacy.Data.Constants;
+using DiscSubpath = SabreTools.RedumpLib.Legacy.Data.DiscSubpath;
+using Language = SabreTools.RedumpLib.Legacy.Data.Language;
+using PackType = SabreTools.RedumpLib.Legacy.Data.PackType;
+using PhysicalSystem = SabreTools.RedumpLib.Legacy.Data.PhysicalSystem;
+using Region = SabreTools.RedumpLib.Legacy.Data.Region;
 
-namespace SabreTools.RedumpLib.RedumpOrg
+namespace SabreTools.RedumpLib.Legacy.Web
 {
     public class Client
     {
diff --git a/SabreTools.RedumpLib/RedumpOrg/Discs.cs b/SabreTools.RedumpLib.Legacy/Web/Discs.cs
similarity index 97%
rename from SabreTools.RedumpLib/RedumpOrg/Discs.cs
rename to SabreTools.RedumpLib.Legacy/Web/Discs.cs
index 83c1a6c..95a791e 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Discs.cs
+++ b/SabreTools.RedumpLib.Legacy/Web/Discs.cs
@@ -3,12 +3,12 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using SabreTools.RedumpLib.Data;
 using SabreTools.RedumpLib.Web;
-using DiscSubpath = SabreTools.RedumpLib.RedumpOrg.Data.DiscSubpath;
-using Language = SabreTools.RedumpLib.RedumpOrg.Data.Language;
-using PhysicalSystem = SabreTools.RedumpLib.RedumpOrg.Data.PhysicalSystem;
-using Region = SabreTools.RedumpLib.RedumpOrg.Data.Region;
+using DiscSubpath = SabreTools.RedumpLib.Legacy.Data.DiscSubpath;
+using Language = SabreTools.RedumpLib.Legacy.Data.Language;
+using PhysicalSystem = SabreTools.RedumpLib.Legacy.Data.PhysicalSystem;
+using Region = SabreTools.RedumpLib.Legacy.Data.Region;
 
-namespace SabreTools.RedumpLib.RedumpOrg
+namespace SabreTools.RedumpLib.Legacy.Web
 {
     /// <summary>
     /// Contains logic for dealing with disc pages
diff --git a/SabreTools.RedumpLib/RedumpOrg/Packs.cs b/SabreTools.RedumpLib.Legacy/Web/Packs.cs
similarity index 95%
rename from SabreTools.RedumpLib/RedumpOrg/Packs.cs
rename to SabreTools.RedumpLib.Legacy/Web/Packs.cs
index 18b9cf3..2fa54ea 100644
--- a/SabreTools.RedumpLib/RedumpOrg/Packs.cs
+++ b/SabreTools.RedumpLib.Legacy/Web/Packs.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Threading.Tasks;
-using PackType = SabreTools.RedumpLib.RedumpOrg.Data.PackType;
-using PhysicalSystem = SabreTools.RedumpLib.RedumpOrg.Data.PhysicalSystem;
+using PackType = SabreTools.RedumpLib.Legacy.Data.PackType;
+using PhysicalSystem = SabreTools.RedumpLib.Legacy.Data.PhysicalSystem;
 
-namespace SabreTools.RedumpLib.RedumpOrg
+namespace SabreTools.RedumpLib.Legacy.Web
 {
     /// <summary>
     /// Contains logic for dealing with packs
diff --git a/SabreTools.RedumpLib/RedumpOrg/UrlBuilder.cs b/SabreTools.RedumpLib.Legacy/Web/UrlBuilder.cs
similarity index 97%
rename from SabreTools.RedumpLib/RedumpOrg/UrlBuilder.cs
rename to SabreTools.RedumpLib.Legacy/Web/UrlBuilder.cs
index e0697e8..befb191 100644
--- a/SabreTools.RedumpLib/RedumpOrg/UrlBuilder.cs
+++ b/SabreTools.RedumpLib.Legacy/Web/UrlBuilder.cs
@@ -1,16 +1,16 @@
 using System;
 using System.Text;
 using SabreTools.RedumpLib.Data;
-using SabreTools.RedumpLib.RedumpOrg.Data;
-using DiscSubpath = SabreTools.RedumpLib.RedumpOrg.Data.DiscSubpath;
-using Language = SabreTools.RedumpLib.RedumpOrg.Data.Language;
-using PackType = SabreTools.RedumpLib.RedumpOrg.Data.PackType;
-using PhysicalSystem = SabreTools.RedumpLib.RedumpOrg.Data.PhysicalSystem;
-using Region = SabreTools.RedumpLib.RedumpOrg.Data.Region;
+using SabreTools.RedumpLib.Legacy.Data;
+using DiscSubpath = SabreTools.RedumpLib.Legacy.Data.DiscSubpath;
+using Language = SabreTools.RedumpLib.Legacy.Data.Language;
+using PackType = SabreTools.RedumpLib.Legacy.Data.PackType;
+using PhysicalSystem = SabreTools.RedumpLib.Legacy.Data.PhysicalSystem;
+using Region = SabreTools.RedumpLib.Legacy.Data.Region;
 
 // TODO: Errors should validate number or number range (# or #-#)
 
-namespace SabreTools.RedumpLib.RedumpOrg
+namespace SabreTools.RedumpLib.Legacy.Web
 {
     /// <summary>
     /// URL builder helper
diff --git a/SabreTools.RedumpLib/RedumpOrg/WIP.cs b/SabreTools.RedumpLib.Legacy/Web/WIP.cs
similarity index 98%
rename from SabreTools.RedumpLib/RedumpOrg/WIP.cs
rename to SabreTools.RedumpLib.Legacy/Web/WIP.cs
index d217ec9..cf129b5 100644
--- a/SabreTools.RedumpLib/RedumpOrg/WIP.cs
+++ b/SabreTools.RedumpLib.Legacy/Web/WIP.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using SabreTools.RedumpLib.Web;
 
-namespace SabreTools.RedumpLib.RedumpOrg
+namespace SabreTools.RedumpLib.Legacy.Web
 {
     /// <summary>
     /// Contains logic for dealing with WIP queue
diff --git a/SabreTools.RedumpLib.Test/RedumpOrg/UrlBuilderTests.cs b/SabreTools.RedumpLib.Test/RedumpOrg/UrlBuilderTests.cs
index 873c628..6e0133c 100644
--- a/SabreTools.RedumpLib.Test/RedumpOrg/UrlBuilderTests.cs
+++ b/SabreTools.RedumpLib.Test/RedumpOrg/UrlBuilderTests.cs
@@ -1,10 +1,10 @@
 using System;
 using SabreTools.RedumpLib.Data;
-using SabreTools.RedumpLib.RedumpOrg;
+using SabreTools.RedumpLib.Legacy.Web;
 using Xunit;
-using DiscSubpath = SabreTools.RedumpLib.RedumpOrg.Data.DiscSubpath;
-using PackType = SabreTools.RedumpLib.RedumpOrg.Data.PackType;
-using PhysicalSystem = SabreTools.RedumpLib.RedumpOrg.Data.PhysicalSystem;
+using DiscSubpath = SabreTools.RedumpLib.Legacy.Data.DiscSubpath;
+using PackType = SabreTools.RedumpLib.Legacy.Data.PackType;
+using PhysicalSystem = SabreTools.RedumpLib.Legacy.Data.PhysicalSystem;
 
 namespace SabreTools.RedumpLib.Test.RedumpOrg
 {
diff --git a/SabreTools.RedumpLib.Test/SabreTools.RedumpLib.Test.csproj b/SabreTools.RedumpLib.Test/SabreTools.RedumpLib.Test.csproj
index 3b7ff09..bfc5038 100644
--- a/SabreTools.RedumpLib.Test/SabreTools.RedumpLib.Test.csproj
+++ b/SabreTools.RedumpLib.Test/SabreTools.RedumpLib.Test.csproj
@@ -11,6 +11,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\SabreTools.RedumpLib\SabreTools.RedumpLib.csproj" />
+        <ProjectReference Include="..\SabreTools.RedumpLib.Legacy\SabreTools.RedumpLib.Legacy.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/SabreTools.RedumpLib.sln b/SabreTools.RedumpLib.sln
index c2e3d75..f3b3a8d 100644
--- a/SabreTools.RedumpLib.sln
+++ b/SabreTools.RedumpLib.sln
@@ -9,26 +9,68 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.RedumpLib.Test",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedumpTool", "RedumpTool\RedumpTool.csproj", "{556F7AA0-00D7-4D5B-96EB-D436FEFD9810}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.RedumpLib.Legacy", "SabreTools.RedumpLib.Legacy\SabreTools.RedumpLib.Legacy.csproj", "{B3152741-44EC-43C3-9DED-439FA1471587}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{235D3A36-CA69-4348-9EC4-649B27ACFBB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{235D3A36-CA69-4348-9EC4-649B27ACFBB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{235D3A36-CA69-4348-9EC4-649B27ACFBB8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{235D3A36-CA69-4348-9EC4-649B27ACFBB8}.Debug|x64.Build.0 = Debug|Any CPU
+		{235D3A36-CA69-4348-9EC4-649B27ACFBB8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{235D3A36-CA69-4348-9EC4-649B27ACFBB8}.Debug|x86.Build.0 = Debug|Any CPU
 		{235D3A36-CA69-4348-9EC4-649B27ACFBB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{235D3A36-CA69-4348-9EC4-649B27ACFBB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{235D3A36-CA69-4348-9EC4-649B27ACFBB8}.Release|x64.ActiveCfg = Release|Any CPU
+		{235D3A36-CA69-4348-9EC4-649B27ACFBB8}.Release|x64.Build.0 = Release|Any CPU
+		{235D3A36-CA69-4348-9EC4-649B27ACFBB8}.Release|x86.ActiveCfg = Release|Any CPU
+		{235D3A36-CA69-4348-9EC4-649B27ACFBB8}.Release|x86.Build.0 = Release|Any CPU
 		{63519DEA-0C3D-4F0E-95EB-E9B6E1D55378}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{63519DEA-0C3D-4F0E-95EB-E9B6E1D55378}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63519DEA-0C3D-4F0E-95EB-E9B6E1D55378}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{63519DEA-0C3D-4F0E-95EB-E9B6E1D55378}.Debug|x64.Build.0 = Debug|Any CPU
+		{63519DEA-0C3D-4F0E-95EB-E9B6E1D55378}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{63519DEA-0C3D-4F0E-95EB-E9B6E1D55378}.Debug|x86.Build.0 = Debug|Any CPU
 		{63519DEA-0C3D-4F0E-95EB-E9B6E1D55378}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{63519DEA-0C3D-4F0E-95EB-E9B6E1D55378}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63519DEA-0C3D-4F0E-95EB-E9B6E1D55378}.Release|x64.ActiveCfg = Release|Any CPU
+		{63519DEA-0C3D-4F0E-95EB-E9B6E1D55378}.Release|x64.Build.0 = Release|Any CPU
+		{63519DEA-0C3D-4F0E-95EB-E9B6E1D55378}.Release|x86.ActiveCfg = Release|Any CPU
+		{63519DEA-0C3D-4F0E-95EB-E9B6E1D55378}.Release|x86.Build.0 = Release|Any CPU
 		{556F7AA0-00D7-4D5B-96EB-D436FEFD9810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{556F7AA0-00D7-4D5B-96EB-D436FEFD9810}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{556F7AA0-00D7-4D5B-96EB-D436FEFD9810}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{556F7AA0-00D7-4D5B-96EB-D436FEFD9810}.Debug|x64.Build.0 = Debug|Any CPU
+		{556F7AA0-00D7-4D5B-96EB-D436FEFD9810}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{556F7AA0-00D7-4D5B-96EB-D436FEFD9810}.Debug|x86.Build.0 = Debug|Any CPU
 		{556F7AA0-00D7-4D5B-96EB-D436FEFD9810}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{556F7AA0-00D7-4D5B-96EB-D436FEFD9810}.Release|Any CPU.Build.0 = Release|Any CPU
+		{556F7AA0-00D7-4D5B-96EB-D436FEFD9810}.Release|x64.ActiveCfg = Release|Any CPU
+		{556F7AA0-00D7-4D5B-96EB-D436FEFD9810}.Release|x64.Build.0 = Release|Any CPU
+		{556F7AA0-00D7-4D5B-96EB-D436FEFD9810}.Release|x86.ActiveCfg = Release|Any CPU
+		{556F7AA0-00D7-4D5B-96EB-D436FEFD9810}.Release|x86.Build.0 = Release|Any CPU
+		{B3152741-44EC-43C3-9DED-439FA1471587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3152741-44EC-43C3-9DED-439FA1471587}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3152741-44EC-43C3-9DED-439FA1471587}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B3152741-44EC-43C3-9DED-439FA1471587}.Debug|x64.Build.0 = Debug|Any CPU
+		{B3152741-44EC-43C3-9DED-439FA1471587}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B3152741-44EC-43C3-9DED-439FA1471587}.Debug|x86.Build.0 = Debug|Any CPU
+		{B3152741-44EC-43C3-9DED-439FA1471587}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3152741-44EC-43C3-9DED-439FA1471587}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3152741-44EC-43C3-9DED-439FA1471587}.Release|x64.ActiveCfg = Release|Any CPU
+		{B3152741-44EC-43C3-9DED-439FA1471587}.Release|x64.Build.0 = Release|Any CPU
+		{B3152741-44EC-43C3-9DED-439FA1471587}.Release|x86.ActiveCfg = Release|Any CPU
+		{B3152741-44EC-43C3-9DED-439FA1471587}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
diff --git a/SabreTools.RedumpLib/SabreTools.RedumpLib.csproj b/SabreTools.RedumpLib/SabreTools.RedumpLib.csproj
index 3f12c71..d8ac6ff 100644
--- a/SabreTools.RedumpLib/SabreTools.RedumpLib.csproj
+++ b/SabreTools.RedumpLib/SabreTools.RedumpLib.csproj
@@ -23,6 +23,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <InternalsVisibleTo Include="SabreTools.RedumpLib.Legacy" />
         <InternalsVisibleTo Include="SabreTools.RedumpLib.Test" />
     </ItemGroup>
 
diff --git a/publish-nix.sh b/publish-nix.sh
index 9083891..124eebf 100755
--- a/publish-nix.sh
+++ b/publish-nix.sh
@@ -71,6 +71,7 @@ then
 
     # Create Nuget Package
     dotnet pack SabreTools.RedumpLib/SabreTools.RedumpLib.csproj --output $BUILD_FOLDER
+    dotnet pack SabreTools.RedumpLib.Legacy/SabreTools.RedumpLib.Legacy.csproj --output $BUILD_FOLDER
 
     # Build Tool
     for FRAMEWORK in "${FRAMEWORKS[@]}"; do
diff --git a/publish-win.ps1 b/publish-win.ps1
index 115d0cc..79748bc 100644
--- a/publish-win.ps1
+++ b/publish-win.ps1
@@ -62,6 +62,7 @@ if (!$NO_BUILD.IsPresent)
 
     # Create Nuget Package
     dotnet pack SabreTools.RedumpLib\SabreTools.RedumpLib.csproj --output $BUILD_FOLDER
+    dotnet pack SabreTools.RedumpLib.Legacy\SabreTools.RedumpLib.Legacy.csproj --output $BUILD_FOLDER
 
     # Build Tool
     foreach ($FRAMEWORK in $FRAMEWORKS) {