diff --git a/HrynCo.NotificationService.Api.IntegrationTests/HrynCo.NotificationService.Api.IntegrationTests.csproj b/HrynCo.NotificationService.Web.IntegrationTests/HrynCo.NotificationService.Web.IntegrationTests.csproj
similarity index 84%
rename from HrynCo.NotificationService.Api.IntegrationTests/HrynCo.NotificationService.Api.IntegrationTests.csproj
rename to HrynCo.NotificationService.Web.IntegrationTests/HrynCo.NotificationService.Web.IntegrationTests.csproj
index 35be975..6303e7b 100644
--- a/HrynCo.NotificationService.Api.IntegrationTests/HrynCo.NotificationService.Api.IntegrationTests.csproj
+++ b/HrynCo.NotificationService.Web.IntegrationTests/HrynCo.NotificationService.Web.IntegrationTests.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\HrynCo.NotificationService.Api\HrynCo.NotificationService.Api.csproj" />
+    <ProjectReference Include="..\HrynCo.NotificationService.Web\HrynCo.NotificationService.Web.csproj" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/HrynCo.NotificationService.Api.IntegrationTests/UnitTest1.cs b/HrynCo.NotificationService.Web.IntegrationTests/UnitTest1.cs
similarity index 55%
rename from HrynCo.NotificationService.Api.IntegrationTests/UnitTest1.cs
rename to HrynCo.NotificationService.Web.IntegrationTests/UnitTest1.cs
index 63cbafc..3e48a76 100644
--- a/HrynCo.NotificationService.Api.IntegrationTests/UnitTest1.cs
+++ b/HrynCo.NotificationService.Web.IntegrationTests/UnitTest1.cs
@@ -1,4 +1,4 @@
-namespace HrynCo.NotificationService.Api.IntegrationTests;
+namespace HrynCo.NotificationService.Web.IntegrationTests;
 
 public class UnitTest1
 {
diff --git a/HrynCo.NotificationService.Api/AppSettings.cs b/HrynCo.NotificationService.Web/AppSettings.cs
similarity index 77%
rename from HrynCo.NotificationService.Api/AppSettings.cs
rename to HrynCo.NotificationService.Web/AppSettings.cs
index a6d15cd..025441c 100644
--- a/HrynCo.NotificationService.Api/AppSettings.cs
+++ b/HrynCo.NotificationService.Web/AppSettings.cs
@@ -1,4 +1,4 @@
-namespace HrynCo.NotificationService.Api;
+namespace HrynCo.NotificationService.Web;
 
 public sealed class AppSettings
 {
diff --git a/HrynCo.NotificationService.Api/Controllers/ApiControllerBase.cs b/HrynCo.NotificationService.Web/Controllers/ApiControllerBase.cs
similarity index 94%
rename from HrynCo.NotificationService.Api/Controllers/ApiControllerBase.cs
rename to HrynCo.NotificationService.Web/Controllers/ApiControllerBase.cs
index cfa4636..e385d28 100644
--- a/HrynCo.NotificationService.Api/Controllers/ApiControllerBase.cs
+++ b/HrynCo.NotificationService.Web/Controllers/ApiControllerBase.cs
@@ -1,9 +1,9 @@
-using HrynCo.NotificationService.Api.Infrastructure;
+using HrynCo.NotificationService.Web.Infrastructure;
 using HrynCo.NotificationService.Services.Core;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 
-namespace HrynCo.NotificationService.Api.Controllers;
+namespace HrynCo.NotificationService.Web.Controllers;
 
 [Route("api/v1/[controller]")]
 [ApiController]
diff --git a/HrynCo.NotificationService.Api/Controllers/EmailChannels/CreateEmailChannelRequest.cs b/HrynCo.NotificationService.Web/Controllers/EmailChannels/CreateEmailChannelRequest.cs
similarity index 83%
rename from HrynCo.NotificationService.Api/Controllers/EmailChannels/CreateEmailChannelRequest.cs
rename to HrynCo.NotificationService.Web/Controllers/EmailChannels/CreateEmailChannelRequest.cs
index c665143..7bb6aa0 100644
--- a/HrynCo.NotificationService.Api/Controllers/EmailChannels/CreateEmailChannelRequest.cs
+++ b/HrynCo.NotificationService.Web/Controllers/EmailChannels/CreateEmailChannelRequest.cs
@@ -1,6 +1,6 @@
 using HrynCo.NotificationService.DAL.Abstract.Providers;
 
-namespace HrynCo.NotificationService.Api.Controllers.EmailChannels;
+namespace HrynCo.NotificationService.Web.Controllers.EmailChannels;
 
 public sealed record CreateEmailChannelRequest(
     string ServiceName,
diff --git a/HrynCo.NotificationService.Api/Controllers/EmailChannels/EmailChannelsController.cs b/HrynCo.NotificationService.Web/Controllers/EmailChannels/EmailChannelsController.cs
similarity index 95%
rename from HrynCo.NotificationService.Api/Controllers/EmailChannels/EmailChannelsController.cs
rename to HrynCo.NotificationService.Web/Controllers/EmailChannels/EmailChannelsController.cs
index 2998e0f..21695c5 100644
--- a/HrynCo.NotificationService.Api/Controllers/EmailChannels/EmailChannelsController.cs
+++ b/HrynCo.NotificationService.Web/Controllers/EmailChannels/EmailChannelsController.cs
@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.Api.Infrastructure;
+using HrynCo.NotificationService.Web.Infrastructure;
 using HrynCo.NotificationService.Services.EmailChannels.Create;
 using HrynCo.NotificationService.Services.EmailChannels.Delete;
 using HrynCo.NotificationService.Services.EmailChannels.Get;
@@ -7,7 +7,7 @@ using HrynCo.NotificationService.Services.EmailChannels.Update;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 
-namespace HrynCo.NotificationService.Api.Controllers.EmailChannels;
+namespace HrynCo.NotificationService.Web.Controllers.EmailChannels;
 
 [Route("api/v1/email-channels")]
 public sealed class EmailChannelsController : ApiControllerBase
diff --git a/HrynCo.NotificationService.Api/Controllers/EmailChannels/UpdateEmailChannelRequest.cs b/HrynCo.NotificationService.Web/Controllers/EmailChannels/UpdateEmailChannelRequest.cs
similarity index 80%
rename from HrynCo.NotificationService.Api/Controllers/EmailChannels/UpdateEmailChannelRequest.cs
rename to HrynCo.NotificationService.Web/Controllers/EmailChannels/UpdateEmailChannelRequest.cs
index caed07f..cfd241e 100644
--- a/HrynCo.NotificationService.Api/Controllers/EmailChannels/UpdateEmailChannelRequest.cs
+++ b/HrynCo.NotificationService.Web/Controllers/EmailChannels/UpdateEmailChannelRequest.cs
@@ -1,6 +1,6 @@
 using HrynCo.NotificationService.DAL.Abstract.Providers;
 
-namespace HrynCo.NotificationService.Api.Controllers.EmailChannels;
+namespace HrynCo.NotificationService.Web.Controllers.EmailChannels;
 
 public sealed record UpdateEmailChannelRequest(
     int Priority,
diff --git a/HrynCo.NotificationService.Api/Controllers/EmailTemplates/CreateEmailTemplateRequest.cs b/HrynCo.NotificationService.Web/Controllers/EmailTemplates/CreateEmailTemplateRequest.cs
similarity index 82%
rename from HrynCo.NotificationService.Api/Controllers/EmailTemplates/CreateEmailTemplateRequest.cs
rename to HrynCo.NotificationService.Web/Controllers/EmailTemplates/CreateEmailTemplateRequest.cs
index ff7c68a..169cbbc 100644
--- a/HrynCo.NotificationService.Api/Controllers/EmailTemplates/CreateEmailTemplateRequest.cs
+++ b/HrynCo.NotificationService.Web/Controllers/EmailTemplates/CreateEmailTemplateRequest.cs
@@ -1,6 +1,6 @@
 using HrynCo.NotificationService.DAL.Abstract.Templates;
 
-namespace HrynCo.NotificationService.Api.Controllers.EmailTemplates;
+namespace HrynCo.NotificationService.Web.Controllers.EmailTemplates;
 
 public sealed record CreateEmailTemplateRequest(
     string ServiceName,
diff --git a/HrynCo.NotificationService.Api/Controllers/EmailTemplates/EmailTemplatesController.cs b/HrynCo.NotificationService.Web/Controllers/EmailTemplates/EmailTemplatesController.cs
similarity index 96%
rename from HrynCo.NotificationService.Api/Controllers/EmailTemplates/EmailTemplatesController.cs
rename to HrynCo.NotificationService.Web/Controllers/EmailTemplates/EmailTemplatesController.cs
index 17a781c..c378b31 100644
--- a/HrynCo.NotificationService.Api/Controllers/EmailTemplates/EmailTemplatesController.cs
+++ b/HrynCo.NotificationService.Web/Controllers/EmailTemplates/EmailTemplatesController.cs
@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.Api.Infrastructure;
+using HrynCo.NotificationService.Web.Infrastructure;
 using HrynCo.NotificationService.Services.EmailTemplates.Create;
 using HrynCo.NotificationService.Services.EmailTemplates.Delete;
 using HrynCo.NotificationService.Services.EmailTemplates.Get;
@@ -7,7 +7,7 @@ using HrynCo.NotificationService.Services.EmailTemplates.Update;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 
-namespace HrynCo.NotificationService.Api.Controllers.EmailTemplates;
+namespace HrynCo.NotificationService.Web.Controllers.EmailTemplates;
 
 [Route("api/v1/email-templates")]
 public sealed class EmailTemplatesController : ApiControllerBase
diff --git a/HrynCo.NotificationService.Api/Controllers/EmailTemplates/UpdateEmailTemplateRequest.cs b/HrynCo.NotificationService.Web/Controllers/EmailTemplates/UpdateEmailTemplateRequest.cs
similarity index 78%
rename from HrynCo.NotificationService.Api/Controllers/EmailTemplates/UpdateEmailTemplateRequest.cs
rename to HrynCo.NotificationService.Web/Controllers/EmailTemplates/UpdateEmailTemplateRequest.cs
index 4b14033..c647063 100644
--- a/HrynCo.NotificationService.Api/Controllers/EmailTemplates/UpdateEmailTemplateRequest.cs
+++ b/HrynCo.NotificationService.Web/Controllers/EmailTemplates/UpdateEmailTemplateRequest.cs
@@ -1,6 +1,6 @@
 using HrynCo.NotificationService.DAL.Abstract.Templates;
 
-namespace HrynCo.NotificationService.Api.Controllers.EmailTemplates;
+namespace HrynCo.NotificationService.Web.Controllers.EmailTemplates;
 
 public sealed record UpdateEmailTemplateRequest(
     string Subject,
diff --git a/HrynCo.NotificationService.Api/Dockerfile b/HrynCo.NotificationService.Web/Dockerfile
similarity index 100%
rename from HrynCo.NotificationService.Api/Dockerfile
rename to HrynCo.NotificationService.Web/Dockerfile
diff --git a/HrynCo.NotificationService.Api/HrynCo.NotificationService.Api.csproj b/HrynCo.NotificationService.Web/HrynCo.NotificationService.Web.csproj
similarity index 100%
rename from HrynCo.NotificationService.Api/HrynCo.NotificationService.Api.csproj
rename to HrynCo.NotificationService.Web/HrynCo.NotificationService.Web.csproj
diff --git a/HrynCo.NotificationService.Api/HrynCo.NotificationService.Api.http b/HrynCo.NotificationService.Web/HrynCo.NotificationService.Web.http
similarity index 100%
rename from HrynCo.NotificationService.Api/HrynCo.NotificationService.Api.http
rename to HrynCo.NotificationService.Web/HrynCo.NotificationService.Web.http
diff --git a/HrynCo.NotificationService.Api/Infrastructure/ApiResponse.cs b/HrynCo.NotificationService.Web/Infrastructure/ApiResponse.cs
similarity index 83%
rename from HrynCo.NotificationService.Api/Infrastructure/ApiResponse.cs
rename to HrynCo.NotificationService.Web/Infrastructure/ApiResponse.cs
index 57adf75..3818665 100644
--- a/HrynCo.NotificationService.Api/Infrastructure/ApiResponse.cs
+++ b/HrynCo.NotificationService.Web/Infrastructure/ApiResponse.cs
@@ -1,4 +1,4 @@
-namespace HrynCo.NotificationService.Api.Infrastructure;
+namespace HrynCo.NotificationService.Web.Infrastructure;
 
 public sealed class ApiResponse<T>
 {
diff --git a/HrynCo.NotificationService.Api/Program.cs b/HrynCo.NotificationService.Web/Program.cs
similarity index 95%
rename from HrynCo.NotificationService.Api/Program.cs
rename to HrynCo.NotificationService.Web/Program.cs
index c3e8d86..4aec724 100644
--- a/HrynCo.NotificationService.Api/Program.cs
+++ b/HrynCo.NotificationService.Web/Program.cs
@@ -1,4 +1,4 @@
-using HrynCo.NotificationService.Api;
+using HrynCo.NotificationService.Web;
 using HrynCo.NotificationService.DAL.EF;
 using HrynCo.NotificationService.Services;
 using Scalar.AspNetCore;
diff --git a/HrynCo.NotificationService.Api/Properties/launchSettings.json b/HrynCo.NotificationService.Web/Properties/launchSettings.json
similarity index 100%
rename from HrynCo.NotificationService.Api/Properties/launchSettings.json
rename to HrynCo.NotificationService.Web/Properties/launchSettings.json
diff --git a/HrynCo.NotificationService.Api/SerilogRegistrar.cs b/HrynCo.NotificationService.Web/SerilogRegistrar.cs
similarity index 92%
rename from HrynCo.NotificationService.Api/SerilogRegistrar.cs
rename to HrynCo.NotificationService.Web/SerilogRegistrar.cs
index c00ba45..d3f6de5 100644
--- a/HrynCo.NotificationService.Api/SerilogRegistrar.cs
+++ b/HrynCo.NotificationService.Web/SerilogRegistrar.cs
@@ -1,6 +1,6 @@
 using Serilog;
 
-namespace HrynCo.NotificationService.Api;
+namespace HrynCo.NotificationService.Web;
 
 public static class SerilogRegistrar
 {
diff --git a/HrynCo.NotificationService.Api/appsettings.Development.json b/HrynCo.NotificationService.Web/appsettings.Development.json
similarity index 100%
rename from HrynCo.NotificationService.Api/appsettings.Development.json
rename to HrynCo.NotificationService.Web/appsettings.Development.json
diff --git a/HrynCo.NotificationService.Api/appsettings.json b/HrynCo.NotificationService.Web/appsettings.json
similarity index 100%
rename from HrynCo.NotificationService.Api/appsettings.json
rename to HrynCo.NotificationService.Web/appsettings.json
diff --git a/HrynCo.NotificationService.slnx b/HrynCo.NotificationService.slnx
index b128841..9becdfd 100644
--- a/HrynCo.NotificationService.slnx
+++ b/HrynCo.NotificationService.slnx
@@ -2,15 +2,15 @@
   <Folder Name="/docker/">
     <File Path="docker/environments/docker-compose.yml" />
     <File Path="docker/environments/docker-compose.Development.yml" />
-    <Folder Name="/docker/Api/">
-      <File Path="HrynCo.NotificationService.Api/Dockerfile" />
+    <Folder Name="/docker/Web/">
+      <File Path="HrynCo.NotificationService.Web/Dockerfile" />
     </Folder>
     <Folder Name="/docker/Worker/">
       <File Path="HrynCo.NotificationService.Worker/Dockerfile" />
     </Folder>
   </Folder>
-  <Project Path="HrynCo.NotificationService.Api.IntegrationTests/HrynCo.NotificationService.Api.IntegrationTests.csproj" />
-  <Project Path="HrynCo.NotificationService.Api/HrynCo.NotificationService.Api.csproj" />
+  <Project Path="HrynCo.NotificationService.Web.IntegrationTests/HrynCo.NotificationService.Web.IntegrationTests.csproj" />
+  <Project Path="HrynCo.NotificationService.Web/HrynCo.NotificationService.Web.csproj" />
   <Project Path="HrynCo.NotificationService.DAL.Abstract/HrynCo.NotificationService.DAL.Abstract.csproj" />
   <Project Path="HrynCo.NotificationService.DAL.EF/HrynCo.NotificationService.DAL.EF.csproj" />
   <Project Path="HrynCo.NotificationService.Services.Tests/HrynCo.NotificationService.Services.Tests.csproj" />
diff --git a/docker/environments/docker-compose.yml b/docker/environments/docker-compose.yml
index a61e4b5..a5e2394 100644
--- a/docker/environments/docker-compose.yml
+++ b/docker/environments/docker-compose.yml
@@ -2,7 +2,7 @@ services:
   api:
     build:
       context: ../..
-      dockerfile: HrynCo.NotificationService.Api/Dockerfile
+      dockerfile: HrynCo.NotificationService.Web/Dockerfile
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - App__ConnectionString=${CONNECTION_STRING}