diff --git a/.github/workflows/build_nupkg.yml b/.github/workflows/build_nupkg.yml
index c52e9fb..9fffc64 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.RedumpLib/bin/Release/*.nupkg'
 
     - name: Upload to rolling
       uses: ncipollo/release-action@v1.14.0
       with:
         allowUpdates: True
-        artifacts: 'bin/Release/*.nupkg'
+        artifacts: 'SabreTools.RedumpLib/bin/Release/*.nupkg'
         body: 'Last built commit: ${{ github.sha }}'
         name: 'Rolling Release'
         prerelease: True
diff --git a/SabreTools.RedumpLib.sln b/SabreTools.RedumpLib.sln
index bcc23ba..2f374ea 100644
--- a/SabreTools.RedumpLib.sln
+++ b/SabreTools.RedumpLib.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.RedumpLib", "SabreTools.RedumpLib.csproj", "{235D3A36-CA69-4348-9EC4-649B27ACFBB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.RedumpLib", "SabreTools.RedumpLib\SabreTools.RedumpLib.csproj", "{235D3A36-CA69-4348-9EC4-649B27ACFBB8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Attributes/AttributeHelper.cs b/SabreTools.RedumpLib/Attributes/AttributeHelper.cs
similarity index 100%
rename from Attributes/AttributeHelper.cs
rename to SabreTools.RedumpLib/Attributes/AttributeHelper.cs
diff --git a/Attributes/HumanReadableAttribute.cs b/SabreTools.RedumpLib/Attributes/HumanReadableAttribute.cs
similarity index 100%
rename from Attributes/HumanReadableAttribute.cs
rename to SabreTools.RedumpLib/Attributes/HumanReadableAttribute.cs
diff --git a/Attributes/LanguageAttribute.cs b/SabreTools.RedumpLib/Attributes/LanguageAttribute.cs
similarity index 100%
rename from Attributes/LanguageAttribute.cs
rename to SabreTools.RedumpLib/Attributes/LanguageAttribute.cs
diff --git a/Attributes/SystemAttribute.cs b/SabreTools.RedumpLib/Attributes/SystemAttribute.cs
similarity index 100%
rename from Attributes/SystemAttribute.cs
rename to SabreTools.RedumpLib/Attributes/SystemAttribute.cs
diff --git a/Builder.cs b/SabreTools.RedumpLib/Builder.cs
similarity index 100%
rename from Builder.cs
rename to SabreTools.RedumpLib/Builder.cs
diff --git a/Converters/DiscCategoryConverter.cs b/SabreTools.RedumpLib/Converters/DiscCategoryConverter.cs
similarity index 100%
rename from Converters/DiscCategoryConverter.cs
rename to SabreTools.RedumpLib/Converters/DiscCategoryConverter.cs
diff --git a/Converters/DiscTypeConverter.cs b/SabreTools.RedumpLib/Converters/DiscTypeConverter.cs
similarity index 100%
rename from Converters/DiscTypeConverter.cs
rename to SabreTools.RedumpLib/Converters/DiscTypeConverter.cs
diff --git a/Converters/LanguageConverter.cs b/SabreTools.RedumpLib/Converters/LanguageConverter.cs
similarity index 100%
rename from Converters/LanguageConverter.cs
rename to SabreTools.RedumpLib/Converters/LanguageConverter.cs
diff --git a/Converters/LanguageSelectionConverter.cs b/SabreTools.RedumpLib/Converters/LanguageSelectionConverter.cs
similarity index 100%
rename from Converters/LanguageSelectionConverter.cs
rename to SabreTools.RedumpLib/Converters/LanguageSelectionConverter.cs
diff --git a/Converters/RegionConverter.cs b/SabreTools.RedumpLib/Converters/RegionConverter.cs
similarity index 100%
rename from Converters/RegionConverter.cs
rename to SabreTools.RedumpLib/Converters/RegionConverter.cs
diff --git a/Converters/SystemConverter.cs b/SabreTools.RedumpLib/Converters/SystemConverter.cs
similarity index 100%
rename from Converters/SystemConverter.cs
rename to SabreTools.RedumpLib/Converters/SystemConverter.cs
diff --git a/Converters/YesNoConverter.cs b/SabreTools.RedumpLib/Converters/YesNoConverter.cs
similarity index 100%
rename from Converters/YesNoConverter.cs
rename to SabreTools.RedumpLib/Converters/YesNoConverter.cs
diff --git a/Data/Constants.cs b/SabreTools.RedumpLib/Data/Constants.cs
similarity index 100%
rename from Data/Constants.cs
rename to SabreTools.RedumpLib/Data/Constants.cs
diff --git a/Data/Enumerations.cs b/SabreTools.RedumpLib/Data/Enumerations.cs
similarity index 100%
rename from Data/Enumerations.cs
rename to SabreTools.RedumpLib/Data/Enumerations.cs
diff --git a/Data/Extensions.cs b/SabreTools.RedumpLib/Data/Extensions.cs
similarity index 100%
rename from Data/Extensions.cs
rename to SabreTools.RedumpLib/Data/Extensions.cs
diff --git a/Data/SubmissionInfo.cs b/SabreTools.RedumpLib/Data/SubmissionInfo.cs
similarity index 100%
rename from Data/SubmissionInfo.cs
rename to SabreTools.RedumpLib/Data/SubmissionInfo.cs
diff --git a/Data/Template.cs b/SabreTools.RedumpLib/Data/Template.cs
similarity index 100%
rename from Data/Template.cs
rename to SabreTools.RedumpLib/Data/Template.cs
diff --git a/Formatter.cs b/SabreTools.RedumpLib/Formatter.cs
similarity index 100%
rename from Formatter.cs
rename to SabreTools.RedumpLib/Formatter.cs
diff --git a/OldDotNet.cs b/SabreTools.RedumpLib/OldDotNet.cs
similarity index 100%
rename from OldDotNet.cs
rename to SabreTools.RedumpLib/OldDotNet.cs
diff --git a/SabreTools.RedumpLib.csproj b/SabreTools.RedumpLib/SabreTools.RedumpLib.csproj
similarity index 96%
rename from SabreTools.RedumpLib.csproj
rename to SabreTools.RedumpLib/SabreTools.RedumpLib.csproj
index e91ba64..f9fce27 100644
--- a/SabreTools.RedumpLib.csproj
+++ b/SabreTools.RedumpLib/SabreTools.RedumpLib.csproj
@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="README.md" Pack="true" PackagePath="" />
+    <None Include="../README.md" Pack="true" PackagePath="" />
   </ItemGroup>
 
   <!-- Support for old .NET versions -->
diff --git a/Validator.cs b/SabreTools.RedumpLib/Validator.cs
similarity index 100%
rename from Validator.cs
rename to SabreTools.RedumpLib/Validator.cs
diff --git a/Web/CookieWebClient.cs b/SabreTools.RedumpLib/Web/CookieWebClient.cs
similarity index 100%
rename from Web/CookieWebClient.cs
rename to SabreTools.RedumpLib/Web/CookieWebClient.cs
diff --git a/Web/RedumpClient.cs b/SabreTools.RedumpLib/Web/RedumpClient.cs
similarity index 100%
rename from Web/RedumpClient.cs
rename to SabreTools.RedumpLib/Web/RedumpClient.cs