diff --git a/Tapeti.Flow/Tapeti.Flow.csproj b/Tapeti.Flow/Tapeti.Flow.csproj
index 4586611..c8ca119 100644
--- a/Tapeti.Flow/Tapeti.Flow.csproj
+++ b/Tapeti.Flow/Tapeti.Flow.csproj
@@ -72,7 +72,7 @@
     <Compile Include="YieldPointException.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Tapeti.csproj">
+    <ProjectReference Include="..\Tapeti\Tapeti.csproj">
       <Project>{8ab4fd33-4aaa-465c-8579-9db3f3b23813}</Project>
       <Name>Tapeti</Name>
     </ProjectReference>
diff --git a/Tapeti.SimpleInjector/Tapeti.SimpleInjector.csproj b/Tapeti.SimpleInjector/Tapeti.SimpleInjector.csproj
index 3addf45..9056d58 100644
--- a/Tapeti.SimpleInjector/Tapeti.SimpleInjector.csproj
+++ b/Tapeti.SimpleInjector/Tapeti.SimpleInjector.csproj
@@ -49,7 +49,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Tapeti.csproj">
+    <ProjectReference Include="..\Tapeti\Tapeti.csproj">
       <Project>{8ab4fd33-4aaa-465c-8579-9db3f3b23813}</Project>
       <Name>Tapeti</Name>
     </ProjectReference>
diff --git a/Tapeti.sln b/Tapeti.sln
index 8c598f9..3da81b6 100644
--- a/Tapeti.sln
+++ b/Tapeti.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tapeti", "Tapeti.csproj", "{8AB4FD33-4AAA-465C-8579-9DB3F3B23813}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tapeti", "Tapeti\Tapeti.csproj", "{8AB4FD33-4AAA-465C-8579-9DB3F3B23813}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tapeti.SimpleInjector", "Tapeti.SimpleInjector\Tapeti.SimpleInjector.csproj", "{D7EC6F86-EB3B-49C3-8FE7-6E8C1BB413A6}"
 EndProject
diff --git a/Annotations/DynamicQueueAttribute.cs b/Tapeti/Annotations/DynamicQueueAttribute.cs
similarity index 100%
rename from Annotations/DynamicQueueAttribute.cs
rename to Tapeti/Annotations/DynamicQueueAttribute.cs
diff --git a/Annotations/ExchangeAttribute.cs b/Tapeti/Annotations/ExchangeAttribute.cs
similarity index 100%
rename from Annotations/ExchangeAttribute.cs
rename to Tapeti/Annotations/ExchangeAttribute.cs
diff --git a/Annotations/MessageControllerAttribute.cs b/Tapeti/Annotations/MessageControllerAttribute.cs
similarity index 100%
rename from Annotations/MessageControllerAttribute.cs
rename to Tapeti/Annotations/MessageControllerAttribute.cs
diff --git a/Annotations/StaticQueueAttribute.cs b/Tapeti/Annotations/StaticQueueAttribute.cs
similarity index 100%
rename from Annotations/StaticQueueAttribute.cs
rename to Tapeti/Annotations/StaticQueueAttribute.cs
diff --git a/Config/IBindingContext.cs b/Tapeti/Config/IBindingContext.cs
similarity index 100%
rename from Config/IBindingContext.cs
rename to Tapeti/Config/IBindingContext.cs
diff --git a/Config/IBindingFilter.cs b/Tapeti/Config/IBindingFilter.cs
similarity index 100%
rename from Config/IBindingFilter.cs
rename to Tapeti/Config/IBindingFilter.cs
diff --git a/Config/IBindingMiddleware.cs b/Tapeti/Config/IBindingMiddleware.cs
similarity index 100%
rename from Config/IBindingMiddleware.cs
rename to Tapeti/Config/IBindingMiddleware.cs
diff --git a/Config/IConfig.cs b/Tapeti/Config/IConfig.cs
similarity index 100%
rename from Config/IConfig.cs
rename to Tapeti/Config/IConfig.cs
diff --git a/Config/IMessageContext.cs b/Tapeti/Config/IMessageContext.cs
similarity index 100%
rename from Config/IMessageContext.cs
rename to Tapeti/Config/IMessageContext.cs
diff --git a/Config/IMessageMiddleware.cs b/Tapeti/Config/IMessageMiddleware.cs
similarity index 100%
rename from Config/IMessageMiddleware.cs
rename to Tapeti/Config/IMessageMiddleware.cs
diff --git a/Config/IMiddlewareBundle.cs b/Tapeti/Config/IMiddlewareBundle.cs
similarity index 100%
rename from Config/IMiddlewareBundle.cs
rename to Tapeti/Config/IMiddlewareBundle.cs
diff --git a/Connection/TapetiConsumer.cs b/Tapeti/Connection/TapetiConsumer.cs
similarity index 100%
rename from Connection/TapetiConsumer.cs
rename to Tapeti/Connection/TapetiConsumer.cs
diff --git a/Connection/TapetiPublisher.cs b/Tapeti/Connection/TapetiPublisher.cs
similarity index 100%
rename from Connection/TapetiPublisher.cs
rename to Tapeti/Connection/TapetiPublisher.cs
diff --git a/Connection/TapetiSubscriber.cs b/Tapeti/Connection/TapetiSubscriber.cs
similarity index 100%
rename from Connection/TapetiSubscriber.cs
rename to Tapeti/Connection/TapetiSubscriber.cs
diff --git a/Connection/TapetiWorker.cs b/Tapeti/Connection/TapetiWorker.cs
similarity index 100%
rename from Connection/TapetiWorker.cs
rename to Tapeti/Connection/TapetiWorker.cs
diff --git a/ConsumeResponse.cs b/Tapeti/ConsumeResponse.cs
similarity index 100%
rename from ConsumeResponse.cs
rename to Tapeti/ConsumeResponse.cs
diff --git a/Default/ConsoleLogger.cs b/Tapeti/Default/ConsoleLogger.cs
similarity index 100%
rename from Default/ConsoleLogger.cs
rename to Tapeti/Default/ConsoleLogger.cs
diff --git a/Default/DependencyResolverBinding.cs b/Tapeti/Default/DependencyResolverBinding.cs
similarity index 100%
rename from Default/DependencyResolverBinding.cs
rename to Tapeti/Default/DependencyResolverBinding.cs
diff --git a/Default/DevNullLogger.cs b/Tapeti/Default/DevNullLogger.cs
similarity index 100%
rename from Default/DevNullLogger.cs
rename to Tapeti/Default/DevNullLogger.cs
diff --git a/Default/JsonMessageSerializer.cs b/Tapeti/Default/JsonMessageSerializer.cs
similarity index 100%
rename from Default/JsonMessageSerializer.cs
rename to Tapeti/Default/JsonMessageSerializer.cs
diff --git a/Default/MessageBinding.cs b/Tapeti/Default/MessageBinding.cs
similarity index 100%
rename from Default/MessageBinding.cs
rename to Tapeti/Default/MessageBinding.cs
diff --git a/Default/NamespaceMatchExchangeStrategy.cs b/Tapeti/Default/NamespaceMatchExchangeStrategy.cs
similarity index 100%
rename from Default/NamespaceMatchExchangeStrategy.cs
rename to Tapeti/Default/NamespaceMatchExchangeStrategy.cs
diff --git a/Default/PublishResultBinding.cs b/Tapeti/Default/PublishResultBinding.cs
similarity index 100%
rename from Default/PublishResultBinding.cs
rename to Tapeti/Default/PublishResultBinding.cs
diff --git a/Default/RequeueExceptionStrategy.cs b/Tapeti/Default/RequeueExceptionStrategy.cs
similarity index 100%
rename from Default/RequeueExceptionStrategy.cs
rename to Tapeti/Default/RequeueExceptionStrategy.cs
diff --git a/Default/TypeNameRoutingKeyStrategy.cs b/Tapeti/Default/TypeNameRoutingKeyStrategy.cs
similarity index 100%
rename from Default/TypeNameRoutingKeyStrategy.cs
rename to Tapeti/Default/TypeNameRoutingKeyStrategy.cs
diff --git a/Helpers/ConsoleHelper.cs b/Tapeti/Helpers/ConsoleHelper.cs
similarity index 100%
rename from Helpers/ConsoleHelper.cs
rename to Tapeti/Helpers/ConsoleHelper.cs
diff --git a/Helpers/MiddlewareHelper.cs b/Tapeti/Helpers/MiddlewareHelper.cs
similarity index 100%
rename from Helpers/MiddlewareHelper.cs
rename to Tapeti/Helpers/MiddlewareHelper.cs
diff --git a/Helpers/TaskTypeHelper.cs b/Tapeti/Helpers/TaskTypeHelper.cs
similarity index 100%
rename from Helpers/TaskTypeHelper.cs
rename to Tapeti/Helpers/TaskTypeHelper.cs
diff --git a/IConnection.cs b/Tapeti/IConnection.cs
similarity index 100%
rename from IConnection.cs
rename to Tapeti/IConnection.cs
diff --git a/IDependencyResolver.cs b/Tapeti/IDependencyResolver.cs
similarity index 100%
rename from IDependencyResolver.cs
rename to Tapeti/IDependencyResolver.cs
diff --git a/IExceptionStrategy.cs b/Tapeti/IExceptionStrategy.cs
similarity index 100%
rename from IExceptionStrategy.cs
rename to Tapeti/IExceptionStrategy.cs
diff --git a/IExchangeStrategy.cs b/Tapeti/IExchangeStrategy.cs
similarity index 100%
rename from IExchangeStrategy.cs
rename to Tapeti/IExchangeStrategy.cs
diff --git a/ILogger.cs b/Tapeti/ILogger.cs
similarity index 100%
rename from ILogger.cs
rename to Tapeti/ILogger.cs
diff --git a/IMessageSerializer.cs b/Tapeti/IMessageSerializer.cs
similarity index 100%
rename from IMessageSerializer.cs
rename to Tapeti/IMessageSerializer.cs
diff --git a/IPublisher.cs b/Tapeti/IPublisher.cs
similarity index 100%
rename from IPublisher.cs
rename to Tapeti/IPublisher.cs
diff --git a/IRoutingKeyStrategy.cs b/Tapeti/IRoutingKeyStrategy.cs
similarity index 100%
rename from IRoutingKeyStrategy.cs
rename to Tapeti/IRoutingKeyStrategy.cs
diff --git a/ISubscriber.cs b/Tapeti/ISubscriber.cs
similarity index 100%
rename from ISubscriber.cs
rename to Tapeti/ISubscriber.cs
diff --git a/MessageController.cs b/Tapeti/MessageController.cs
similarity index 100%
rename from MessageController.cs
rename to Tapeti/MessageController.cs
diff --git a/Properties/AssemblyInfo.cs b/Tapeti/Properties/AssemblyInfo.cs
similarity index 100%
rename from Properties/AssemblyInfo.cs
rename to Tapeti/Properties/AssemblyInfo.cs
diff --git a/Tapeti.csproj b/Tapeti/Tapeti.csproj
similarity index 100%
rename from Tapeti.csproj
rename to Tapeti/Tapeti.csproj
diff --git a/TapetiConfig.cs b/Tapeti/TapetiConfig.cs
similarity index 100%
rename from TapetiConfig.cs
rename to Tapeti/TapetiConfig.cs
diff --git a/TapetiConnection.cs b/Tapeti/TapetiConnection.cs
similarity index 100%
rename from TapetiConnection.cs
rename to Tapeti/TapetiConnection.cs
diff --git a/TapetiConnectionParams.cs b/Tapeti/TapetiConnectionParams.cs
similarity index 100%
rename from TapetiConnectionParams.cs
rename to Tapeti/TapetiConnectionParams.cs
diff --git a/Tasks/SingleThreadTaskQueue.cs b/Tapeti/Tasks/SingleThreadTaskQueue.cs
similarity index 100%
rename from Tasks/SingleThreadTaskQueue.cs
rename to Tapeti/Tasks/SingleThreadTaskQueue.cs
diff --git a/packages.config b/Tapeti/packages.config
similarity index 100%
rename from packages.config
rename to Tapeti/packages.config
diff --git a/Test/Test.csproj b/Test/Test.csproj
index 5d7023c..719fffe 100644
--- a/Test/Test.csproj
+++ b/Test/Test.csproj
@@ -59,7 +59,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Tapeti.csproj">
+    <ProjectReference Include="..\Tapeti\Tapeti.csproj">
       <Project>{8ab4fd33-4aaa-465c-8579-9db3f3b23813}</Project>
       <Name>Tapeti</Name>
     </ProjectReference>