diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 40d963b..2390800 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -81,10 +81,10 @@ jobs:
         run: dotnet restore
 
       - name: build
-        run: dotnet build --no-restore
+        run: dotnet build -c release --no-restore
 
       - name: pack
-        run: dotnet pack -o bin
+        run: dotnet pack -o bin --no-build
 
       - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..620c5c2
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,10 @@
+<Project>
+  <PropertyGroup>
+    <UseArtifactsOutput>true</UseArtifactsOutput>
+  </PropertyGroup>
+  
+  <PropertyGroup Label="Assembly Signing">
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)MimeMapping.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+</Project>
diff --git a/MimeMapping.sln b/MimeMapping.sln
index 94f69f5..0d598a6 100644
--- a/MimeMapping.sln
+++ b/MimeMapping.sln
@@ -10,9 +10,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{063EE5BF-8922-4280-8DFC-1226E9298F35}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MimeMapping.Tests", "test\MimeMapping.Tests\MimeMapping.Tests.csproj", "{063EE5BF-8922-4280-8DFC-1226E9298F35}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MimeMapping", "MimeMapping.csproj", "{42893F4D-DE5F-4132-A408-E90BFF840342}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MimeMapping", "src\MimeMapping\MimeMapping.csproj", "{42893F4D-DE5F-4132-A408-E90BFF840342}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/KnownMimeTypes.cs b/src/MimeMapping/KnownMimeTypes.cs
similarity index 100%
rename from KnownMimeTypes.cs
rename to src/MimeMapping/KnownMimeTypes.cs
diff --git a/KnownMimeTypes.tt b/src/MimeMapping/KnownMimeTypes.tt
similarity index 100%
rename from KnownMimeTypes.tt
rename to src/MimeMapping/KnownMimeTypes.tt
diff --git a/MimeMapping.csproj b/src/MimeMapping/MimeMapping.csproj
similarity index 84%
rename from MimeMapping.csproj
rename to src/MimeMapping/MimeMapping.csproj
index 02fcb5e..d871b31 100644
--- a/MimeMapping.csproj
+++ b/src/MimeMapping/MimeMapping.csproj
@@ -25,8 +25,6 @@ https://learn.microsoft.com/dotnet/api/system.web.mimemapping.getmimemapping
     <Authors>Matthew Little</Authors>
     <Company />
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>MimeMapping.snk</AssemblyOriginatorKeyFile>
 
     <!-- https://github.com/dotnet/sourcelink -->
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -41,17 +39,7 @@ https://learn.microsoft.com/dotnet/api/system.web.mimemapping.getmimemapping
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="Test\**" />
-    <EmbeddedResource Remove="Test\**" />
-    <None Remove="Test\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove=".editorconfig" />
-    <None Remove=".gitignore" />
-    <None Remove="LICENSE.md" />
-    <None Remove="**/TestResults/**" />
-    <None Include="README.md" Pack="true" PackagePath="\" />
+    <None Include="../../README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MimeUtility.cs b/src/MimeMapping/MimeUtility.cs
similarity index 100%
rename from MimeUtility.cs
rename to src/MimeMapping/MimeUtility.cs
diff --git a/Test/BasicTest.cs b/test/MimeMapping.Tests/BasicTest.cs
similarity index 100%
rename from Test/BasicTest.cs
rename to test/MimeMapping.Tests/BasicTest.cs
diff --git a/Test/Test.csproj b/test/MimeMapping.Tests/MimeMapping.Tests.csproj
similarity index 80%
rename from Test/Test.csproj
rename to test/MimeMapping.Tests/MimeMapping.Tests.csproj
index ce324dd..5c2f8c2 100644
--- a/Test/Test.csproj
+++ b/test/MimeMapping.Tests/MimeMapping.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net6.0;net48</TargetFrameworks>
      <TargetFrameworks Condition="$([MSBuild]::IsOSUnixLike())">net8.0;net6.0</TargetFrameworks>
-    <RunSettingsFilePath>$(MSBuildThisFileDirectory)/test.runsettings</RunSettingsFilePath>
+    <RunSettingsFilePath>$(MSBuildThisFileDirectory)..\test.runsettings</RunSettingsFilePath>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   
@@ -15,6 +15,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MimeMapping.csproj" />
+    <ProjectReference Include="..\..\src\MimeMapping\MimeMapping.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Test/Properties/AssemblyInfo.cs b/test/MimeMapping.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from Test/Properties/AssemblyInfo.cs
rename to test/MimeMapping.Tests/Properties/AssemblyInfo.cs
diff --git a/Test/TemplateSourceTests.cs b/test/MimeMapping.Tests/TemplateSourceTests.cs
similarity index 100%
rename from Test/TemplateSourceTests.cs
rename to test/MimeMapping.Tests/TemplateSourceTests.cs
diff --git a/Test/test.runsettings b/test/test.runsettings
similarity index 100%
rename from Test/test.runsettings
rename to test/test.runsettings