diff --git a/RedisStreamsInOrleans.sln b/RedisStreamsInOrleans.sln
index f5d8720..886d220 100644
--- a/RedisStreamsInOrleans.sln
+++ b/RedisStreamsInOrleans.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.10.34928.147
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{35E441B1-DDF7-4497-B1D9-BBD9248690E9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "example\Server\Server.csproj", "{35E441B1-DDF7-4497-B1D9-BBD9248690E9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "Client\Client.csproj", "{B7477618-DE9C-4586-98D2-46CFF1CB0C74}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "example\Client\Client.csproj", "{B7477618-DE9C-4586-98D2-46CFF1CB0C74}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Universley.OrleansContrib.StreamsProvider.Redis", "Provider\Universley.OrleansContrib.StreamsProvider.Redis.csproj", "{70F8E685-F662-4225-A60C-D318E0C6ED18}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Universley.OrleansContrib.StreamsProvider.Redis", "Universley.OrleansContrib.StreamsProvider.Redis\Universley.OrleansContrib.StreamsProvider.Redis.csproj", "{70F8E685-F662-4225-A60C-D318E0C6ED18}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedisStreamsProvider.UnitTests", "RedisStreamsProvider.UnitTests\RedisStreamsProvider.UnitTests.csproj", "{DF927C2B-A141-4476-86CF-3B4DC8ECB4DE}"
 EndProject
diff --git a/RedisStreamsProvider.UnitTests/RedisStreamsProvider.UnitTests.csproj b/RedisStreamsProvider.UnitTests/RedisStreamsProvider.UnitTests.csproj
index 6cff32f..35e6cd5 100644
--- a/RedisStreamsProvider.UnitTests/RedisStreamsProvider.UnitTests.csproj
+++ b/RedisStreamsProvider.UnitTests/RedisStreamsProvider.UnitTests.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Provider\Universley.OrleansContrib.StreamsProvider.Redis.csproj" />
+    <ProjectReference Include="..\Universley.OrleansContrib.StreamsProvider.Redis\Universley.OrleansContrib.StreamsProvider.Redis.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Provider/RedisStreamAdapter.cs b/Universley.OrleansContrib.StreamsProvider.Redis/RedisStreamAdapter.cs
similarity index 100%
rename from Provider/RedisStreamAdapter.cs
rename to Universley.OrleansContrib.StreamsProvider.Redis/RedisStreamAdapter.cs
diff --git a/Provider/RedisStreamBatchContainer.cs b/Universley.OrleansContrib.StreamsProvider.Redis/RedisStreamBatchContainer.cs
similarity index 100%
rename from Provider/RedisStreamBatchContainer.cs
rename to Universley.OrleansContrib.StreamsProvider.Redis/RedisStreamBatchContainer.cs
diff --git a/Provider/RedisStreamFactory.cs b/Universley.OrleansContrib.StreamsProvider.Redis/RedisStreamFactory.cs
similarity index 100%
rename from Provider/RedisStreamFactory.cs
rename to Universley.OrleansContrib.StreamsProvider.Redis/RedisStreamFactory.cs
diff --git a/Provider/RedisStreamFailureHandler.cs b/Universley.OrleansContrib.StreamsProvider.Redis/RedisStreamFailureHandler.cs
similarity index 100%
rename from Provider/RedisStreamFailureHandler.cs
rename to Universley.OrleansContrib.StreamsProvider.Redis/RedisStreamFailureHandler.cs
diff --git a/Provider/RedisStreamReceiver.cs b/Universley.OrleansContrib.StreamsProvider.Redis/RedisStreamReceiver.cs
similarity index 100%
rename from Provider/RedisStreamReceiver.cs
rename to Universley.OrleansContrib.StreamsProvider.Redis/RedisStreamReceiver.cs
diff --git a/Provider/RedisStreamSequenceToken.cs b/Universley.OrleansContrib.StreamsProvider.Redis/RedisStreamSequenceToken.cs
similarity index 100%
rename from Provider/RedisStreamSequenceToken.cs
rename to Universley.OrleansContrib.StreamsProvider.Redis/RedisStreamSequenceToken.cs
diff --git a/Provider/Universley.OrleansContrib.StreamsProvider.Redis.csproj b/Universley.OrleansContrib.StreamsProvider.Redis/Universley.OrleansContrib.StreamsProvider.Redis.csproj
similarity index 100%
rename from Provider/Universley.OrleansContrib.StreamsProvider.Redis.csproj
rename to Universley.OrleansContrib.StreamsProvider.Redis/Universley.OrleansContrib.StreamsProvider.Redis.csproj
diff --git a/Client/Client.csproj b/example/Client/Client.csproj
similarity index 78%
rename from Client/Client.csproj
rename to example/Client/Client.csproj
index 2c7b60f..a3e8a16 100644
--- a/Client/Client.csproj
+++ b/example/Client/Client.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Provider\Universley.OrleansContrib.StreamsProvider.Redis.csproj" />
+    <ProjectReference Include="..\..\Universley.OrleansContrib.StreamsProvider.Redis\Universley.OrleansContrib.StreamsProvider.Redis.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Client/Program.cs b/example/Client/Program.cs
similarity index 100%
rename from Client/Program.cs
rename to example/Client/Program.cs
diff --git a/Server/Program.cs b/example/Server/Program.cs
similarity index 100%
rename from Server/Program.cs
rename to example/Server/Program.cs
diff --git a/Server/Server.csproj b/example/Server/Server.csproj
similarity index 78%
rename from Server/Server.csproj
rename to example/Server/Server.csproj
index f34bf50..d7da8fe 100644
--- a/Server/Server.csproj
+++ b/example/Server/Server.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Provider\Universley.OrleansContrib.StreamsProvider.Redis.csproj" />
+    <ProjectReference Include="..\..\Universley.OrleansContrib.StreamsProvider.Redis\Universley.OrleansContrib.StreamsProvider.Redis.csproj" />
   </ItemGroup>
 
 </Project>