diff --git a/DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.API/Controllers/MailController.cs b/DigitalData.EmailProfilerGateway.API/Controllers/MailController.cs
similarity index 100%
rename from DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.API/Controllers/MailController.cs
rename to DigitalData.EmailProfilerGateway.API/Controllers/MailController.cs
diff --git a/DigitalData.EmailProfilerGateway.API/DigitalData.EmailProfilerGateway.API.csproj b/DigitalData.EmailProfilerGateway.API/DigitalData.EmailProfilerGateway.API.csproj
new file mode 100644
index 0000000..1a93411
--- /dev/null
+++ b/DigitalData.EmailProfilerGateway.API/DigitalData.EmailProfilerGateway.API.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.15" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DigitalData.EmailProfilerGateway.Application\DigitalData.EmailProfilerGateway.Application.csproj" />
+    <ProjectReference Include="..\DigitalData.EmailProfilerGateway.Domain\DigitalData.EmailProfilerGateway.Domain.csproj" />
+    <ProjectReference Include="..\DigitalData.EmailProfilerGateway.Infrastructure\DigitalData.EmailProfilerGateway.Infrastructure.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.API/Program.cs b/DigitalData.EmailProfilerGateway.API/Program.cs
similarity index 100%
rename from DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.API/Program.cs
rename to DigitalData.EmailProfilerGateway.API/Program.cs
diff --git a/DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.API/Properties/launchSettings.json b/DigitalData.EmailProfilerGateway.API/Properties/launchSettings.json
similarity index 100%
rename from DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.API/Properties/launchSettings.json
rename to DigitalData.EmailProfilerGateway.API/Properties/launchSettings.json
diff --git a/DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.API/appsettings.Development.json b/DigitalData.EmailProfilerGateway.API/appsettings.Development.json
similarity index 100%
rename from DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.API/appsettings.Development.json
rename to DigitalData.EmailProfilerGateway.API/appsettings.Development.json
diff --git a/DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.API/appsettings.json b/DigitalData.EmailProfilerGateway.API/appsettings.json
similarity index 100%
rename from DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.API/appsettings.json
rename to DigitalData.EmailProfilerGateway.API/appsettings.json
diff --git a/DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.Application/DTOs/EmailOutDto.cs b/DigitalData.EmailProfilerGateway.Application/DTOs/EmailOutDto.cs
similarity index 100%
rename from DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.Application/DTOs/EmailOutDto.cs
rename to DigitalData.EmailProfilerGateway.Application/DTOs/EmailOutDto.cs
diff --git a/DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.Application/DigitalData.EmailProfilerGateway.Application.csproj b/DigitalData.EmailProfilerGateway.Application/DigitalData.EmailProfilerGateway.Application.csproj
similarity index 100%
rename from DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.Application/DigitalData.EmailProfilerGateway.Application.csproj
rename to DigitalData.EmailProfilerGateway.Application/DigitalData.EmailProfilerGateway.Application.csproj
diff --git a/DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.Domain/DigitalData.EmailProfilerGateway.Domain.csproj b/DigitalData.EmailProfilerGateway.Domain/DigitalData.EmailProfilerGateway.Domain.csproj
similarity index 100%
rename from DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.Domain/DigitalData.EmailProfilerGateway.Domain.csproj
rename to DigitalData.EmailProfilerGateway.Domain/DigitalData.EmailProfilerGateway.Domain.csproj
diff --git a/DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.Domain/Entities/EmailOut.cs b/DigitalData.EmailProfilerGateway.Domain/Entities/EmailOut.cs
similarity index 98%
rename from DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.Domain/Entities/EmailOut.cs
rename to DigitalData.EmailProfilerGateway.Domain/Entities/EmailOut.cs
index 50ed9cd..67792be 100644
--- a/DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.Domain/Entities/EmailOut.cs
+++ b/DigitalData.EmailProfilerGateway.Domain/Entities/EmailOut.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
diff --git a/DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.Infrastructure/DigitalData.EmailProfilerGateway.Infrastructure.csproj b/DigitalData.EmailProfilerGateway.Infrastructure/DigitalData.EmailProfilerGateway.Infrastructure.csproj
similarity index 100%
rename from DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.Infrastructure/DigitalData.EmailProfilerGateway.Infrastructure.csproj
rename to DigitalData.EmailProfilerGateway.Infrastructure/DigitalData.EmailProfilerGateway.Infrastructure.csproj
diff --git a/DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.sln b/DigitalData.EmailProfilerGateway.sln
similarity index 100%
rename from DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.sln
rename to DigitalData.EmailProfilerGateway.sln
diff --git a/DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.API/DigitalData.EmailProfilerGateway.API.csproj b/DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.API/DigitalData.EmailProfilerGateway.API.csproj
deleted file mode 100644
index 4c1b5b4..0000000
--- a/DigitalData.EmailProfilerGateway/DigitalData.EmailProfilerGateway.API/DigitalData.EmailProfilerGateway.API.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.15" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-  </ItemGroup>
-
-</Project>