diff --git a/DigitalData.EmailProfilerDispatcher.sln b/DigitalData.EmailProfilerDispatcher.sln
index a5f562e..d789925 100644
--- a/DigitalData.EmailProfilerDispatcher.sln
+++ b/DigitalData.EmailProfilerDispatcher.sln
@@ -5,11 +5,11 @@ VisualStudioVersion = 17.9.34622.214
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.EmailProfilerDispatcher.API", "DigitalData.EmailProfilerDispatcher.API\DigitalData.EmailProfilerDispatcher.API.csproj", "{352BEA44-4D3E-4D22-B1B3-B3E06A928396}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.EmailProfilerDispatcher.Application", "DigitalData.EmailProfilerDispatcher.Application\DigitalData.EmailProfilerDispatcher.Application.csproj", "{4C42937A-944D-4AAB-A835-F7EEC2C8872F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmailProfilerDispatcher.Tests", "EmailProfilerDispatcher.Tests\EmailProfilerDispatcher.Tests.csproj", "{C55114DF-F7C9-47A6-AF36-99F6C8079DE2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.EmailProfilerDispatcher.Abstraction", "DigitalData.EmailProfilerDispatcher.Abstraction\DigitalData.EmailProfilerDispatcher.Abstraction.csproj", "{0647F6B7-BF49-4B1F-83E4-7C843A7F9775}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.EmailProfilerDispatcher.Abstraction", "DigitalData.EmailProfilerDispatcher.Abstraction\DigitalData.EmailProfilerDispatcher.Abstraction.csproj", "{0647F6B7-BF49-4B1F-83E4-7C843A7F9775}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.EmailProfilerDispatcher", "DigitalData.EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.csproj", "{DF202B1D-6C6F-4354-9B73-20F03486D020}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,10 +21,6 @@ Global
 		{352BEA44-4D3E-4D22-B1B3-B3E06A928396}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{352BEA44-4D3E-4D22-B1B3-B3E06A928396}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{352BEA44-4D3E-4D22-B1B3-B3E06A928396}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4C42937A-944D-4AAB-A835-F7EEC2C8872F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C42937A-944D-4AAB-A835-F7EEC2C8872F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C42937A-944D-4AAB-A835-F7EEC2C8872F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C42937A-944D-4AAB-A835-F7EEC2C8872F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C55114DF-F7C9-47A6-AF36-99F6C8079DE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C55114DF-F7C9-47A6-AF36-99F6C8079DE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C55114DF-F7C9-47A6-AF36-99F6C8079DE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -33,6 +29,10 @@ Global
 		{0647F6B7-BF49-4B1F-83E4-7C843A7F9775}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0647F6B7-BF49-4B1F-83E4-7C843A7F9775}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0647F6B7-BF49-4B1F-83E4-7C843A7F9775}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF202B1D-6C6F-4354-9B73-20F03486D020}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF202B1D-6C6F-4354-9B73-20F03486D020}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF202B1D-6C6F-4354-9B73-20F03486D020}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF202B1D-6C6F-4354-9B73-20F03486D020}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/DigitalData.EmailProfilerDispatcher.Application/DIExtensions.cs b/DigitalData.EmailProfilerDispatcher/DIExtensions.cs
similarity index 87%
rename from DigitalData.EmailProfilerDispatcher.Application/DIExtensions.cs
rename to DigitalData.EmailProfilerDispatcher/DIExtensions.cs
index 8f03641..b2f1463 100644
--- a/DigitalData.EmailProfilerDispatcher.Application/DIExtensions.cs
+++ b/DigitalData.EmailProfilerDispatcher/DIExtensions.cs
@@ -1,10 +1,10 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
-using DigitalData.EmailProfilerDispatcher.Application.Repositories;
+using DigitalData.EmailProfilerDispatcher.Repositories;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Services;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace DigitalData.EmailProfilerDispatcher.Application
+namespace DigitalData.EmailProfilerDispatcher
 {
     public static class DIExtensions
     {
diff --git a/DigitalData.EmailProfilerDispatcher.Application/DefaultMailDbContext.cs b/DigitalData.EmailProfilerDispatcher/DefaultMailDbContext.cs
similarity index 90%
rename from DigitalData.EmailProfilerDispatcher.Application/DefaultMailDbContext.cs
rename to DigitalData.EmailProfilerDispatcher/DefaultMailDbContext.cs
index 199bc92..55aab07 100644
--- a/DigitalData.EmailProfilerDispatcher.Application/DefaultMailDbContext.cs
+++ b/DigitalData.EmailProfilerDispatcher/DefaultMailDbContext.cs
@@ -1,7 +1,7 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
 using Microsoft.EntityFrameworkCore;
 
-namespace DigitalData.EmailProfilerDispatcher.Application
+namespace DigitalData.EmailProfilerDispatcher
 {
     public class DefaultMailDbContext : DbContext
     {
diff --git a/DigitalData.EmailProfilerDispatcher.Application/DigitalData.EmailProfilerDispatcher.Application.csproj b/DigitalData.EmailProfilerDispatcher/DigitalData.EmailProfilerDispatcher.csproj
similarity index 93%
rename from DigitalData.EmailProfilerDispatcher.Application/DigitalData.EmailProfilerDispatcher.Application.csproj
rename to DigitalData.EmailProfilerDispatcher/DigitalData.EmailProfilerDispatcher.csproj
index 1ac11da..543c855 100644
--- a/DigitalData.EmailProfilerDispatcher.Application/DigitalData.EmailProfilerDispatcher.Application.csproj
+++ b/DigitalData.EmailProfilerDispatcher/DigitalData.EmailProfilerDispatcher.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.16" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.19" />
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.19" />
+    <PackageReference Include="WebCore.Abstractions" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/DigitalData.EmailProfilerDispatcher.Application/MappingProfile.cs b/DigitalData.EmailProfilerDispatcher/MappingProfile.cs
similarity index 88%
rename from DigitalData.EmailProfilerDispatcher.Application/MappingProfile.cs
rename to DigitalData.EmailProfilerDispatcher/MappingProfile.cs
index 4e09493..6577cf4 100644
--- a/DigitalData.EmailProfilerDispatcher.Application/MappingProfile.cs
+++ b/DigitalData.EmailProfilerDispatcher/MappingProfile.cs
@@ -2,7 +2,7 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
 
-namespace DigitalData.EmailProfilerDispatcher.Application
+namespace DigitalData.EmailProfilerDispatcher
 {
     public class MappingProfile : Profile
     {
diff --git a/DigitalData.EmailProfilerDispatcher.Application/Repositories/EmailOutRepository.cs b/DigitalData.EmailProfilerDispatcher/Repositories/EmailOutRepository.cs
similarity index 86%
rename from DigitalData.EmailProfilerDispatcher.Application/Repositories/EmailOutRepository.cs
rename to DigitalData.EmailProfilerDispatcher/Repositories/EmailOutRepository.cs
index 4985b3e..f213f2b 100644
--- a/DigitalData.EmailProfilerDispatcher.Application/Repositories/EmailOutRepository.cs
+++ b/DigitalData.EmailProfilerDispatcher/Repositories/EmailOutRepository.cs
@@ -3,7 +3,7 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
 using Microsoft.EntityFrameworkCore;
 
-namespace DigitalData.EmailProfilerDispatcher.Application.Repositories
+namespace DigitalData.EmailProfilerDispatcher.Repositories
 {
     public class EmailOutRepository<TDbContext> : CRUDRepository<EmailOut, int, TDbContext>, IEmailOutRepository
         where TDbContext : DbContext
diff --git a/DigitalData.EmailProfilerDispatcher.Application/Services/EmailOutService.cs b/DigitalData.EmailProfilerDispatcher/Services/EmailOutService.cs
similarity index 95%
rename from DigitalData.EmailProfilerDispatcher.Application/Services/EmailOutService.cs
rename to DigitalData.EmailProfilerDispatcher/Services/EmailOutService.cs
index 0ae76b1..59eaf56 100644
--- a/DigitalData.EmailProfilerDispatcher.Application/Services/EmailOutService.cs
+++ b/DigitalData.EmailProfilerDispatcher/Services/EmailOutService.cs
@@ -4,7 +4,6 @@ using DigitalData.Core.DTO;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
 using DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
-using DigitalData.EmailProfilerDispatcher.Application;
 
 namespace DigitalData.EmailProfilerDispatcher.Abstraction.Services
 {
diff --git a/DigitalData.EmailProfilerDispatcher.Application/TemplateExtensions.cs b/DigitalData.EmailProfilerDispatcher/TemplateExtensions.cs
similarity index 83%
rename from DigitalData.EmailProfilerDispatcher.Application/TemplateExtensions.cs
rename to DigitalData.EmailProfilerDispatcher/TemplateExtensions.cs
index 9c40370..c1ce609 100644
--- a/DigitalData.EmailProfilerDispatcher.Application/TemplateExtensions.cs
+++ b/DigitalData.EmailProfilerDispatcher/TemplateExtensions.cs
@@ -1,12 +1,7 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace DigitalData.EmailProfilerDispatcher.Application
+namespace DigitalData.EmailProfilerDispatcher
 {
 	public static class TemplateExtensions
 	{