diff --git a/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj b/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj
index 4638abf77..8f1335b97 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj
+++ b/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj
@@ -10,10 +10,6 @@
     <NoWarn>1701;1702;CA2007</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="Persistence\Queries\Mappings\" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/DirectoryQueryDbContext.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/DirectoryQueryDbContext.cs
similarity index 98%
rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/DirectoryQueryDbContext.cs
rename to directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/DirectoryQueryDbContext.cs
index aa87d9ffb..23606b030 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/DirectoryQueryDbContext.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/DirectoryQueryDbContext.cs
@@ -1,7 +1,7 @@
 using FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
 using Microsoft.EntityFrameworkCore;
 
-namespace FilterLists.Directory.Infrastructure.Persistence.Queries
+namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Facade
 {
     public class DirectoryQueryDbContext : DbContext
     {
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/DirectoryQueryFacade.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/DirectoryQueryFacade.cs
similarity index 99%
rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/DirectoryQueryFacade.cs
rename to directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/DirectoryQueryFacade.cs
index 34d4658ed..ce82099ea 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/DirectoryQueryFacade.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/DirectoryQueryFacade.cs
@@ -4,7 +4,7 @@
 using FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
 using Microsoft.EntityFrameworkCore;
 
-namespace FilterLists.Directory.Infrastructure.Persistence.Queries
+namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Facade
 {
     public class DirectoryQueryFacade : IQueryDirectory, IAsyncDisposable
     {
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/IQueryDirectory.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/IQueryDirectory.cs
similarity index 98%
rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/IQueryDirectory.cs
rename to directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/IQueryDirectory.cs
index c2e2bc407..3b9fa1521 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/IQueryDirectory.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/IQueryDirectory.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
 
-namespace FilterLists.Directory.Infrastructure.Persistence.Queries
+namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Facade
 {
     public interface IQueryDirectory
     {