diff --git a/directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj b/directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj
index 510378e4c..9e62cee38 100644
--- a/directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj
+++ b/directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\FilterLists.Directory.Infrastructure\FilterLists.Directory.Infrastructure.csproj" />
+    <ProjectReference Include="..\FilterLists.Directory.Application\FilterLists.Directory.Application.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/directory/src/FilterLists.Directory.Api/Startup.cs b/directory/src/FilterLists.Directory.Api/Startup.cs
index 28b2fd7c1..8356671b3 100644
--- a/directory/src/FilterLists.Directory.Api/Startup.cs
+++ b/directory/src/FilterLists.Directory.Api/Startup.cs
@@ -1,5 +1,4 @@
-using FilterLists.Directory.Infrastructure.Persistence.Queries;
-using FilterLists.Directory.Infrastructure.Persistence.Queries.Facade;
+using FilterLists.Directory.Application;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -20,16 +19,14 @@ public Startup(IConfiguration configuration)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddControllers();
-            services.RegisterQueryFacade(Configuration);
+            services.AddApplicationServices(Configuration);
         }
 
         public static void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
                 app.UseDeveloperExceptionPage();
-            app.UseHttpsRedirection();
             app.UseRouting();
-            app.UseAuthorization();
             app.UseEndpoints(endpoints => { endpoints.MapControllers(); });
         }
     }
diff --git a/directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj b/directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj
index 149b206ee..8487bd8fe 100644
--- a/directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj
+++ b/directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj
@@ -11,10 +11,15 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\FilterLists.Directory.Infrastructure\FilterLists.Directory.Infrastructure.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/directory/src/FilterLists.Directory.Application/ServicesRegistrationExtension.cs b/directory/src/FilterLists.Directory.Application/ServicesRegistrationExtension.cs
new file mode 100644
index 000000000..4d5703106
--- /dev/null
+++ b/directory/src/FilterLists.Directory.Application/ServicesRegistrationExtension.cs
@@ -0,0 +1,16 @@
+using FilterLists.Directory.Infrastructure;
+using MediatR;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace FilterLists.Directory.Application
+{
+    public static class ServicesRegistrationExtension
+    {
+        public static void AddApplicationServices(this IServiceCollection services, IConfiguration configuration)
+        {
+            services.AddMediatR(typeof(ServicesRegistrationExtension).Assembly);
+            services.AddInfrastructureServices(configuration);
+        }
+    }
+}
\ No newline at end of file
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryFacadeExtension.cs b/directory/src/FilterLists.Directory.Infrastructure/ServiceRegistrationExtension.cs
similarity index 50%
rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryFacadeExtension.cs
rename to directory/src/FilterLists.Directory.Infrastructure/ServiceRegistrationExtension.cs
index b0bbdbb72..ceaca2c99 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryFacadeExtension.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/ServiceRegistrationExtension.cs
@@ -1,12 +1,13 @@
-using Microsoft.EntityFrameworkCore;
+using FilterLists.Directory.Infrastructure.Persistence.Queries.Facade;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Facade
+namespace FilterLists.Directory.Infrastructure
 {
-    public static class QueryFacadeExtension
+    public static class ServiceRegistrationExtension
     {
-        public static void RegisterQueryFacade(this IServiceCollection services, IConfiguration configuration)
+        public static void AddInfrastructureServices(this IServiceCollection services, IConfiguration configuration)
         {
             services.AddDbContextPool<QueryDbContext>(o =>
                 o.UseNpgsql(configuration.GetConnectionString("DirectoryConnection")));