diff --git a/.github/workflows/createrelease.yml b/.github/workflows/createrelease.yml
index 7e5b26b7..6fe4e133 100644
--- a/.github/workflows/createrelease.yml
+++ b/.github/workflows/createrelease.yml
@@ -39,7 +39,9 @@ jobs:
       run: |
         dotnet pack "Shared\Shared.csproj" /p:PackageVersion=${{ steps.get_version.outputs.VERSION }} --output Nugets
         dotnet pack "Shared.DomainDrivenDesign\Shared.DomainDrivenDesign.csproj" /p:PackageVersion=${{ steps.get_version.outputs.VERSION }} --output Nugets
+        dotnet pack "Shared.EventStore\Shared.EventStore.csproj" /p:PackageVersion=${{ steps.get_version.outputs.VERSION }} --output Nugets
         dotnet pack "ClientProxyBase\ClientProxyBase.csproj" /p:PackageVersion=${{ steps.get_version.outputs.VERSION }} --output Nugets
         dotnet nuget push Nugets/Shared.${{ steps.get_version.outputs.VERSION }}.nupkg --api-key ${{ secrets.MYGET_APIKEY }} --source https://www.myget.org/F/transactionprocessing/api/v2/package        
         dotnet nuget push Nugets/Shared.DomainDrivenDesign.${{ steps.get_version.outputs.VERSION }}.nupkg --api-key ${{ secrets.MYGET_APIKEY }} --source https://www.myget.org/F/transactionprocessing/api/v2/package
+        dotnet nuget push Nugets/Shared.EventStore.${{ steps.get_version.outputs.VERSION }}.nupkg --api-key ${{ secrets.MYGET_APIKEY }} --source https://www.myget.org/F/transactionprocessing/api/v2/package
         dotnet nuget push Nugets/ClientProxyBase.${{ steps.get_version.outputs.VERSION }}.nupkg --api-key ${{ secrets.MYGET_APIKEY }} --source https://www.myget.org/F/transactionprocessing/api/v2/package
diff --git a/ClientProxyBase/ClientProxyBase.csproj b/ClientProxyBase/ClientProxyBase.csproj
index 9f5c4f4a..f45bdfcc 100644
--- a/ClientProxyBase/ClientProxyBase.csproj
+++ b/ClientProxyBase/ClientProxyBase.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/Shared.DomainDrivenDesign/Shared.DomainDrivenDesign.csproj b/Shared.DomainDrivenDesign/Shared.DomainDrivenDesign.csproj
index b784e2ea..8efeffa6 100644
--- a/Shared.DomainDrivenDesign/Shared.DomainDrivenDesign.csproj
+++ b/Shared.DomainDrivenDesign/Shared.DomainDrivenDesign.csproj
@@ -1,13 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EventStore.Client" Version="5.0.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
-
 </Project>
diff --git a/Shared.DomainDrivenDesign/EventStore/Aggregate.cs b/Shared.EventStore/EventStore/Aggregate.cs
similarity index 100%
rename from Shared.DomainDrivenDesign/EventStore/Aggregate.cs
rename to Shared.EventStore/EventStore/Aggregate.cs
diff --git a/Shared.DomainDrivenDesign/EventStore/AggregateRepository.cs b/Shared.EventStore/EventStore/AggregateRepository.cs
similarity index 100%
rename from Shared.DomainDrivenDesign/EventStore/AggregateRepository.cs
rename to Shared.EventStore/EventStore/AggregateRepository.cs
diff --git a/Shared.DomainDrivenDesign/EventStore/EventAppearedEventHandler.cs b/Shared.EventStore/EventStore/EventAppearedEventHandler.cs
similarity index 100%
rename from Shared.DomainDrivenDesign/EventStore/EventAppearedEventHandler.cs
rename to Shared.EventStore/EventStore/EventAppearedEventHandler.cs
diff --git a/Shared.DomainDrivenDesign/EventStore/EventStoreConnectionSettings.cs b/Shared.EventStore/EventStore/EventStoreConnectionSettings.cs
similarity index 100%
rename from Shared.DomainDrivenDesign/EventStore/EventStoreConnectionSettings.cs
rename to Shared.EventStore/EventStore/EventStoreConnectionSettings.cs
diff --git a/Shared.DomainDrivenDesign/EventStore/EventStoreContext.cs b/Shared.EventStore/EventStore/EventStoreContext.cs
similarity index 99%
rename from Shared.DomainDrivenDesign/EventStore/EventStoreContext.cs
rename to Shared.EventStore/EventStore/EventStoreContext.cs
index 8b84b194..75726475 100644
--- a/Shared.DomainDrivenDesign/EventStore/EventStoreContext.cs
+++ b/Shared.EventStore/EventStore/EventStoreContext.cs
@@ -12,6 +12,7 @@
     using global::EventStore.ClientAPI.SystemData;
     using Microsoft.Extensions.Logging;
     using Newtonsoft.Json;
+    using Shared.DomainDrivenDesign.EventSourcing;
 
     /// <summary>
     /// Delegate TraceHandler
diff --git a/Shared.DomainDrivenDesign/EventStore/IAggregate.cs b/Shared.EventStore/EventStore/IAggregate.cs
similarity index 100%
rename from Shared.DomainDrivenDesign/EventStore/IAggregate.cs
rename to Shared.EventStore/EventStore/IAggregate.cs
diff --git a/Shared.DomainDrivenDesign/EventStore/IAggregateRepository.cs b/Shared.EventStore/EventStore/IAggregateRepository.cs
similarity index 100%
rename from Shared.DomainDrivenDesign/EventStore/IAggregateRepository.cs
rename to Shared.EventStore/EventStore/IAggregateRepository.cs
diff --git a/Shared.DomainDrivenDesign/EventStore/IEventStoreContext.cs b/Shared.EventStore/EventStore/IEventStoreContext.cs
similarity index 100%
rename from Shared.DomainDrivenDesign/EventStore/IEventStoreContext.cs
rename to Shared.EventStore/EventStore/IEventStoreContext.cs
diff --git a/Shared.DomainDrivenDesign/EventStore/LiveProcessStartedEventHandler.cs b/Shared.EventStore/EventStore/LiveProcessStartedEventHandler.cs
similarity index 100%
rename from Shared.DomainDrivenDesign/EventStore/LiveProcessStartedEventHandler.cs
rename to Shared.EventStore/EventStore/LiveProcessStartedEventHandler.cs
diff --git a/Shared.DomainDrivenDesign/EventStore/SubscriptionDataTransferObject.cs b/Shared.EventStore/EventStore/SubscriptionDataTransferObject.cs
similarity index 100%
rename from Shared.DomainDrivenDesign/EventStore/SubscriptionDataTransferObject.cs
rename to Shared.EventStore/EventStore/SubscriptionDataTransferObject.cs
diff --git a/Shared.DomainDrivenDesign/EventStore/SubscriptionDroppedEventHandler.cs b/Shared.EventStore/EventStore/SubscriptionDroppedEventHandler.cs
similarity index 100%
rename from Shared.DomainDrivenDesign/EventStore/SubscriptionDroppedEventHandler.cs
rename to Shared.EventStore/EventStore/SubscriptionDroppedEventHandler.cs
diff --git a/Shared.DomainDrivenDesign/EventStore/SubscriptionType.cs b/Shared.EventStore/EventStore/SubscriptionType.cs
similarity index 100%
rename from Shared.DomainDrivenDesign/EventStore/SubscriptionType.cs
rename to Shared.EventStore/EventStore/SubscriptionType.cs
diff --git a/Shared.EventStore/Shared.EventStore.csproj b/Shared.EventStore/Shared.EventStore.csproj
new file mode 100644
index 00000000..f2df427c
--- /dev/null
+++ b/Shared.EventStore/Shared.EventStore.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="EventStore.Client" Version="5.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Shared.DomainDrivenDesign\Shared.DomainDrivenDesign.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Shared.sln b/Shared.sln
index 6c6370cd..95158a77 100644
--- a/Shared.sln
+++ b/Shared.sln
@@ -13,7 +13,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C641A0E0-A
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared.Tests", "Shared.Tests\Shared.Tests.csproj", "{051F583B-DCC3-4F00-BDB2-CD39A957439D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClientProxyBase", "ClientProxyBase\ClientProxyBase.csproj", "{5656F3EB-2562-42E6-81ED-0AE672D350C1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientProxyBase", "ClientProxyBase\ClientProxyBase.csproj", "{5656F3EB-2562-42E6-81ED-0AE672D350C1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.EventStore", "Shared.EventStore\Shared.EventStore.csproj", "{F8B12FE9-13DC-413F-A80C-380DBBC81EA0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,6 +39,10 @@ Global
 		{5656F3EB-2562-42E6-81ED-0AE672D350C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5656F3EB-2562-42E6-81ED-0AE672D350C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5656F3EB-2562-42E6-81ED-0AE672D350C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8B12FE9-13DC-413F-A80C-380DBBC81EA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8B12FE9-13DC-413F-A80C-380DBBC81EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8B12FE9-13DC-413F-A80C-380DBBC81EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8B12FE9-13DC-413F-A80C-380DBBC81EA0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -46,6 +52,7 @@ Global
 		{86E66E1F-9228-4561-99F7-EBEB3293E686} = {1B484B1C-212E-4CF5-B666-213E9546E11C}
 		{051F583B-DCC3-4F00-BDB2-CD39A957439D} = {C641A0E0-A26E-4B16-89E2-DD6E33509C6E}
 		{5656F3EB-2562-42E6-81ED-0AE672D350C1} = {1B484B1C-212E-4CF5-B666-213E9546E11C}
+		{F8B12FE9-13DC-413F-A80C-380DBBC81EA0} = {1B484B1C-212E-4CF5-B666-213E9546E11C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {34032CEC-68CD-41EA-8707-D450689AEA46}