diff --git a/Publish.ps1 b/Publish.ps1
index b7ad3d4..341b1cc 100644
--- a/Publish.ps1
+++ b/Publish.ps1
@@ -7,6 +7,9 @@ $nugetkey = Get-Content .nuget.apikey
 Write-Host "Publishing version $($version.NuGetVersion) using API key $($nugetkey)"-Foreground Cyan
 
 
+Write-Host "Packing Tapeti.Annotations.csproj" -Foreground Blue
+NuGet.exe pack Tapeti\Tapeti.Annotations.csproj -OutputDir publish -Version $version.NuGetVersion
+
 Write-Host "Packing Tapeti.csproj" -Foreground Blue
 NuGet.exe pack Tapeti\Tapeti.csproj -OutputDir publish -Version $version.NuGetVersion
 
@@ -18,6 +21,9 @@ NuGet.exe pack Tapeti.SimpleInjector\Tapeti.SimpleInjector.csproj -OutputDir pub
 
 
 
+Write-Host "Pushing Tapeti.Annotations.csproj" -Foreground Blue
+NuGet.exe push publish\X2Software.Tapeti.Annotations.$($version.NuGetVersion).nupkg -apikey $nugetkey -Source https://www.nuget.org/api/v2/package
+
 Write-Host "Pushing Tapeti.csproj" -Foreground Blue
 NuGet.exe push publish\X2Software.Tapeti.$($version.NuGetVersion).nupkg -apikey $nugetkey -Source https://www.nuget.org/api/v2/package
 
diff --git a/Tapeti/Annotations/DynamicQueueAttribute.cs b/Tapeti.Annotations/DynamicQueueAttribute.cs
similarity index 100%
rename from Tapeti/Annotations/DynamicQueueAttribute.cs
rename to Tapeti.Annotations/DynamicQueueAttribute.cs
diff --git a/Tapeti/Annotations/ExchangeAttribute.cs b/Tapeti.Annotations/ExchangeAttribute.cs
similarity index 100%
rename from Tapeti/Annotations/ExchangeAttribute.cs
rename to Tapeti.Annotations/ExchangeAttribute.cs
diff --git a/Tapeti/Annotations/MessageControllerAttribute.cs b/Tapeti.Annotations/MessageControllerAttribute.cs
similarity index 100%
rename from Tapeti/Annotations/MessageControllerAttribute.cs
rename to Tapeti.Annotations/MessageControllerAttribute.cs
diff --git a/Tapeti.Annotations/Properties/AssemblyInfo.cs b/Tapeti.Annotations/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..82731ed
--- /dev/null
+++ b/Tapeti.Annotations/Properties/AssemblyInfo.cs
@@ -0,0 +1,23 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Tapeti.Annotations")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Tapeti.Annotations")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("c4897d64-d04e-4ae9-bd98-d64295d1d13a")]
diff --git a/Tapeti.Flow/Annotations/RequestAttribute.cs b/Tapeti.Annotations/RequestAttribute.cs
similarity index 100%
rename from Tapeti.Flow/Annotations/RequestAttribute.cs
rename to Tapeti.Annotations/RequestAttribute.cs
diff --git a/Tapeti/Annotations/StaticQueueAttribute.cs b/Tapeti.Annotations/StaticQueueAttribute.cs
similarity index 100%
rename from Tapeti/Annotations/StaticQueueAttribute.cs
rename to Tapeti.Annotations/StaticQueueAttribute.cs
diff --git a/Tapeti.Annotations/Tapeti.Annotations.csproj b/Tapeti.Annotations/Tapeti.Annotations.csproj
new file mode 100644
index 0000000..55b874f
--- /dev/null
+++ b/Tapeti.Annotations/Tapeti.Annotations.csproj
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{C4897D64-D04E-4AE9-BD98-D64295D1D13A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Tapeti.Annotations</RootNamespace>
+    <AssemblyName>Tapeti.Annotations</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>lib\net46\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>lib\net46\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="DynamicQueueAttribute.cs" />
+    <Compile Include="ExchangeAttribute.cs" />
+    <Compile Include="MessageControllerAttribute.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RequestAttribute.cs" />
+    <Compile Include="StaticQueueAttribute.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Tapeti.Annotations/Tapeti.Annotations.nuspec b/Tapeti.Annotations/Tapeti.Annotations.nuspec
new file mode 100644
index 0000000..2ffc9d0
--- /dev/null
+++ b/Tapeti.Annotations/Tapeti.Annotations.nuspec
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>X2Software.Tapeti.Annotations</id>
+    <version>$version$</version>
+    <title>$title$</title>
+    <authors>Mark van Renswoude</authors>
+    <owners>Mark van Renswoude</owners>
+    <licenseUrl>https://git.x2software.net/pub/tapeti/raw/master/UNLICENSE</licenseUrl>
+    <projectUrl>https://git.x2software.net/pub/tapeti</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Annotations for Tapeti</description>
+    <copyright></copyright>
+    <tags>rabbitmq tapeti</tags>
+  </metadata>
+</package>
\ No newline at end of file
diff --git a/Tapeti.Flow/Tapeti.Flow.csproj b/Tapeti.Flow/Tapeti.Flow.csproj
index 6ca628d..bd90e39 100644
--- a/Tapeti.Flow/Tapeti.Flow.csproj
+++ b/Tapeti.Flow/Tapeti.Flow.csproj
@@ -50,7 +50,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Annotations\ContinuationAttribute.cs" />
-    <Compile Include="Annotations\RequestAttribute.cs" />
     <Compile Include="ContextItems.cs" />
     <Compile Include="Default\FlowMessageFilterMiddleware.cs" />
     <Compile Include="Default\FlowBindingMiddleware.cs" />
@@ -72,6 +71,10 @@
     <Compile Include="YieldPointException.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Tapeti.Annotations\Tapeti.Annotations.csproj">
+      <Project>{c4897d64-d04e-4ae9-bd98-d64295d1d13a}</Project>
+      <Name>Tapeti.Annotations</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Tapeti\Tapeti.csproj">
       <Project>{8ab4fd33-4aaa-465c-8579-9db3f3b23813}</Project>
       <Name>Tapeti</Name>
diff --git a/Tapeti.sln b/Tapeti.sln
index b04e494..33bd48a 100644
--- a/Tapeti.sln
+++ b/Tapeti.sln
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tapeti.Flow", "Tapeti.Flow\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tapeti.Flow.SQL", "Tapeti.Flow.SQL\Tapeti.Flow.SQL.csproj", "{6DE7B122-EB6A-46B8-AEAF-F84DDE18F9C7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tapeti.Annotations", "Tapeti.Annotations\Tapeti.Annotations.csproj", "{C4897D64-D04E-4AE9-BD98-D64295D1D13A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@ Global
 		{6DE7B122-EB6A-46B8-AEAF-F84DDE18F9C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6DE7B122-EB6A-46B8-AEAF-F84DDE18F9C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6DE7B122-EB6A-46B8-AEAF-F84DDE18F9C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4897D64-D04E-4AE9-BD98-D64295D1D13A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4897D64-D04E-4AE9-BD98-D64295D1D13A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4897D64-D04E-4AE9-BD98-D64295D1D13A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4897D64-D04E-4AE9-BD98-D64295D1D13A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Tapeti/Tapeti.csproj b/Tapeti/Tapeti.csproj
index 124dcb3..71c0ec5 100644
--- a/Tapeti/Tapeti.csproj
+++ b/Tapeti/Tapeti.csproj
@@ -50,10 +50,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Annotations\ExchangeAttribute.cs" />
-    <Compile Include="Annotations\MessageControllerAttribute.cs" />
-    <Compile Include="Annotations\StaticQueueAttribute.cs" />
-    <Compile Include="Annotations\DynamicQueueAttribute.cs" />
     <Compile Include="Config\IMessageFilterMiddleware.cs" />
     <Compile Include="Connection\TapetiConsumer.cs" />
     <Compile Include="Connection\TapetiPublisher.cs" />
@@ -101,7 +97,12 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\Tapeti.Annotations\Tapeti.Annotations.csproj">
+      <Project>{c4897d64-d04e-4ae9-bd98-d64295d1d13a}</Project>
+      <Name>Tapeti.Annotations</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.