diff --git a/DigitalData.MessagingService.Client.Infrastructure/DigitalData.MessagingService.Client.Infrastructure.csproj b/DigitalData.MessagingService.Client.Infrastructure/DigitalData.MessagingService.Client.Infrastructure.csproj
deleted file mode 100644
index 922636e..0000000
--- a/DigitalData.MessagingService.Client.Infrastructure/DigitalData.MessagingService.Client.Infrastructure.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-	<TargetFrameworks>net462;net8.0</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-	
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.10" />
-    <PackageReference Include="RabbitMQ.Client" Version="7.2.1" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.10" />
-  </ItemGroup>
-
-</Project>
diff --git a/DigitalData.MessagingService.sln b/DigitalData.MessagingService.sln
index e5dbe7b..5257f27 100644
--- a/DigitalData.MessagingService.sln
+++ b/DigitalData.MessagingService.sln
@@ -35,10 +35,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingServic
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingService.Client", "src\DigitalData.MessagingService.Client\DigitalData.MessagingService.Client.csproj", "{C553F2ED-1585-E143-70E5-44A8D64D1BDF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingService.Client.Infrastructure", "DigitalData.MessagingService.Client.Infrastructure\DigitalData.MessagingService.Client.Infrastructure.csproj", "{4ED75E1B-FE53-4AA9-AB83-E35E25049D6D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingService.Publisher.Abstraction", "DigitalData.MessagingService.Publisher\DigitalData.MessagingService.Publisher.Abstraction.csproj", "{99CA4C0E-75A5-4143-97BB-9C605E65E692}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -73,14 +69,6 @@ Global
 		{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
-		{4ED75E1B-FE53-4AA9-AB83-E35E25049D6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4ED75E1B-FE53-4AA9-AB83-E35E25049D6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4ED75E1B-FE53-4AA9-AB83-E35E25049D6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4ED75E1B-FE53-4AA9-AB83-E35E25049D6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{99CA4C0E-75A5-4143-97BB-9C605E65E692}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{99CA4C0E-75A5-4143-97BB-9C605E65E692}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99CA4C0E-75A5-4143-97BB-9C605E65E692}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{99CA4C0E-75A5-4143-97BB-9C605E65E692}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -96,8 +84,6 @@ Global
 		{71BEA4D0-7835-4A8C-B11E-1088E0801DCE} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{5B941DD2-7D0E-5D58-5D32-7E1B4C249CBC} = {71BEA4D0-7835-4A8C-B11E-1088E0801DCE}
 		{C553F2ED-1585-E143-70E5-44A8D64D1BDF} = {B52B4CEE-1C67-424B-8659-370FEA7EAF2A}
-		{4ED75E1B-FE53-4AA9-AB83-E35E25049D6D} = {71BEA4D0-7835-4A8C-B11E-1088E0801DCE}
-		{99CA4C0E-75A5-4143-97BB-9C605E65E692} = {DD9D4A3A-AB55-456E-80D3-54A2D4025E64}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {90E29FDC-F6C6-414F-94BF-25DF61D18060}
diff --git a/src/DigitalData.MessagingService.Application/DigitalData.MessagingService.Application.csproj b/src/DigitalData.MessagingService.Application/DigitalData.MessagingService.Application.csproj
index f5b56b5..24af99d 100644
--- a/src/DigitalData.MessagingService.Application/DigitalData.MessagingService.Application.csproj
+++ b/src/DigitalData.MessagingService.Application/DigitalData.MessagingService.Application.csproj
@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\DigitalData.MessagingService.Publisher\DigitalData.MessagingService.Publisher.Abstraction.csproj" />
     <ProjectReference Include="..\DigitalData.MessagingService.Domain\DigitalData.MessagingService.Domain.csproj" />
   </ItemGroup>
 
diff --git a/src/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj b/src/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj
deleted file mode 100644
index e55f804..0000000
--- a/src/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj
+++ /dev/null
@@ -1,34 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-	<TargetFrameworks>net462;net480;net8.0</TargetFrameworks>
-	<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(MSBuildProjectName).xml</DocumentationFile>
-	<PackageId>DigitalData.MessagingService.Client</PackageId>
-	<Authors>Digital Data GmbH</Authors>
-	<Company>Digital Data GmbH</Company>
-	<Product>DigitalData.MessagingService.Client</Product>
-	<Copyright>Copyright 2026</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>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-	
-  <ItemGroup>
-    <PackageReference Include="RabbitMQ.Client" Version="7.2.1" />
-  </ItemGroup>
-	
-  <ItemGroup>
-	<None Include="..\..\assets\icon.png">
-	<Pack>True</Pack>
-	<PackagePath>\</PackagePath>
-	</None>
-  </ItemGroup>
-	  
-</Project>
diff --git a/DigitalData.MessagingService.Publisher/DigitalData.MessagingService.Publisher.Abstraction.csproj b/src/DigitalData.MessagingService.Publisher.Abstraction/DigitalData.MessagingService.Publisher.Abstraction.csproj
similarity index 100%
rename from DigitalData.MessagingService.Publisher/DigitalData.MessagingService.Publisher.Abstraction.csproj
rename to src/DigitalData.MessagingService.Publisher.Abstraction/DigitalData.MessagingService.Publisher.Abstraction.csproj
diff --git a/DigitalData.MessagingService.Publisher/IOutgoingEmailPublisher.cs b/src/DigitalData.MessagingService.Publisher.Abstraction/IOutgoingEmailPublisher.cs
similarity index 100%
rename from DigitalData.MessagingService.Publisher/IOutgoingEmailPublisher.cs
rename to src/DigitalData.MessagingService.Publisher.Abstraction/IOutgoingEmailPublisher.cs
diff --git a/DigitalData.MessagingService.Publisher/OutgoingEmailEvent.cs b/src/DigitalData.MessagingService.Publisher.Abstraction/OutgoingEmailEvent.cs
similarity index 100%
rename from DigitalData.MessagingService.Publisher/OutgoingEmailEvent.cs
rename to src/DigitalData.MessagingService.Publisher.Abstraction/OutgoingEmailEvent.cs