diff --git a/.github/workflows/build_nupkg.yml b/.github/workflows/build_nupkg.yml
index c52e9fb..3753c73 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.IO/bin/Release/*.nupkg'
 
     - name: Upload to rolling
       uses: ncipollo/release-action@v1.14.0
       with:
         allowUpdates: True
-        artifacts: 'bin/Release/*.nupkg'
+        artifacts: 'SabreTools.IO/bin/Release/*.nupkg'
         body: 'Last built commit: ${{ github.sha }}'
         name: 'Rolling Release'
         prerelease: True
diff --git a/SabreTools.IO.sln b/SabreTools.IO.sln
index 3c4754e..4ed9c55 100644
--- a/SabreTools.IO.sln
+++ b/SabreTools.IO.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.IO", "SabreTools.IO.csproj", "{87CE4411-80D9-49FF-894C-761F1C20D9A5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.IO", "SabreTools.IO\SabreTools.IO.csproj", "{87CE4411-80D9-49FF-894C-761F1C20D9A5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/BinaryReaderExtensions.cs b/SabreTools.IO/BinaryReaderExtensions.cs
similarity index 100%
rename from BinaryReaderExtensions.cs
rename to SabreTools.IO/BinaryReaderExtensions.cs
diff --git a/ByteArrayExtensions.cs b/SabreTools.IO/ByteArrayExtensions.cs
similarity index 100%
rename from ByteArrayExtensions.cs
rename to SabreTools.IO/ByteArrayExtensions.cs
diff --git a/IOExtensions.cs b/SabreTools.IO/IOExtensions.cs
similarity index 100%
rename from IOExtensions.cs
rename to SabreTools.IO/IOExtensions.cs
diff --git a/IniFile.cs b/SabreTools.IO/IniFile.cs
similarity index 100%
rename from IniFile.cs
rename to SabreTools.IO/IniFile.cs
diff --git a/ParentablePath.cs b/SabreTools.IO/ParentablePath.cs
similarity index 100%
rename from ParentablePath.cs
rename to SabreTools.IO/ParentablePath.cs
diff --git a/PathTool.cs b/SabreTools.IO/PathTool.cs
similarity index 100%
rename from PathTool.cs
rename to SabreTools.IO/PathTool.cs
diff --git a/Readers/ClrMameProReader.cs b/SabreTools.IO/Readers/ClrMameProReader.cs
similarity index 100%
rename from Readers/ClrMameProReader.cs
rename to SabreTools.IO/Readers/ClrMameProReader.cs
diff --git a/Readers/Enums.cs b/SabreTools.IO/Readers/Enums.cs
similarity index 100%
rename from Readers/Enums.cs
rename to SabreTools.IO/Readers/Enums.cs
diff --git a/Readers/IniReader.cs b/SabreTools.IO/Readers/IniReader.cs
similarity index 100%
rename from Readers/IniReader.cs
rename to SabreTools.IO/Readers/IniReader.cs
diff --git a/Readers/SeparatedValueReader.cs b/SabreTools.IO/Readers/SeparatedValueReader.cs
similarity index 100%
rename from Readers/SeparatedValueReader.cs
rename to SabreTools.IO/Readers/SeparatedValueReader.cs
diff --git a/SabreTools.IO.csproj b/SabreTools.IO/SabreTools.IO.csproj
similarity index 95%
rename from SabreTools.IO.csproj
rename to SabreTools.IO/SabreTools.IO.csproj
index 05731f3..c1d2e7b 100644
--- a/SabreTools.IO.csproj
+++ b/SabreTools.IO/SabreTools.IO.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/StreamExtensions.cs b/SabreTools.IO/StreamExtensions.cs
similarity index 100%
rename from StreamExtensions.cs
rename to SabreTools.IO/StreamExtensions.cs
diff --git a/Writers/ClrMameProWriter.cs b/SabreTools.IO/Writers/ClrMameProWriter.cs
similarity index 100%
rename from Writers/ClrMameProWriter.cs
rename to SabreTools.IO/Writers/ClrMameProWriter.cs
diff --git a/Writers/IniWriter.cs b/SabreTools.IO/Writers/IniWriter.cs
similarity index 100%
rename from Writers/IniWriter.cs
rename to SabreTools.IO/Writers/IniWriter.cs
diff --git a/Writers/SeparatedValueWriter.cs b/SabreTools.IO/Writers/SeparatedValueWriter.cs
similarity index 100%
rename from Writers/SeparatedValueWriter.cs
rename to SabreTools.IO/Writers/SeparatedValueWriter.cs
diff --git a/XmlTextWriterExtensions.cs b/SabreTools.IO/XmlTextWriterExtensions.cs
similarity index 100%
rename from XmlTextWriterExtensions.cs
rename to SabreTools.IO/XmlTextWriterExtensions.cs