diff --git a/Examples/01-PublishSubscribe/01-PublishSubscribe.csproj b/Examples/01-PublishSubscribe/01-PublishSubscribe.csproj
index 42369b4..e14883b 100644
--- a/Examples/01-PublishSubscribe/01-PublishSubscribe.csproj
+++ b/Examples/01-PublishSubscribe/01-PublishSubscribe.csproj
@@ -11,11 +11,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\ExampleHelper.cs\ExampleLib.csproj" />
-    <ProjectReference Include="..\..\Messaging.TapetiExample\Messaging.TapetiExample.csproj" />
     <ProjectReference Include="..\..\Tapeti.DataAnnotations\Tapeti.DataAnnotations.csproj" />
     <ProjectReference Include="..\..\Tapeti.SimpleInjector\Tapeti.SimpleInjector.csproj" />
     <ProjectReference Include="..\..\Tapeti\Tapeti.csproj" />
+    <ProjectReference Include="..\ExampleLib\ExampleLib.csproj" />
+    <ProjectReference Include="..\Messaging.TapetiExample\Messaging.TapetiExample.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/02-DeclareDurableQueues/02-DeclareDurableQueues.csproj b/Examples/02-DeclareDurableQueues/02-DeclareDurableQueues.csproj
similarity index 58%
rename from 02-DeclareDurableQueues/02-DeclareDurableQueues.csproj
rename to Examples/02-DeclareDurableQueues/02-DeclareDurableQueues.csproj
index 42fe49a..c16ddf6 100644
--- a/02-DeclareDurableQueues/02-DeclareDurableQueues.csproj
+++ b/Examples/02-DeclareDurableQueues/02-DeclareDurableQueues.csproj
@@ -11,10 +11,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ExampleHelper.cs\ExampleLib.csproj" />
+    <ProjectReference Include="..\..\Tapeti.DataAnnotations\Tapeti.DataAnnotations.csproj" />
+    <ProjectReference Include="..\..\Tapeti.SimpleInjector\Tapeti.SimpleInjector.csproj" />
+    <ProjectReference Include="..\..\Tapeti\Tapeti.csproj" />
+    <ProjectReference Include="..\ExampleLib\ExampleLib.csproj" />
     <ProjectReference Include="..\Messaging.TapetiExample\Messaging.TapetiExample.csproj" />
-    <ProjectReference Include="..\Tapeti.DataAnnotations\Tapeti.DataAnnotations.csproj" />
-    <ProjectReference Include="..\Tapeti.SimpleInjector\Tapeti.SimpleInjector.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/02-DeclareDurableQueues/ExampleMessageController.cs b/Examples/02-DeclareDurableQueues/ExampleMessageController.cs
similarity index 100%
rename from 02-DeclareDurableQueues/ExampleMessageController.cs
rename to Examples/02-DeclareDurableQueues/ExampleMessageController.cs
diff --git a/02-DeclareDurableQueues/Program.cs b/Examples/02-DeclareDurableQueues/Program.cs
similarity index 100%
rename from 02-DeclareDurableQueues/Program.cs
rename to Examples/02-DeclareDurableQueues/Program.cs
diff --git a/03-FlowRequestResponse/03-FlowRequestResponse.csproj b/Examples/03-FlowRequestResponse/03-FlowRequestResponse.csproj
similarity index 53%
rename from 03-FlowRequestResponse/03-FlowRequestResponse.csproj
rename to Examples/03-FlowRequestResponse/03-FlowRequestResponse.csproj
index a864182..bfa9f7e 100644
--- a/03-FlowRequestResponse/03-FlowRequestResponse.csproj
+++ b/Examples/03-FlowRequestResponse/03-FlowRequestResponse.csproj
@@ -11,11 +11,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ExampleHelper.cs\ExampleLib.csproj" />
+    <ProjectReference Include="..\..\Tapeti.DataAnnotations\Tapeti.DataAnnotations.csproj" />
+    <ProjectReference Include="..\..\Tapeti.Flow\Tapeti.Flow.csproj" />
+    <ProjectReference Include="..\..\Tapeti.SimpleInjector\Tapeti.SimpleInjector.csproj" />
+    <ProjectReference Include="..\..\Tapeti\Tapeti.csproj" />
+    <ProjectReference Include="..\ExampleLib\ExampleLib.csproj" />
     <ProjectReference Include="..\Messaging.TapetiExample\Messaging.TapetiExample.csproj" />
-    <ProjectReference Include="..\Tapeti.DataAnnotations\Tapeti.DataAnnotations.csproj" />
-    <ProjectReference Include="..\Tapeti.Flow\Tapeti.Flow.csproj" />
-    <ProjectReference Include="..\Tapeti.SimpleInjector\Tapeti.SimpleInjector.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/03-FlowRequestResponse/Program.cs b/Examples/03-FlowRequestResponse/Program.cs
similarity index 100%
rename from 03-FlowRequestResponse/Program.cs
rename to Examples/03-FlowRequestResponse/Program.cs
diff --git a/03-FlowRequestResponse/ReceivingMessageController.cs b/Examples/03-FlowRequestResponse/ReceivingMessageController.cs
similarity index 100%
rename from 03-FlowRequestResponse/ReceivingMessageController.cs
rename to Examples/03-FlowRequestResponse/ReceivingMessageController.cs
diff --git a/03-FlowRequestResponse/SendingFlowController.cs b/Examples/03-FlowRequestResponse/SendingFlowController.cs
similarity index 100%
rename from 03-FlowRequestResponse/SendingFlowController.cs
rename to Examples/03-FlowRequestResponse/SendingFlowController.cs
diff --git a/ExampleHelper.cs/ExampleConsoleApp.cs b/Examples/ExampleLib/ExampleConsoleApp.cs
similarity index 100%
rename from ExampleHelper.cs/ExampleConsoleApp.cs
rename to Examples/ExampleLib/ExampleConsoleApp.cs
diff --git a/ExampleHelper.cs/ExampleLib.csproj b/Examples/ExampleLib/ExampleLib.csproj
similarity index 78%
rename from ExampleHelper.cs/ExampleLib.csproj
rename to Examples/ExampleLib/ExampleLib.csproj
index f3cca6f..d73eb4a 100644
--- a/ExampleHelper.cs/ExampleLib.csproj
+++ b/Examples/ExampleLib/ExampleLib.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Tapeti\Tapeti.csproj" />
+    <ProjectReference Include="..\..\Tapeti\Tapeti.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/ExampleHelper.cs/IExampleState.cs b/Examples/ExampleLib/IExampleState.cs
similarity index 100%
rename from ExampleHelper.cs/IExampleState.cs
rename to Examples/ExampleLib/IExampleState.cs
diff --git a/Messaging.TapetiExample/Messaging.TapetiExample.csproj b/Examples/Messaging.TapetiExample/Messaging.TapetiExample.csproj
similarity index 76%
rename from Messaging.TapetiExample/Messaging.TapetiExample.csproj
rename to Examples/Messaging.TapetiExample/Messaging.TapetiExample.csproj
index 9b27198..cc9631d 100644
--- a/Messaging.TapetiExample/Messaging.TapetiExample.csproj
+++ b/Examples/Messaging.TapetiExample/Messaging.TapetiExample.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Tapeti.Annotations\Tapeti.Annotations.csproj" />
+    <ProjectReference Include="..\..\Tapeti.Annotations\Tapeti.Annotations.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Messaging.TapetiExample/PublishSubscribeMessage.cs b/Examples/Messaging.TapetiExample/PublishSubscribeMessage.cs
similarity index 100%
rename from Messaging.TapetiExample/PublishSubscribeMessage.cs
rename to Examples/Messaging.TapetiExample/PublishSubscribeMessage.cs
diff --git a/Messaging.TapetiExample/QuoteRequestMessage.cs b/Examples/Messaging.TapetiExample/QuoteRequestMessage.cs
similarity index 100%
rename from Messaging.TapetiExample/QuoteRequestMessage.cs
rename to Examples/Messaging.TapetiExample/QuoteRequestMessage.cs
diff --git a/Tapeti.sln b/Tapeti.sln
index c51a070..be24534 100644
--- a/Tapeti.sln
+++ b/Tapeti.sln
@@ -29,13 +29,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{26
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "01-PublishSubscribe", "Examples\01-PublishSubscribe\01-PublishSubscribe.csproj", "{8350A0AB-F0EE-48CF-9CA6-6019467101CF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleLib", "ExampleHelper.cs\ExampleLib.csproj", "{F3B38753-06B4-4932-84B4-A07692AD802D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleLib", "Examples\ExampleLib\ExampleLib.csproj", "{F3B38753-06B4-4932-84B4-A07692AD802D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Messaging.TapetiExample", "Messaging.TapetiExample\Messaging.TapetiExample.csproj", "{D24120D4-50A2-44B6-A4EA-6ADAAEBABA84}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Messaging.TapetiExample", "Examples\Messaging.TapetiExample\Messaging.TapetiExample.csproj", "{D24120D4-50A2-44B6-A4EA-6ADAAEBABA84}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "02-DeclareDurableQueues", "02-DeclareDurableQueues\02-DeclareDurableQueues.csproj", "{85511282-EF91-4B56-B7DC-9E8706556D6E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "02-DeclareDurableQueues", "Examples\02-DeclareDurableQueues\02-DeclareDurableQueues.csproj", "{85511282-EF91-4B56-B7DC-9E8706556D6E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "03-FlowRequestResponse", "03-FlowRequestResponse\03-FlowRequestResponse.csproj", "{463A12CE-E221-450D-ADEA-91A599612DFA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "03-FlowRequestResponse", "Examples\03-FlowRequestResponse\03-FlowRequestResponse.csproj", "{463A12CE-E221-450D-ADEA-91A599612DFA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution