diff --git a/services/FilterLists.ApiService/FilterLists.ApiService.csproj b/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj
similarity index 70%
rename from services/FilterLists.ApiService/FilterLists.ApiService.csproj
rename to services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj
index 62b2b4f44..d2d4c4c76 100644
--- a/services/FilterLists.ApiService/FilterLists.ApiService.csproj
+++ b/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\FilterLists.ServiceDefaults\FilterLists.ServiceDefaults.csproj"/>
+        <ProjectReference Include="..\..\FilterLists.ServiceDefaults\FilterLists.ServiceDefaults.csproj"/>
     </ItemGroup>
 
 </Project>
diff --git a/services/FilterLists.ApiService/Program.cs b/services/Directory/FilterLists.Directory.Api/Program.cs
similarity index 100%
rename from services/FilterLists.ApiService/Program.cs
rename to services/Directory/FilterLists.Directory.Api/Program.cs
diff --git a/services/FilterLists.ApiService/Properties/launchSettings.json b/services/Directory/FilterLists.Directory.Api/Properties/launchSettings.json
similarity index 100%
rename from services/FilterLists.ApiService/Properties/launchSettings.json
rename to services/Directory/FilterLists.Directory.Api/Properties/launchSettings.json
diff --git a/services/FilterLists.ApiService/appsettings.Development.json b/services/Directory/FilterLists.Directory.Api/appsettings.Development.json
similarity index 100%
rename from services/FilterLists.ApiService/appsettings.Development.json
rename to services/Directory/FilterLists.Directory.Api/appsettings.Development.json
diff --git a/services/FilterLists.ApiService/appsettings.json b/services/Directory/FilterLists.Directory.Api/appsettings.json
similarity index 100%
rename from services/FilterLists.ApiService/appsettings.json
rename to services/Directory/FilterLists.Directory.Api/appsettings.json
diff --git a/services/FilterLists.AppHost/FilterLists.AppHost.csproj b/services/FilterLists.AppHost/FilterLists.AppHost.csproj
index 53142228c..6c19331f3 100644
--- a/services/FilterLists.AppHost/FilterLists.AppHost.csproj
+++ b/services/FilterLists.AppHost/FilterLists.AppHost.csproj
@@ -10,7 +10,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\FilterLists.ApiService\FilterLists.ApiService.csproj"/>
+        <ProjectReference Include="..\Directory\FilterLists.Directory.Api\FilterLists.Directory.Api.csproj"/>
         <ProjectReference Include="..\FilterLists.Web\FilterLists.Web.csproj"/>
     </ItemGroup>
 
diff --git a/services/FilterLists.AppHost/Program.cs b/services/FilterLists.AppHost/Program.cs
index eeeb6cb68..78f6dceae 100644
--- a/services/FilterLists.AppHost/Program.cs
+++ b/services/FilterLists.AppHost/Program.cs
@@ -4,7 +4,7 @@
 
 var appInsights = builder.AddAzureApplicationInsights("appinsights");
 
-var directoryApi = builder.AddProject<FilterLists_ApiService>("directoryapi")
+var directoryApi = builder.AddProject<FilterLists_Directory_Api>("directoryapi")
     .WithReference(appInsights);
 
 builder.AddProject<FilterLists_Web>("web")
diff --git a/services/FilterLists.sln b/services/FilterLists.sln
index 1409a02a4..61a2b5fcc 100644
--- a/services/FilterLists.sln
+++ b/services/FilterLists.sln
@@ -6,12 +6,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.AppHost", "Filt
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.ServiceDefaults", "FilterLists.ServiceDefaults\FilterLists.ServiceDefaults.csproj", "{472BCEAB-C845-4870-AC82-437B10CA9CDE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.ApiService", "FilterLists.ApiService\FilterLists.ApiService.csproj", "{85A14D07-5C37-458A-B74B-4EE67BBA7102}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Api", "Directory\FilterLists.Directory.Api\FilterLists.Directory.Api.csproj", "{85A14D07-5C37-458A-B74B-4EE67BBA7102}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Tests", "FilterLists.Tests\FilterLists.Tests.csproj", "{063F0781-ECBC-4254-AF2F-1B75C6CC03B4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Web", "FilterLists.Web\FilterLists.Web.csproj", "{E1311604-98F6-4AC7-8995-5E9F4CC34809}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Directory", "Directory", "{C4F6197D-9546-480E-AE92-1FC264D8E88F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -45,4 +47,7 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {019F26B8-9430-4EAB-87B8-E8F52A739F4C}
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{85A14D07-5C37-458A-B74B-4EE67BBA7102} = {C4F6197D-9546-480E-AE92-1FC264D8E88F}
+	EndGlobalSection
 EndGlobal