diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index fcc00735e..1a06bce74 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,11 +1,5 @@
 version: 2
 updates:
-- package-ecosystem: nuget
-  directory: "/services/archival/src/FilterLists.Archival.Api"
-  schedule:
-    interval: daily
-    time: "11:00"
-  open-pull-requests-limit: 99
 - package-ecosystem: docker
   directory: "/services/archival/src/FilterLists.Archival.Api"
   schedule:
@@ -13,7 +7,19 @@ updates:
     time: "11:00"
   open-pull-requests-limit: 99
 - package-ecosystem: nuget
-  directory: "/services/directory/src/FilterLists.Directory.Api"
+  directory: "/services/archival/src/FilterLists.Archival.Api"
+  schedule:
+    interval: daily
+    time: "11:00"
+  open-pull-requests-limit: 99
+- package-ecosystem: nuget
+  directory: "/services/archival/src/FilterLists.Archival.Application"
+  schedule:
+    interval: daily
+    time: "11:00"
+  open-pull-requests-limit: 99
+- package-ecosystem: nuget
+  directory: "/services/archival/src/FilterLists.Archival.Infrastructure"
   schedule:
     interval: daily
     time: "11:00"
@@ -25,7 +31,7 @@ updates:
     time: "11:00"
   open-pull-requests-limit: 99
 - package-ecosystem: nuget
-  directory: "/services/directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests"
+  directory: "/services/directory/src/FilterLists.Directory.Api"
   schedule:
     interval: daily
     time: "11:00"
@@ -54,6 +60,12 @@ updates:
     interval: daily
     time: "11:00"
   open-pull-requests-limit: 99
+- package-ecosystem: nuget
+  directory: "/services/directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests"
+  schedule:
+    interval: daily
+    time: "11:00"
+  open-pull-requests-limit: 99
 - package-ecosystem: docker
   directory: "/web"
   schedule:
diff --git a/services/FilterLists.sln b/services/FilterLists.sln
index cdac375fc..555ee6b94 100644
--- a/services/FilterLists.sln
+++ b/services/FilterLists.sln
@@ -50,6 +50,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Archival", "Archival", "{5E
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Archival.Api", "archival\src\FilterLists.Archival.Api\FilterLists.Archival.Api.csproj", "{F625C241-0501-4AEB-8B82-609C93EE6B7D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Archival.Application", "archival\src\FilterLists.Archival.Application\FilterLists.Archival.Application.csproj", "{11669839-E666-477B-A1B6-276041AD3768}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Archival.Infrastructure", "archival\src\FilterLists.Archival.Infrastructure\FilterLists.Archival.Infrastructure.csproj", "{A0B77015-E8C4-41D3-B63D-BF818026298C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -88,6 +92,14 @@ Global
 		{F625C241-0501-4AEB-8B82-609C93EE6B7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F625C241-0501-4AEB-8B82-609C93EE6B7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F625C241-0501-4AEB-8B82-609C93EE6B7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11669839-E666-477B-A1B6-276041AD3768}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11669839-E666-477B-A1B6-276041AD3768}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11669839-E666-477B-A1B6-276041AD3768}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11669839-E666-477B-A1B6-276041AD3768}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0B77015-E8C4-41D3-B63D-BF818026298C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0B77015-E8C4-41D3-B63D-BF818026298C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0B77015-E8C4-41D3-B63D-BF818026298C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0B77015-E8C4-41D3-B63D-BF818026298C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -101,6 +113,8 @@ Global
 		{8F419098-3EEB-4B4B-99A8-70555FA93DAF} = {AE5D6471-1B6E-4B06-A313-34EF81F35342}
 		{8B07EF04-5516-40BB-B21B-CEC6F90EC631} = {AE5D6471-1B6E-4B06-A313-34EF81F35342}
 		{F625C241-0501-4AEB-8B82-609C93EE6B7D} = {5E52FEF9-9605-4ACB-8A42-A20E06331599}
+		{11669839-E666-477B-A1B6-276041AD3768} = {5E52FEF9-9605-4ACB-8A42-A20E06331599}
+		{A0B77015-E8C4-41D3-B63D-BF818026298C} = {5E52FEF9-9605-4ACB-8A42-A20E06331599}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {758B57EF-7505-4BE2-90A2-E2DE2EC32909}
diff --git a/services/archival/src/FilterLists.Archival.Api/Dockerfile b/services/archival/src/FilterLists.Archival.Api/Dockerfile
index 89765e0b4..d74753321 100644
--- a/services/archival/src/FilterLists.Archival.Api/Dockerfile
+++ b/services/archival/src/FilterLists.Archival.Api/Dockerfile
@@ -1,16 +1,24 @@
 # init base
 FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1.7-alpine AS base
 WORKDIR /app
+EXPOSE 80
 
 # init build
 FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build
 
-# restore
+# restore API
+WORKDIR /src
+COPY archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj FilterLists.Archival.Infrastructure/
+COPY archival/src/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj FilterLists.Archival.Application/
 WORKDIR /src/FilterLists.Archival.Api
 COPY archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj .
 RUN dotnet restore
 
-# build
+# build API
+WORKDIR /src
+COPY archival/src/FilterLists.Archival.Infrastructure/. FilterLists.Archival.Infrastructure/
+COPY archival/src/FilterLists.Archival.Application/. FilterLists.Archival.Application/
+WORKDIR /src/FilterLists.Archival.Api
 COPY archival/src/FilterLists.Archival.Api/. .
 RUN dotnet publish -c Release --no-restore -o /app/publish -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-musl-x64
 
diff --git a/services/archival/src/FilterLists.Archival.Api/Dockerfile.dev b/services/archival/src/FilterLists.Archival.Api/Dockerfile.dev
index d85f2f967..e15f15cfd 100644
--- a/services/archival/src/FilterLists.Archival.Api/Dockerfile.dev
+++ b/services/archival/src/FilterLists.Archival.Api/Dockerfile.dev
@@ -1,16 +1,24 @@
 # init base for Visual Studio debugging
 FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.7-alpine AS base
 WORKDIR /app
+EXPOSE 80
 
 # init build
 FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build
 
-# restore
+# restore API
+WORKDIR /src
+COPY archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj FilterLists.Archival.Infrastructure/
+COPY archival/src/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj FilterLists.Archival.Application/
 WORKDIR /src/FilterLists.Archival.Api
 COPY archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj .
 RUN dotnet restore
 
-# build
+# build API
+WORKDIR /src
+COPY archival/src/FilterLists.Archival.Infrastructure/. FilterLists.Archival.Infrastructure/
+COPY archival/src/FilterLists.Archival.Application/. FilterLists.Archival.Application/
+WORKDIR /src/FilterLists.Archival.Api
 COPY archival/src/FilterLists.Archival.Api/. .
 RUN dotnet publish --no-restore -o /app/publish -r linux-musl-x64
 
diff --git a/services/archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj b/services/archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj
index 37a284e75..3aae5272c 100644
--- a/services/archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj
+++ b/services/archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj
@@ -34,4 +34,8 @@
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\FilterLists.Archival.Application\FilterLists.Archival.Application.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/services/archival/src/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj b/services/archival/src/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj
new file mode 100644
index 000000000..f09aae8e8
--- /dev/null
+++ b/services/archival/src/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj
@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Authors>Collin M. Barrett</Authors>
+    <Company>FilterLists</Company>
+    <Product>FilterLists Archival</Product>
+    <Description>The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.</Description>
+    <Copyright>Copyright (c) 2020 Collin M. Barrett</Copyright>
+    <RepositoryUrl>https://github.com/collinbarrett/FilterLists</RepositoryUrl>
+    <PackageProjectUrl>https://filterlists.com</PackageProjectUrl>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702;CA2007</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn>CA2007</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <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.Archival.Infrastructure\FilterLists.Archival.Infrastructure.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/services/archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj b/services/archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj
new file mode 100644
index 000000000..ade8fe069
--- /dev/null
+++ b/services/archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Authors>Collin M. Barrett</Authors>
+    <Company>FilterLists</Company>
+    <Product>FilterLists Archival</Product>
+    <Description>The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.</Description>
+    <Copyright>Copyright (c) 2020 Collin M. Barrett</Copyright>
+    <RepositoryUrl>https://github.com/collinbarrett/FilterLists</RepositoryUrl>
+    <PackageProjectUrl>https://filterlists.com</PackageProjectUrl>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702;CA2007</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn>CA2007</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>