diff --git a/BurnOutSharp.Matching/BurnOutSharp.Matching.csproj b/BurnOutSharp.Matching/BurnOutSharp.Matching.csproj
new file mode 100644
index 00000000..6639be3a
--- /dev/null
+++ b/BurnOutSharp.Matching/BurnOutSharp.Matching.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <Title>BurnOutSharp.Matching</Title>
+    <AssemblyName>BurnOutSharp.Matching</AssemblyName>
+    <Authors>Matt Nadareski;Gernot Knippen</Authors>
+    <Product>BurnOutSharp</Product>
+    <Copyright>Copyright (c)2005-2010 Gernot Knippen, Copyright (c)2018-2022 Matt Nadareski</Copyright>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <RepositoryUrl>https://github.com/mnadareski/BurnOutSharp</RepositoryUrl>
+    <Version>2.3.4</Version>
+    <AssemblyVersion>2.3.4</AssemblyVersion>
+    <FileVersion>2.3.4</FileVersion>
+    <IncludeSource>true</IncludeSource>
+    <IncludeSymbols>true</IncludeSymbols>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+</Project>
diff --git a/BurnOutSharp/Matching/ContentMatch.cs b/BurnOutSharp.Matching/ContentMatch.cs
similarity index 100%
rename from BurnOutSharp/Matching/ContentMatch.cs
rename to BurnOutSharp.Matching/ContentMatch.cs
diff --git a/BurnOutSharp/Matching/ContentMatchSet.cs b/BurnOutSharp.Matching/ContentMatchSet.cs
similarity index 100%
rename from BurnOutSharp/Matching/ContentMatchSet.cs
rename to BurnOutSharp.Matching/ContentMatchSet.cs
diff --git a/BurnOutSharp/Matching/IMatch.cs b/BurnOutSharp.Matching/IMatch.cs
similarity index 100%
rename from BurnOutSharp/Matching/IMatch.cs
rename to BurnOutSharp.Matching/IMatch.cs
diff --git a/BurnOutSharp/Matching/MatchSet.cs b/BurnOutSharp.Matching/MatchSet.cs
similarity index 100%
rename from BurnOutSharp/Matching/MatchSet.cs
rename to BurnOutSharp.Matching/MatchSet.cs
diff --git a/BurnOutSharp/Matching/MatchUtil.cs b/BurnOutSharp.Matching/MatchUtil.cs
similarity index 99%
rename from BurnOutSharp/Matching/MatchUtil.cs
rename to BurnOutSharp.Matching/MatchUtil.cs
index 1aa507eb..9dc9e537 100644
--- a/BurnOutSharp/Matching/MatchUtil.cs
+++ b/BurnOutSharp.Matching/MatchUtil.cs
@@ -7,7 +7,7 @@ namespace BurnOutSharp.Matching
     /// <summary>
     /// Helper class for matching
     /// </summary>
-    internal static class MatchUtil
+    public static class MatchUtil
     {
         #region Content Matching
 
diff --git a/BurnOutSharp/Matching/PathMatch.cs b/BurnOutSharp.Matching/PathMatch.cs
similarity index 100%
rename from BurnOutSharp/Matching/PathMatch.cs
rename to BurnOutSharp.Matching/PathMatch.cs
diff --git a/BurnOutSharp/Matching/PathMatchSet.cs b/BurnOutSharp.Matching/PathMatchSet.cs
similarity index 100%
rename from BurnOutSharp/Matching/PathMatchSet.cs
rename to BurnOutSharp.Matching/PathMatchSet.cs
diff --git a/BurnOutSharp.sln b/BurnOutSharp.sln
index 533b81c9..2fe0f0a6 100644
--- a/BurnOutSharp.sln
+++ b/BurnOutSharp.sln
@@ -26,9 +26,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BurnOutSharp.Models", "Burn
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BurnOutSharp.Builder", "BurnOutSharp.Builder\BurnOutSharp.Builder.csproj", "{7577733A-CC8D-4E7C-8B6D-FFC7EC1B3D07}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExecutableTest", "ExecutableTest\ExecutableTest.csproj", "{4B59824C-7E0A-4478-B408-FEAA1FD80F8F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExecutableTest", "ExecutableTest\ExecutableTest.csproj", "{4B59824C-7E0A-4478-B408-FEAA1FD80F8F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BurnOutSharp.Wrappers", "BurnOutSharp.Wrappers\BurnOutSharp.Wrappers.csproj", "{35BD489F-E58D-45DD-9929-DC4B32414750}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BurnOutSharp.Wrappers", "BurnOutSharp.Wrappers\BurnOutSharp.Wrappers.csproj", "{35BD489F-E58D-45DD-9929-DC4B32414750}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BurnOutSharp.Matching", "BurnOutSharp.Matching\BurnOutSharp.Matching.csproj", "{563BC37B-8E02-4178-B6FE-F3F6F65E0096}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -76,6 +78,10 @@ Global
 		{35BD489F-E58D-45DD-9929-DC4B32414750}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{35BD489F-E58D-45DD-9929-DC4B32414750}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{35BD489F-E58D-45DD-9929-DC4B32414750}.Release|Any CPU.Build.0 = Release|Any CPU
+		{563BC37B-8E02-4178-B6FE-F3F6F65E0096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{563BC37B-8E02-4178-B6FE-F3F6F65E0096}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{563BC37B-8E02-4178-B6FE-F3F6F65E0096}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{563BC37B-8E02-4178-B6FE-F3F6F65E0096}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/BurnOutSharp/BurnOutSharp.csproj b/BurnOutSharp/BurnOutSharp.csproj
index edc77a54..b362b40d 100644
--- a/BurnOutSharp/BurnOutSharp.csproj
+++ b/BurnOutSharp/BurnOutSharp.csproj
@@ -57,6 +57,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\BurnOutSharp.Matching\BurnOutSharp.Matching.csproj" />
+    <ProjectReference Include="..\BurnOutSharp.Models\BurnOutSharp.Models.csproj" />
+    <ProjectReference Include="..\BurnOutSharp.Wrappers\BurnOutSharp.Wrappers.csproj" />
     <ProjectReference Include="..\Dtf\src\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
@@ -73,8 +76,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </ProjectReference>
-    <ProjectReference Include="..\BurnOutSharp.Wrappers\BurnOutSharp.Wrappers.csproj" />
-    <ProjectReference Include="..\BurnOutSharp.Models\BurnOutSharp.Models.csproj" />
   </ItemGroup>
 
 </Project>