diff --git a/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj b/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj
deleted file mode 100644
index 04c8237..0000000
--- a/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-	<TargetFrameworks>net462;net8.0</TargetFrameworks>
-	<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(MSBuildProjectName).xml</DocumentationFile>
-	<PackageId>DigitalData.MessagingService</PackageId>
-	<Authors>Digital Data GmbH</Authors>
-	<Company>Digital Data GmbH</Company>
-	<Product>DigitalData.MessagingService</Product>
-	<Copyright>Copyright 2025</Copyright>
-	<PackageIcon>icon.png</PackageIcon>
-	<RepositoryUrl>http://git.dd:3000/AppStd/Rec.git</RepositoryUrl>
-	<PackageTags>digital data messaging service api client</PackageTags>
-	<Version>1.0.0-beta</Version>
-	<AssemblyVersion>1.0.0.0</AssemblyVersion>
-	<FileVersion>1.0.0.0</FileVersion>
-	<Description></Description>
-  </PropertyGroup>
-	  
-</Project>
diff --git a/DigitalData.MessagingService.sln b/DigitalData.MessagingService.sln
index 166dbc7..5257f27 100644
--- a/DigitalData.MessagingService.sln
+++ b/DigitalData.MessagingService.sln
@@ -31,7 +31,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{DD9D4A3A-A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "infrastructure", "infrastructure", "{71BEA4D0-7835-4A8C-B11E-1088E0801DCE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingService.Client", "DigitalData.MessagingService.Client\DigitalData.MessagingService.Client.csproj", "{73E48B32-8298-403E-9055-811F4298BD4B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingService.RabbitMQ", "src\DigitalData.MessagingService.RabbitMQ\DigitalData.MessagingService.RabbitMQ.csproj", "{5B941DD2-7D0E-5D58-5D32-7E1B4C249CBC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingService.Client", "src\DigitalData.MessagingService.Client\DigitalData.MessagingService.Client.csproj", "{C553F2ED-1585-E143-70E5-44A8D64D1BDF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -59,10 +61,14 @@ Global
 		{211FB65F-2406-474E-A426-DA246B250AB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{211FB65F-2406-474E-A426-DA246B250AB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{211FB65F-2406-474E-A426-DA246B250AB8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73E48B32-8298-403E-9055-811F4298BD4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73E48B32-8298-403E-9055-811F4298BD4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73E48B32-8298-403E-9055-811F4298BD4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{73E48B32-8298-403E-9055-811F4298BD4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B941DD2-7D0E-5D58-5D32-7E1B4C249CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B941DD2-7D0E-5D58-5D32-7E1B4C249CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B941DD2-7D0E-5D58-5D32-7E1B4C249CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B941DD2-7D0E-5D58-5D32-7E1B4C249CBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C553F2ED-1585-E143-70E5-44A8D64D1BDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C553F2ED-1585-E143-70E5-44A8D64D1BDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C553F2ED-1585-E143-70E5-44A8D64D1BDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C553F2ED-1585-E143-70E5-44A8D64D1BDF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -76,7 +82,8 @@ Global
 		{B52B4CEE-1C67-424B-8659-370FEA7EAF2A} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{DD9D4A3A-AB55-456E-80D3-54A2D4025E64} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{71BEA4D0-7835-4A8C-B11E-1088E0801DCE} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{73E48B32-8298-403E-9055-811F4298BD4B} = {71BEA4D0-7835-4A8C-B11E-1088E0801DCE}
+		{5B941DD2-7D0E-5D58-5D32-7E1B4C249CBC} = {71BEA4D0-7835-4A8C-B11E-1088E0801DCE}
+		{C553F2ED-1585-E143-70E5-44A8D64D1BDF} = {B52B4CEE-1C67-424B-8659-370FEA7EAF2A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {90E29FDC-F6C6-414F-94BF-25DF61D18060}
diff --git a/src/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj b/src/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj
new file mode 100644
index 0000000..fd5f4bd
--- /dev/null
+++ b/src/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+	<TargetFrameworks>net462;net8.0</TargetFrameworks>
+  </PropertyGroup>
+	
+  <ItemGroup>
+    <PackageReference Include="RabbitMQ.Client" Version="7.2.1" />
+  </ItemGroup>
+	  
+</Project>
diff --git a/src/DigitalData.MessagingService.RabbitMQ/DigitalData.MessagingService.RabbitMQ.csproj b/src/DigitalData.MessagingService.RabbitMQ/DigitalData.MessagingService.RabbitMQ.csproj
new file mode 100644
index 0000000..fd5f4bd
--- /dev/null
+++ b/src/DigitalData.MessagingService.RabbitMQ/DigitalData.MessagingService.RabbitMQ.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+	<TargetFrameworks>net462;net8.0</TargetFrameworks>
+  </PropertyGroup>
+	
+  <ItemGroup>
+    <PackageReference Include="RabbitMQ.Client" Version="7.2.1" />
+  </ItemGroup>
+	  
+</Project>