diff --git a/.github/workflows/build_nupkg.yml b/.github/workflows/build_nupkg.yml
index c52e9fb..5f3d34a 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.Matching/bin/Release/*.nupkg'
 
     - name: Upload to rolling
       uses: ncipollo/release-action@v1.14.0
       with:
         allowUpdates: True
-        artifacts: 'bin/Release/*.nupkg'
+        artifacts: 'SabreTools.Matching/bin/Release/*.nupkg'
         body: 'Last built commit: ${{ github.sha }}'
         name: 'Rolling Release'
         prerelease: True
diff --git a/SabreTools.Matching.sln b/SabreTools.Matching.sln
index 129564e..d54fefe 100644
--- a/SabreTools.Matching.sln
+++ b/SabreTools.Matching.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.Matching", "SabreTools.Matching.csproj", "{9555EB79-4E81-4988-9ABE-D6CE6042197E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Matching", "SabreTools.Matching\SabreTools.Matching.csproj", "{9555EB79-4E81-4988-9ABE-D6CE6042197E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Compare/NaturalComparer.cs b/SabreTools.Matching/Compare/NaturalComparer.cs
similarity index 100%
rename from Compare/NaturalComparer.cs
rename to SabreTools.Matching/Compare/NaturalComparer.cs
diff --git a/Compare/NaturalComparerUtil.cs b/SabreTools.Matching/Compare/NaturalComparerUtil.cs
similarity index 100%
rename from Compare/NaturalComparerUtil.cs
rename to SabreTools.Matching/Compare/NaturalComparerUtil.cs
diff --git a/Compare/NaturalReversedComparer.cs b/SabreTools.Matching/Compare/NaturalReversedComparer.cs
similarity index 100%
rename from Compare/NaturalReversedComparer.cs
rename to SabreTools.Matching/Compare/NaturalReversedComparer.cs
diff --git a/Content/ContentMatch.cs b/SabreTools.Matching/Content/ContentMatch.cs
similarity index 100%
rename from Content/ContentMatch.cs
rename to SabreTools.Matching/Content/ContentMatch.cs
diff --git a/Content/ContentMatchSet.cs b/SabreTools.Matching/Content/ContentMatchSet.cs
similarity index 100%
rename from Content/ContentMatchSet.cs
rename to SabreTools.Matching/Content/ContentMatchSet.cs
diff --git a/Extensions.cs b/SabreTools.Matching/Extensions.cs
similarity index 100%
rename from Extensions.cs
rename to SabreTools.Matching/Extensions.cs
diff --git a/IMatch.cs b/SabreTools.Matching/IMatch.cs
similarity index 100%
rename from IMatch.cs
rename to SabreTools.Matching/IMatch.cs
diff --git a/MatchSet.cs b/SabreTools.Matching/MatchSet.cs
similarity index 100%
rename from MatchSet.cs
rename to SabreTools.Matching/MatchSet.cs
diff --git a/MatchUtil.cs b/SabreTools.Matching/MatchUtil.cs
similarity index 100%
rename from MatchUtil.cs
rename to SabreTools.Matching/MatchUtil.cs
diff --git a/Paths/FilePathMatch.cs b/SabreTools.Matching/Paths/FilePathMatch.cs
similarity index 100%
rename from Paths/FilePathMatch.cs
rename to SabreTools.Matching/Paths/FilePathMatch.cs
diff --git a/Paths/PathMatch.cs b/SabreTools.Matching/Paths/PathMatch.cs
similarity index 100%
rename from Paths/PathMatch.cs
rename to SabreTools.Matching/Paths/PathMatch.cs
diff --git a/Paths/PathMatchSet.cs b/SabreTools.Matching/Paths/PathMatchSet.cs
similarity index 100%
rename from Paths/PathMatchSet.cs
rename to SabreTools.Matching/Paths/PathMatchSet.cs
diff --git a/SabreTools.Matching.csproj b/SabreTools.Matching/SabreTools.Matching.csproj
similarity index 96%
rename from SabreTools.Matching.csproj
rename to SabreTools.Matching/SabreTools.Matching.csproj
index 9795583..e9301b1 100644
--- a/SabreTools.Matching.csproj
+++ b/SabreTools.Matching/SabreTools.Matching.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 -->