diff --git a/Tapeti/Annotations/MessageHandlerAttribute.cs b/Annotations/MessageHandlerAttribute.cs
similarity index 100%
rename from Tapeti/Annotations/MessageHandlerAttribute.cs
rename to Annotations/MessageHandlerAttribute.cs
diff --git a/Tapeti/Annotations/QueueAttribute.cs b/Annotations/QueueAttribute.cs
similarity index 100%
rename from Tapeti/Annotations/QueueAttribute.cs
rename to Annotations/QueueAttribute.cs
diff --git a/Tapeti/Connection/TapetiPublisher.cs b/Connection/TapetiPublisher.cs
similarity index 100%
rename from Tapeti/Connection/TapetiPublisher.cs
rename to Connection/TapetiPublisher.cs
diff --git a/Tapeti/Connection/TapetiSubscriber.cs b/Connection/TapetiSubscriber.cs
similarity index 100%
rename from Tapeti/Connection/TapetiSubscriber.cs
rename to Connection/TapetiSubscriber.cs
diff --git a/Tapeti/Connection/TapetiWorker.cs b/Connection/TapetiWorker.cs
similarity index 100%
rename from Tapeti/Connection/TapetiWorker.cs
rename to Connection/TapetiWorker.cs
diff --git a/Tapeti/Default/DefaultControllerFactory.cs b/Default/DefaultControllerFactory.cs
similarity index 100%
rename from Tapeti/Default/DefaultControllerFactory.cs
rename to Default/DefaultControllerFactory.cs
diff --git a/Tapeti/Default/DefaultRoutingKeyStrategy.cs b/Default/DefaultRoutingKeyStrategy.cs
similarity index 100%
rename from Tapeti/Default/DefaultRoutingKeyStrategy.cs
rename to Default/DefaultRoutingKeyStrategy.cs
diff --git a/Tapeti/IControllerFactory.cs b/IControllerFactory.cs
similarity index 100%
rename from Tapeti/IControllerFactory.cs
rename to IControllerFactory.cs
diff --git a/Tapeti/IMessageHandlerRegistration.cs b/IMessageHandlerRegistration.cs
similarity index 100%
rename from Tapeti/IMessageHandlerRegistration.cs
rename to IMessageHandlerRegistration.cs
diff --git a/Tapeti/IPublisher.cs b/IPublisher.cs
similarity index 100%
rename from Tapeti/IPublisher.cs
rename to IPublisher.cs
diff --git a/Tapeti/IRoutingKeyStrategy.cs b/IRoutingKeyStrategy.cs
similarity index 100%
rename from Tapeti/IRoutingKeyStrategy.cs
rename to IRoutingKeyStrategy.cs
diff --git a/Tapeti/ISubscriber.cs b/ISubscriber.cs
similarity index 100%
rename from Tapeti/ISubscriber.cs
rename to ISubscriber.cs
diff --git a/Tapeti/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
similarity index 100%
rename from Tapeti/Properties/AssemblyInfo.cs
rename to Properties/AssemblyInfo.cs
diff --git a/Tapeti/Registration/AbstractControllerRegistration.cs b/Registration/AbstractControllerRegistration.cs
similarity index 100%
rename from Tapeti/Registration/AbstractControllerRegistration.cs
rename to Registration/AbstractControllerRegistration.cs
diff --git a/Tapeti/Registration/ControllerDynamicQueueRegistration.cs b/Registration/ControllerDynamicQueueRegistration.cs
similarity index 100%
rename from Tapeti/Registration/ControllerDynamicQueueRegistration.cs
rename to Registration/ControllerDynamicQueueRegistration.cs
diff --git a/Tapeti/Registration/ControllerQueueRegistration.cs b/Registration/ControllerQueueRegistration.cs
similarity index 100%
rename from Tapeti/Registration/ControllerQueueRegistration.cs
rename to Registration/ControllerQueueRegistration.cs
diff --git a/Tapeti/Tapeti.csproj b/Tapeti.csproj
similarity index 100%
rename from Tapeti/Tapeti.csproj
rename to Tapeti.csproj
diff --git a/Tapeti/Tapeti.sln b/Tapeti.sln
similarity index 100%
rename from Tapeti/Tapeti.sln
rename to Tapeti.sln
diff --git a/Tapeti/TapetiConnection.cs b/TapetiConnection.cs
similarity index 100%
rename from Tapeti/TapetiConnection.cs
rename to TapetiConnection.cs
diff --git a/Tapeti/packages.config b/packages.config
similarity index 100%
rename from Tapeti/packages.config
rename to packages.config