diff --git a/Saunter.sln b/Saunter.sln
index 71b9bc21..e536afbf 100644
--- a/Saunter.sln
+++ b/Saunter.sln
@@ -25,7 +25,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Saunter.IntegrationTests.ReverseProxy", "test\Saunter.IntegrationTests.ReverseProxy\Saunter.IntegrationTests.ReverseProxy.csproj", "{7CD09B89-130A-41AF-ADAE-2166C4ED695B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Saunter.Tests.MarkerTypeTests", "test\Saunter.Tests.MarkerTypeTests\Saunter.Tests.MarkerTypeTests.csproj", "{02284473-6DE7-4EE0-8433-2AC295045549}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Saunter.Tests.MarkerTypeTests", "test\Saunter.Tests.MarkerTypeTests\Saunter.Tests.MarkerTypeTests.csproj", "{02284473-6DE7-4EE0-8433-2AC295045549}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AsyncAPI.Saunter.Attributes", "src\AsyncAPI.Saunter.Attributes\AsyncAPI.Saunter.Attributes.csproj", "{3591421D-0853-48C6-9A53-9E6B5D7E6B25}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -97,6 +99,18 @@ Global
 		{02284473-6DE7-4EE0-8433-2AC295045549}.Release|x64.Build.0 = Release|Any CPU
 		{02284473-6DE7-4EE0-8433-2AC295045549}.Release|x86.ActiveCfg = Release|Any CPU
 		{02284473-6DE7-4EE0-8433-2AC295045549}.Release|x86.Build.0 = Release|Any CPU
+		{3591421D-0853-48C6-9A53-9E6B5D7E6B25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3591421D-0853-48C6-9A53-9E6B5D7E6B25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3591421D-0853-48C6-9A53-9E6B5D7E6B25}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3591421D-0853-48C6-9A53-9E6B5D7E6B25}.Debug|x64.Build.0 = Debug|Any CPU
+		{3591421D-0853-48C6-9A53-9E6B5D7E6B25}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3591421D-0853-48C6-9A53-9E6B5D7E6B25}.Debug|x86.Build.0 = Debug|Any CPU
+		{3591421D-0853-48C6-9A53-9E6B5D7E6B25}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3591421D-0853-48C6-9A53-9E6B5D7E6B25}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3591421D-0853-48C6-9A53-9E6B5D7E6B25}.Release|x64.ActiveCfg = Release|Any CPU
+		{3591421D-0853-48C6-9A53-9E6B5D7E6B25}.Release|x64.Build.0 = Release|Any CPU
+		{3591421D-0853-48C6-9A53-9E6B5D7E6B25}.Release|x86.ActiveCfg = Release|Any CPU
+		{3591421D-0853-48C6-9A53-9E6B5D7E6B25}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -107,6 +121,7 @@ Global
 		{F188D4A7-BBCB-464F-A370-2BD84D18EA79} = {6ABD4842-47AF-49A5-B057-0EBA64416789}
 		{7CD09B89-130A-41AF-ADAE-2166C4ED695B} = {6491E321-2D02-44AB-9116-D722FE169595}
 		{02284473-6DE7-4EE0-8433-2AC295045549} = {6491E321-2D02-44AB-9116-D722FE169595}
+		{3591421D-0853-48C6-9A53-9E6B5D7E6B25} = {28D4C365-FDED-49AE-A97D-36202E24A55A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2F85D9DA-DBCF-4F13-8C42-5719F1469B2E}
diff --git a/src/AsyncAPI.Saunter.Attributes/AsyncAPI.Saunter.Attributes.csproj b/src/AsyncAPI.Saunter.Attributes/AsyncAPI.Saunter.Attributes.csproj
new file mode 100644
index 00000000..c44e002f
--- /dev/null
+++ b/src/AsyncAPI.Saunter.Attributes/AsyncAPI.Saunter.Attributes.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <PackageId>AysncAPI.Saunter.Attributes</PackageId>
+    <Title>AysncAPI.Saunter.Attributes</Title>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <Description>Provides the raw attributes which can be used to decorate code as being async api functions</Description>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Saunter.Tests" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Saunter/Attributes/AsyncApiAttribute.cs b/src/AsyncAPI.Saunter.Attributes/AsyncApiAttribute.cs
similarity index 100%
rename from src/Saunter/Attributes/AsyncApiAttribute.cs
rename to src/AsyncAPI.Saunter.Attributes/AsyncApiAttribute.cs
diff --git a/src/Saunter/Attributes/ChannelAttribute.cs b/src/AsyncAPI.Saunter.Attributes/ChannelAttribute.cs
similarity index 100%
rename from src/Saunter/Attributes/ChannelAttribute.cs
rename to src/AsyncAPI.Saunter.Attributes/ChannelAttribute.cs
diff --git a/src/Saunter/Attributes/ChannelParameterAttribute.cs b/src/AsyncAPI.Saunter.Attributes/ChannelParameterAttribute.cs
similarity index 100%
rename from src/Saunter/Attributes/ChannelParameterAttribute.cs
rename to src/AsyncAPI.Saunter.Attributes/ChannelParameterAttribute.cs
diff --git a/src/Saunter/Attributes/MessageAttribute.cs b/src/AsyncAPI.Saunter.Attributes/MessageAttribute.cs
similarity index 100%
rename from src/Saunter/Attributes/MessageAttribute.cs
rename to src/AsyncAPI.Saunter.Attributes/MessageAttribute.cs
diff --git a/src/Saunter/Attributes/OperationAttribute.cs b/src/AsyncAPI.Saunter.Attributes/OperationAttribute.cs
similarity index 100%
rename from src/Saunter/Attributes/OperationAttribute.cs
rename to src/AsyncAPI.Saunter.Attributes/OperationAttribute.cs
diff --git a/src/AsyncAPI.Saunter.Attributes/readme.md b/src/AsyncAPI.Saunter.Attributes/readme.md
new file mode 100644
index 00000000..e69de29b
diff --git a/src/Saunter/Saunter.csproj b/src/Saunter/Saunter.csproj
index 89875ef2..9bdefb2a 100644
--- a/src/Saunter/Saunter.csproj
+++ b/src/Saunter/Saunter.csproj
@@ -60,5 +60,9 @@
       <Link>UI\package.json</Link>
     </None>
   </ItemGroup>
-  
+
+  <ItemGroup>
+    <ProjectReference Include="..\AsyncAPI.Sunter.Attributes\AsyncAPI.Saunter.Attributes.csproj" />
+  </ItemGroup>
+
 </Project>