diff --git a/docker-compose.agent.tests.yml b/docker-compose.agent.tests.yml index f3c6cfd2c..ec2343b08 100644 --- a/docker-compose.agent.tests.yml +++ b/docker-compose.agent.tests.yml @@ -5,7 +5,7 @@ services: image: collinbarrett2/filterlists.agent:test-agent build: context: . - dockerfile: src/FilterLists.Agent/Dockerfile + dockerfile: server/src/FilterLists.Agent/Dockerfile target: test-agent networks: - test-agent diff --git a/docker-compose.data.tests.yml b/docker-compose.data.tests.yml index 4ca768e01..67539ab1a 100644 --- a/docker-compose.data.tests.yml +++ b/docker-compose.data.tests.yml @@ -5,7 +5,7 @@ services: image: collinbarrett2/filterlists.api:test-data build: context: . - dockerfile: src/FilterLists.Api/Dockerfile + dockerfile: server/src/FilterLists.Api/Dockerfile target: test-data networks: - test-data diff --git a/docker-compose.dcproj b/docker-compose.dcproj deleted file mode 100644 index 1a52d6f89..000000000 --- a/docker-compose.dcproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 2.1 - Linux - b94a5bcd-3be3-4fe4-ae48-adcf904a22a4 - LaunchBrowser - {Scheme}://localhost:{ServicePort} - filterlists - - - - - - - docker-compose.yml - - - docker-compose.yml - - - - - - \ No newline at end of file diff --git a/docker-compose.services.tests.yml b/docker-compose.services.tests.yml index 9dd00b976..69c898ca6 100644 --- a/docker-compose.services.tests.yml +++ b/docker-compose.services.tests.yml @@ -5,7 +5,7 @@ services: image: collinbarrett2/filterlists.api:test-services build: context: . - dockerfile: src/FilterLists.Api/Dockerfile + dockerfile: server/src/FilterLists.Api/Dockerfile target: test-services networks: - test-services diff --git a/docker-compose.yml b/docker-compose.yml index 35c6f1954..6128b4a7e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: restart: always build: context: . - dockerfile: src/FilterLists.Api/Dockerfile + dockerfile: server/src/FilterLists.Api/Dockerfile target: final networks: - reverse-proxy @@ -59,7 +59,7 @@ services: image: collinbarrett2/filterlists.agent:latest build: context: . - dockerfile: src/FilterLists.Agent/Dockerfile + dockerfile: server/src/FilterLists.Agent/Dockerfile target: final volumes: - archives:/app/archives diff --git a/.dockerignore b/server/.dockerignore similarity index 68% rename from .dockerignore rename to server/.dockerignore index fdc790ef5..6d35fee2a 100644 --- a/.dockerignore +++ b/server/.dockerignore @@ -1,38 +1,35 @@ # From default Visual Studio .NET Core template +**/.classpath **/.dockerignore **/.env **/.git **/.gitignore +**/.project +**/.settings +**/.toolstarget **/.vs **/.vscode **/*.*proj.user -**/azds.yaml -**/charts -**/bin -**/obj -**/Dockerfile -**/Dockerfile.develop -**/docker-compose.yml -**/docker-compose.*.yml **/*.dbmdl **/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj **/secrets.dev.yaml **/values.dev.yaml -**/.toolstarget +LICENSE +README.md # Other common **/.gitattributes **/.github **/.sln -**/docker-compose.dcproj **/*.DotSettings* **/appsettings*.json -**/node_modules **/build **/*.md -LICENSE - -# FilterLists custom -imgs -ops -data/TPLSubscriptionAssistant.html \ No newline at end of file diff --git a/.gitignore b/server/.gitignore similarity index 97% rename from .gitignore rename to server/.gitignore index a5dc36b3f..611428fab 100644 --- a/.gitignore +++ b/server/.gitignore @@ -29,6 +29,7 @@ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ +[Ll]ogs/ # Visual Studio 2015/2017 cache/options directory .vs/ @@ -126,9 +127,6 @@ _ReSharper*/ *.[Rr]e[Ss]harper *.DotSettings.user -# JustCode is a .NET coding add-in -.JustCode - # TeamCity is a build add-in _TeamCity* @@ -139,6 +137,9 @@ _TeamCity* .axoCover/* !.axoCover/settings.json +# Coverlet is a free, cross platform Code Coverage Tool +coverage*[.json, .xml, .info] + # Visual Studio code coverage results *.coverage *.coveragexml @@ -348,6 +349,5 @@ healthchecksdb # Backup folder for Package Reference Convert tool in Visual Studio 2017 MigrationBackup/ -# FilterLists Custom Ignores -appsettings.*.json -src/FilterLists.Web/wwwroot/dist \ No newline at end of file +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ diff --git a/FilterLists.sln b/server/FilterLists.sln similarity index 79% rename from FilterLists.sln rename to server/FilterLists.sln index 54030ceb7..6350d2d7f 100644 --- a/FilterLists.sln +++ b/server/FilterLists.sln @@ -3,24 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29326.143 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "data", "{75D9CA5B-4092-4015-8984-7C4D5B09F10B}" - ProjectSection(SolutionItems) = preProject - data\Dependent.json = data\Dependent.json - data\FilterList.json = data\FilterList.json - data\FilterListLanguage.json = data\FilterListLanguage.json - data\FilterListMaintainer.json = data\FilterListMaintainer.json - data\FilterListTag.json = data\FilterListTag.json - data\Fork.json = data\Fork.json - data\Language.json = data\Language.json - data\License.json = data\License.json - data\Maintainer.json = data\Maintainer.json - data\Merge.json = data\Merge.json - data\Software.json = data\Software.json - data\SoftwareSyntax.json = data\SoftwareSyntax.json - data\Syntax.json = data\Syntax.json - data\Tag.json = data\Tag.json - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{00CBD1AF-455E-4DF5-AB24-A5C2C18EEB6F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EA11453B-FB14-4F0E-A19B-B8089498F677}" @@ -39,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Data.Tests", "t EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Services.Tests", "tests\FilterLists.Services.Tests\FilterLists.Services.Tests.csproj", "{0F419F45-EC3F-409B-95A2-F6AEE21E4041}" EndProject -Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{B94A5BCD-3BE3-4FE4-AE48-ADCF904A22A4}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -75,10 +55,6 @@ Global {0F419F45-EC3F-409B-95A2-F6AEE21E4041}.Debug|Any CPU.Build.0 = Debug|Any CPU {0F419F45-EC3F-409B-95A2-F6AEE21E4041}.Release|Any CPU.ActiveCfg = Release|Any CPU {0F419F45-EC3F-409B-95A2-F6AEE21E4041}.Release|Any CPU.Build.0 = Release|Any CPU - {B94A5BCD-3BE3-4FE4-AE48-ADCF904A22A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B94A5BCD-3BE3-4FE4-AE48-ADCF904A22A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B94A5BCD-3BE3-4FE4-AE48-ADCF904A22A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B94A5BCD-3BE3-4FE4-AE48-ADCF904A22A4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FilterLists.sln.DotSettings b/server/FilterLists.sln.DotSettings similarity index 100% rename from FilterLists.sln.DotSettings rename to server/FilterLists.sln.DotSettings diff --git a/azure-pipelines.agent.yaml b/server/azure-pipelines.agent.yaml similarity index 90% rename from azure-pipelines.agent.yaml rename to server/azure-pipelines.agent.yaml index 667c7084a..14ffacd2c 100644 --- a/azure-pipelines.agent.yaml +++ b/server/azure-pipelines.agent.yaml @@ -5,10 +5,10 @@ trigger: paths: include: [ - "azure-pipelines.agent.yaml", - "src/FilterLists.Agent/*", - "tests/FilterLists.Agent.Tests/*", - ".dockerignore", + "server/azure-pipelines.agent.yaml", + "server/src/FilterLists.Agent/*", + "server/tests/FilterLists.Agent.Tests/*", + "server/.dockerignore", "docker-compose.yml", "docker-compose.prod.yml", "docker-compose.agent.tests.yml", @@ -21,10 +21,10 @@ pr: paths: include: [ - "azure-pipelines.agent.yaml", - "src/FilterLists.Agent/*", - "tests/FilterLists.Agent.Tests/*", - ".dockerignore", + "server/azure-pipelines.agent.yaml", + "server/src/FilterLists.Agent/*", + "server/tests/FilterLists.Agent.Tests/*", + "server/.dockerignore", "docker-compose.yml", "docker-compose.prod.yml", "docker-compose.agent.tests.yml", diff --git a/azure-pipelines.api.yaml b/server/azure-pipelines.api.yaml similarity index 87% rename from azure-pipelines.api.yaml rename to server/azure-pipelines.api.yaml index 92c23d32d..5c45b8cc6 100644 --- a/azure-pipelines.api.yaml +++ b/server/azure-pipelines.api.yaml @@ -5,13 +5,13 @@ trigger: paths: include: [ - "azure-pipelines.api.yaml", - "src/FilterLists.Api/*", - "src/FilterLists.Services/*", - "src/FilterLists.Data/*", - "tests/FilterLists.Services.Tests/*", - "tests/FilterLists.Data.Tests/*", - ".dockerignore", + "server/azure-pipelines.api.yaml", + "server/src/FilterLists.Api/*", + "server/src/FilterLists.Services/*", + "server/src/FilterLists.Data/*", + "server/tests/FilterLists.Services.Tests/*", + "server/tests/FilterLists.Data.Tests/*", + "server/.dockerignore", "docker-compose.yml", "docker-compose.prod.yml", "docker-compose.data.tests.yml", @@ -26,13 +26,13 @@ pr: paths: include: [ - "azure-pipelines.api.yaml", - "src/FilterLists.Api/*", - "src/FilterLists.Services/*", - "src/FilterLists.Data/*", - "tests/FilterLists.Services.Tests/*", - "tests/FilterLists.Data.Tests/*", - ".dockerignore", + "server/azure-pipelines.api.yaml", + "server/src/FilterLists.Api/*", + "server/src/FilterLists.Services/*", + "server/src/FilterLists.Data/*", + "server/tests/FilterLists.Services.Tests/*", + "server/tests/FilterLists.Data.Tests/*", + "server/.dockerignore", "docker-compose.yml", "docker-compose.prod.yml", "docker-compose.data.tests.yml", diff --git a/src/FilterLists.Agent/AppSettings/ApplicationInsightsSettings.cs b/server/src/FilterLists.Agent/AppSettings/ApplicationInsightsSettings.cs similarity index 100% rename from src/FilterLists.Agent/AppSettings/ApplicationInsightsSettings.cs rename to server/src/FilterLists.Agent/AppSettings/ApplicationInsightsSettings.cs diff --git a/src/FilterLists.Agent/AppSettings/ArchiveSettings.cs b/server/src/FilterLists.Agent/AppSettings/ArchiveSettings.cs similarity index 100% rename from src/FilterLists.Agent/AppSettings/ArchiveSettings.cs rename to server/src/FilterLists.Agent/AppSettings/ArchiveSettings.cs diff --git a/src/FilterLists.Agent/AppSettings/ConnectionStringSettings.cs b/server/src/FilterLists.Agent/AppSettings/ConnectionStringSettings.cs similarity index 100% rename from src/FilterLists.Agent/AppSettings/ConnectionStringSettings.cs rename to server/src/FilterLists.Agent/AppSettings/ConnectionStringSettings.cs diff --git a/src/FilterLists.Agent/AppSettings/FilterListsApiSettings.cs b/server/src/FilterLists.Agent/AppSettings/FilterListsApiSettings.cs similarity index 100% rename from src/FilterLists.Agent/AppSettings/FilterListsApiSettings.cs rename to server/src/FilterLists.Agent/AppSettings/FilterListsApiSettings.cs diff --git a/src/FilterLists.Agent/AppSettings/GitHubSettings.cs b/server/src/FilterLists.Agent/AppSettings/GitHubSettings.cs similarity index 100% rename from src/FilterLists.Agent/AppSettings/GitHubSettings.cs rename to server/src/FilterLists.Agent/AppSettings/GitHubSettings.cs diff --git a/src/FilterLists.Agent/CommandLineOptions.cs b/server/src/FilterLists.Agent/CommandLineOptions.cs similarity index 100% rename from src/FilterLists.Agent/CommandLineOptions.cs rename to server/src/FilterLists.Agent/CommandLineOptions.cs diff --git a/src/FilterLists.Agent/Core/GitHub/IIssuesRepository.cs b/server/src/FilterLists.Agent/Core/GitHub/IIssuesRepository.cs similarity index 100% rename from src/FilterLists.Agent/Core/GitHub/IIssuesRepository.cs rename to server/src/FilterLists.Agent/Core/GitHub/IIssuesRepository.cs diff --git a/src/FilterLists.Agent/Core/Lists/IListRepository.cs b/server/src/FilterLists.Agent/Core/Lists/IListRepository.cs similarity index 100% rename from src/FilterLists.Agent/Core/Lists/IListRepository.cs rename to server/src/FilterLists.Agent/Core/Lists/IListRepository.cs diff --git a/src/FilterLists.Agent/Core/Lists/IListViewUrlRepository.cs b/server/src/FilterLists.Agent/Core/Lists/IListViewUrlRepository.cs similarity index 100% rename from src/FilterLists.Agent/Core/Lists/IListViewUrlRepository.cs rename to server/src/FilterLists.Agent/Core/Lists/IListViewUrlRepository.cs diff --git a/src/FilterLists.Agent/Core/Lists/ListViewUrl.cs b/server/src/FilterLists.Agent/Core/Lists/ListViewUrl.cs similarity index 100% rename from src/FilterLists.Agent/Core/Lists/ListViewUrl.cs rename to server/src/FilterLists.Agent/Core/Lists/ListViewUrl.cs diff --git a/src/FilterLists.Agent/Core/Urls/Entity.cs b/server/src/FilterLists.Agent/Core/Urls/Entity.cs similarity index 100% rename from src/FilterLists.Agent/Core/Urls/Entity.cs rename to server/src/FilterLists.Agent/Core/Urls/Entity.cs diff --git a/src/FilterLists.Agent/Core/Urls/EntityUrl.cs b/server/src/FilterLists.Agent/Core/Urls/EntityUrl.cs similarity index 100% rename from src/FilterLists.Agent/Core/Urls/EntityUrl.cs rename to server/src/FilterLists.Agent/Core/Urls/EntityUrl.cs diff --git a/src/FilterLists.Agent/Core/Urls/IEntityUrlRepository.cs b/server/src/FilterLists.Agent/Core/Urls/IEntityUrlRepository.cs similarity index 100% rename from src/FilterLists.Agent/Core/Urls/IEntityUrlRepository.cs rename to server/src/FilterLists.Agent/Core/Urls/IEntityUrlRepository.cs diff --git a/src/FilterLists.Agent/Core/Urls/IEntityUrlValidator.cs b/server/src/FilterLists.Agent/Core/Urls/IEntityUrlValidator.cs similarity index 100% rename from src/FilterLists.Agent/Core/Urls/IEntityUrlValidator.cs rename to server/src/FilterLists.Agent/Core/Urls/IEntityUrlValidator.cs diff --git a/src/FilterLists.Agent/Dockerfile b/server/src/FilterLists.Agent/Dockerfile similarity index 72% rename from src/FilterLists.Agent/Dockerfile rename to server/src/FilterLists.Agent/Dockerfile index 7e6183ff0..6311f857b 100644 --- a/src/FilterLists.Agent/Dockerfile +++ b/server/src/FilterLists.Agent/Dockerfile @@ -1,5 +1,5 @@ # Context: . -# Command: docker build -f src/FilterLists.Agent/Dockerfile . +# Command: docker build -f server/src/FilterLists.Agent/Dockerfile . # init base FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.0-alpine as base @@ -11,11 +11,11 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.0-alpine AS build # restore WORKDIR /app/src/FilterLists.Agent -COPY src/FilterLists.Agent/FilterLists.Agent.csproj . +COPY server/src/FilterLists.Agent/FilterLists.Agent.csproj . RUN dotnet restore # build -COPY src/FilterLists.Agent/. . +COPY server/src/FilterLists.Agent/. . RUN dotnet build -c Release -r linux-musl-x64 --no-restore # init Agent.Tests @@ -24,11 +24,11 @@ ENTRYPOINT ["dotnet", "test", "--logger:trx"] # restore Agent.Tests WORKDIR /app/tests/FilterLists.Agent.Tests -COPY tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj . +COPY server/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj . RUN dotnet restore # build Agent.Tests -COPY tests/FilterLists.Agent.Tests/. . +COPY server/tests/FilterLists.Agent.Tests/. . RUN dotnet build -c Release --no-restore # publish diff --git a/src/FilterLists.Agent/Extensions/ConfigurationExtensions.cs b/server/src/FilterLists.Agent/Extensions/ConfigurationExtensions.cs similarity index 100% rename from src/FilterLists.Agent/Extensions/ConfigurationExtensions.cs rename to server/src/FilterLists.Agent/Extensions/ConfigurationExtensions.cs diff --git a/src/FilterLists.Agent/Extensions/UriExtensions.cs b/server/src/FilterLists.Agent/Extensions/UriExtensions.cs similarity index 100% rename from src/FilterLists.Agent/Extensions/UriExtensions.cs rename to server/src/FilterLists.Agent/Extensions/UriExtensions.cs diff --git a/src/FilterLists.Agent/Features/Lists/ArchiveLists.cs b/server/src/FilterLists.Agent/Features/Lists/ArchiveLists.cs similarity index 100% rename from src/FilterLists.Agent/Features/Lists/ArchiveLists.cs rename to server/src/FilterLists.Agent/Features/Lists/ArchiveLists.cs diff --git a/src/FilterLists.Agent/Features/Lists/CommitLists.cs b/server/src/FilterLists.Agent/Features/Lists/CommitLists.cs similarity index 100% rename from src/FilterLists.Agent/Features/Lists/CommitLists.cs rename to server/src/FilterLists.Agent/Features/Lists/CommitLists.cs diff --git a/src/FilterLists.Agent/Features/Lists/DownloadLists.cs b/server/src/FilterLists.Agent/Features/Lists/DownloadLists.cs similarity index 100% rename from src/FilterLists.Agent/Features/Lists/DownloadLists.cs rename to server/src/FilterLists.Agent/Features/Lists/DownloadLists.cs diff --git a/src/FilterLists.Agent/Features/Lists/DownloadRawText.cs b/server/src/FilterLists.Agent/Features/Lists/DownloadRawText.cs similarity index 100% rename from src/FilterLists.Agent/Features/Lists/DownloadRawText.cs rename to server/src/FilterLists.Agent/Features/Lists/DownloadRawText.cs diff --git a/src/FilterLists.Agent/Features/Lists/DownloadSevenZip.cs b/server/src/FilterLists.Agent/Features/Lists/DownloadSevenZip.cs similarity index 100% rename from src/FilterLists.Agent/Features/Lists/DownloadSevenZip.cs rename to server/src/FilterLists.Agent/Features/Lists/DownloadSevenZip.cs diff --git a/src/FilterLists.Agent/Features/Lists/DownloadZip.cs b/server/src/FilterLists.Agent/Features/Lists/DownloadZip.cs similarity index 100% rename from src/FilterLists.Agent/Features/Lists/DownloadZip.cs rename to server/src/FilterLists.Agent/Features/Lists/DownloadZip.cs diff --git a/src/FilterLists.Agent/Features/Urls/BuildGitHubIssueBody.cs b/server/src/FilterLists.Agent/Features/Urls/BuildGitHubIssueBody.cs similarity index 100% rename from src/FilterLists.Agent/Features/Urls/BuildGitHubIssueBody.cs rename to server/src/FilterLists.Agent/Features/Urls/BuildGitHubIssueBody.cs diff --git a/src/FilterLists.Agent/Features/Urls/CloseUrlValidationIssue.cs b/server/src/FilterLists.Agent/Features/Urls/CloseUrlValidationIssue.cs similarity index 100% rename from src/FilterLists.Agent/Features/Urls/CloseUrlValidationIssue.cs rename to server/src/FilterLists.Agent/Features/Urls/CloseUrlValidationIssue.cs diff --git a/src/FilterLists.Agent/Features/Urls/CreateOrUpdateUrlValidationIssue.cs b/server/src/FilterLists.Agent/Features/Urls/CreateOrUpdateUrlValidationIssue.cs similarity index 100% rename from src/FilterLists.Agent/Features/Urls/CreateOrUpdateUrlValidationIssue.cs rename to server/src/FilterLists.Agent/Features/Urls/CreateOrUpdateUrlValidationIssue.cs diff --git a/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs b/server/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs similarity index 100% rename from src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs rename to server/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs diff --git a/src/FilterLists.Agent/Features/Urls/ValidateUrls.cs b/server/src/FilterLists.Agent/Features/Urls/ValidateUrls.cs similarity index 100% rename from src/FilterLists.Agent/Features/Urls/ValidateUrls.cs rename to server/src/FilterLists.Agent/Features/Urls/ValidateUrls.cs diff --git a/src/FilterLists.Agent/FilterLists.Agent.csproj b/server/src/FilterLists.Agent/FilterLists.Agent.csproj similarity index 100% rename from src/FilterLists.Agent/FilterLists.Agent.csproj rename to server/src/FilterLists.Agent/FilterLists.Agent.csproj diff --git a/src/FilterLists.Agent/FilterLists.Agent.ruleset b/server/src/FilterLists.Agent/FilterLists.Agent.ruleset similarity index 100% rename from src/FilterLists.Agent/FilterLists.Agent.ruleset rename to server/src/FilterLists.Agent/FilterLists.Agent.ruleset diff --git a/src/FilterLists.Agent/Infrastructure/ApplicationInsights/AgentTelemetryClient.cs b/server/src/FilterLists.Agent/Infrastructure/ApplicationInsights/AgentTelemetryClient.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/ApplicationInsights/AgentTelemetryClient.cs rename to server/src/FilterLists.Agent/Infrastructure/ApplicationInsights/AgentTelemetryClient.cs diff --git a/src/FilterLists.Agent/Infrastructure/ApplicationInsights/QuickPulseTelemetryModuleBuilder.cs b/server/src/FilterLists.Agent/Infrastructure/ApplicationInsights/QuickPulseTelemetryModuleBuilder.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/ApplicationInsights/QuickPulseTelemetryModuleBuilder.cs rename to server/src/FilterLists.Agent/Infrastructure/ApplicationInsights/QuickPulseTelemetryModuleBuilder.cs diff --git a/src/FilterLists.Agent/Infrastructure/ApplicationInsights/ServiceCollectionExtensions.cs b/server/src/FilterLists.Agent/Infrastructure/ApplicationInsights/ServiceCollectionExtensions.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/ApplicationInsights/ServiceCollectionExtensions.cs rename to server/src/FilterLists.Agent/Infrastructure/ApplicationInsights/ServiceCollectionExtensions.cs diff --git a/src/FilterLists.Agent/Infrastructure/DependencyInjection/ServiceCollectionExtensions.cs b/server/src/FilterLists.Agent/Infrastructure/DependencyInjection/ServiceCollectionExtensions.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/DependencyInjection/ServiceCollectionExtensions.cs rename to server/src/FilterLists.Agent/Infrastructure/DependencyInjection/ServiceCollectionExtensions.cs diff --git a/src/FilterLists.Agent/Infrastructure/DependencyInjection/ServiceProviderBuilder.cs b/server/src/FilterLists.Agent/Infrastructure/DependencyInjection/ServiceProviderBuilder.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/DependencyInjection/ServiceProviderBuilder.cs rename to server/src/FilterLists.Agent/Infrastructure/DependencyInjection/ServiceProviderBuilder.cs diff --git a/src/FilterLists.Agent/Infrastructure/Disk/ServiceCollectionExtensions.cs b/server/src/FilterLists.Agent/Infrastructure/Disk/ServiceCollectionExtensions.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/Disk/ServiceCollectionExtensions.cs rename to server/src/FilterLists.Agent/Infrastructure/Disk/ServiceCollectionExtensions.cs diff --git a/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrlRepository.cs b/server/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrlRepository.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrlRepository.cs rename to server/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrlRepository.cs diff --git a/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/LicenseUrls.cs b/server/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/LicenseUrls.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/LicenseUrls.cs rename to server/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/LicenseUrls.cs diff --git a/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/ListUrls.cs b/server/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/ListUrls.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/ListUrls.cs rename to server/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/ListUrls.cs diff --git a/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/MaintainerUrls.cs b/server/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/MaintainerUrls.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/MaintainerUrls.cs rename to server/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/MaintainerUrls.cs diff --git a/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/SoftwareUrls.cs b/server/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/SoftwareUrls.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/SoftwareUrls.cs rename to server/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/SoftwareUrls.cs diff --git a/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/SyntaxUrls.cs b/server/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/SyntaxUrls.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/SyntaxUrls.cs rename to server/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrls/SyntaxUrls.cs diff --git a/src/FilterLists.Agent/Infrastructure/FilterListsApi/FilterListsApiClient.cs b/server/src/FilterLists.Agent/Infrastructure/FilterListsApi/FilterListsApiClient.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/FilterListsApi/FilterListsApiClient.cs rename to server/src/FilterLists.Agent/Infrastructure/FilterListsApi/FilterListsApiClient.cs diff --git a/src/FilterLists.Agent/Infrastructure/FilterListsApi/ListViewUrlRepository.cs b/server/src/FilterLists.Agent/Infrastructure/FilterListsApi/ListViewUrlRepository.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/FilterListsApi/ListViewUrlRepository.cs rename to server/src/FilterLists.Agent/Infrastructure/FilterListsApi/ListViewUrlRepository.cs diff --git a/src/FilterLists.Agent/Infrastructure/FilterListsApi/ServiceCollectionExtensions.cs b/server/src/FilterLists.Agent/Infrastructure/FilterListsApi/ServiceCollectionExtensions.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/FilterListsApi/ServiceCollectionExtensions.cs rename to server/src/FilterLists.Agent/Infrastructure/FilterListsApi/ServiceCollectionExtensions.cs diff --git a/src/FilterLists.Agent/Infrastructure/GitHub/IssuesRepository.cs b/server/src/FilterLists.Agent/Infrastructure/GitHub/IssuesRepository.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/GitHub/IssuesRepository.cs rename to server/src/FilterLists.Agent/Infrastructure/GitHub/IssuesRepository.cs diff --git a/src/FilterLists.Agent/Infrastructure/GitHub/ServiceCollectionExtensions.cs b/server/src/FilterLists.Agent/Infrastructure/GitHub/ServiceCollectionExtensions.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/GitHub/ServiceCollectionExtensions.cs rename to server/src/FilterLists.Agent/Infrastructure/GitHub/ServiceCollectionExtensions.cs diff --git a/src/FilterLists.Agent/Infrastructure/Polly/ServiceCollectionExtensions.cs b/server/src/FilterLists.Agent/Infrastructure/Polly/ServiceCollectionExtensions.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/Polly/ServiceCollectionExtensions.cs rename to server/src/FilterLists.Agent/Infrastructure/Polly/ServiceCollectionExtensions.cs diff --git a/src/FilterLists.Agent/Infrastructure/Web/EntityUrlValidator.cs b/server/src/FilterLists.Agent/Infrastructure/Web/EntityUrlValidator.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/Web/EntityUrlValidator.cs rename to server/src/FilterLists.Agent/Infrastructure/Web/EntityUrlValidator.cs diff --git a/src/FilterLists.Agent/Infrastructure/Web/ListRepository.cs b/server/src/FilterLists.Agent/Infrastructure/Web/ListRepository.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/Web/ListRepository.cs rename to server/src/FilterLists.Agent/Infrastructure/Web/ListRepository.cs diff --git a/src/FilterLists.Agent/Infrastructure/Web/ServiceCollectionExtensions.cs b/server/src/FilterLists.Agent/Infrastructure/Web/ServiceCollectionExtensions.cs similarity index 100% rename from src/FilterLists.Agent/Infrastructure/Web/ServiceCollectionExtensions.cs rename to server/src/FilterLists.Agent/Infrastructure/Web/ServiceCollectionExtensions.cs diff --git a/src/FilterLists.Agent/Program.cs b/server/src/FilterLists.Agent/Program.cs similarity index 100% rename from src/FilterLists.Agent/Program.cs rename to server/src/FilterLists.Agent/Program.cs diff --git a/src/FilterLists.Agent/Properties/launchSettings.json b/server/src/FilterLists.Agent/Properties/launchSettings.json similarity index 100% rename from src/FilterLists.Agent/Properties/launchSettings.json rename to server/src/FilterLists.Agent/Properties/launchSettings.json diff --git a/src/FilterLists.Agent/appsettings.json b/server/src/FilterLists.Agent/appsettings.json similarity index 100% rename from src/FilterLists.Agent/appsettings.json rename to server/src/FilterLists.Agent/appsettings.json diff --git a/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/server/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs similarity index 100% rename from src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs rename to server/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs diff --git a/src/FilterLists.Api/DependencyInjection/Extensions/IWebHostExtensions.cs b/server/src/FilterLists.Api/DependencyInjection/Extensions/IWebHostExtensions.cs similarity index 100% rename from src/FilterLists.Api/DependencyInjection/Extensions/IWebHostExtensions.cs rename to server/src/FilterLists.Api/DependencyInjection/Extensions/IWebHostExtensions.cs diff --git a/src/FilterLists.Api/Dockerfile b/server/src/FilterLists.Api/Dockerfile similarity index 62% rename from src/FilterLists.Api/Dockerfile rename to server/src/FilterLists.Api/Dockerfile index e11ce8ea1..a4c3cf4e7 100644 --- a/src/FilterLists.Api/Dockerfile +++ b/server/src/FilterLists.Api/Dockerfile @@ -1,5 +1,5 @@ # Context: . -# Command: docker build -f src/FilterLists.Api/Dockerfile . +# Command: docker build -f server/src/FilterLists.Api/Dockerfile . # init base FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.0-alpine as base @@ -13,18 +13,18 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.0-alpine AS build # restore WORKDIR /app/src -COPY src/FilterLists.Data/FilterLists.Data.csproj FilterLists.Data/ -COPY src/FilterLists.Services/FilterLists.Services.csproj FilterLists.Services/ +COPY server/src/FilterLists.Data/FilterLists.Data.csproj FilterLists.Data/ +COPY server/src/FilterLists.Services/FilterLists.Services.csproj FilterLists.Services/ WORKDIR /app/src/FilterLists.Api -COPY src/FilterLists.Api/FilterLists.Api.csproj . +COPY server/src/FilterLists.Api/FilterLists.Api.csproj . RUN dotnet restore # build WORKDIR /app/src -COPY src/FilterLists.Data/. FilterLists.Data/ -COPY src/FilterLists.Services/. FilterLists.Services/ +COPY server/src/FilterLists.Data/. FilterLists.Data/ +COPY server/src/FilterLists.Services/. FilterLists.Services/ WORKDIR /app/src/FilterLists.Api -COPY src/FilterLists.Api/. . +COPY server/src/FilterLists.Api/. . RUN dotnet build -c Release -r linux-musl-x64 --no-restore # init Data.Tests @@ -33,11 +33,11 @@ ENTRYPOINT ["dotnet", "test", "--logger:trx"] # restore Data.Tests WORKDIR /app/tests/FilterLists.Data.Tests -COPY tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj . +COPY server/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj . RUN dotnet restore # build Data.Tests -COPY tests/FilterLists.Data.Tests/. . +COPY server/tests/FilterLists.Data.Tests/. . RUN dotnet build -c Release --no-restore COPY data/. data/ @@ -47,11 +47,11 @@ ENTRYPOINT ["dotnet", "test", "--logger:trx"] # restore Services.Tests WORKDIR /app/tests/FilterLists.Services.Tests -COPY tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj . +COPY server/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj . RUN dotnet restore # build Services.Tests -COPY tests/FilterLists.Services.Tests/. . +COPY server/tests/FilterLists.Services.Tests/. . RUN dotnet build -c Release --no-restore # publish diff --git a/src/FilterLists.Api/FilterLists.Api.csproj b/server/src/FilterLists.Api/FilterLists.Api.csproj similarity index 100% rename from src/FilterLists.Api/FilterLists.Api.csproj rename to server/src/FilterLists.Api/FilterLists.Api.csproj diff --git a/src/FilterLists.Api/FilterLists.Api.ruleset b/server/src/FilterLists.Api/FilterLists.Api.ruleset similarity index 100% rename from src/FilterLists.Api/FilterLists.Api.ruleset rename to server/src/FilterLists.Api/FilterLists.Api.ruleset diff --git a/src/FilterLists.Api/Migrations/20180210130730_InitialCreate.Designer.cs b/server/src/FilterLists.Api/Migrations/20180210130730_InitialCreate.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180210130730_InitialCreate.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180210130730_InitialCreate.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180210130730_InitialCreate.cs b/server/src/FilterLists.Api/Migrations/20180210130730_InitialCreate.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180210130730_InitialCreate.cs rename to server/src/FilterLists.Api/Migrations/20180210130730_InitialCreate.cs diff --git a/src/FilterLists.Api/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.Designer.cs b/server/src/FilterLists.Api/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.cs b/server/src/FilterLists.Api/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.cs rename to server/src/FilterLists.Api/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.cs diff --git a/src/FilterLists.Api/Migrations/20180210234702_AddSnapshotModifiedDateUtc.Designer.cs b/server/src/FilterLists.Api/Migrations/20180210234702_AddSnapshotModifiedDateUtc.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180210234702_AddSnapshotModifiedDateUtc.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180210234702_AddSnapshotModifiedDateUtc.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180210234702_AddSnapshotModifiedDateUtc.cs b/server/src/FilterLists.Api/Migrations/20180210234702_AddSnapshotModifiedDateUtc.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180210234702_AddSnapshotModifiedDateUtc.cs rename to server/src/FilterLists.Api/Migrations/20180210234702_AddSnapshotModifiedDateUtc.cs diff --git a/src/FilterLists.Api/Migrations/20180213171240_AddDefaultLicenseId.Designer.cs b/server/src/FilterLists.Api/Migrations/20180213171240_AddDefaultLicenseId.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180213171240_AddDefaultLicenseId.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180213171240_AddDefaultLicenseId.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180213171240_AddDefaultLicenseId.cs b/server/src/FilterLists.Api/Migrations/20180213171240_AddDefaultLicenseId.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180213171240_AddDefaultLicenseId.cs rename to server/src/FilterLists.Api/Migrations/20180213171240_AddDefaultLicenseId.cs diff --git a/src/FilterLists.Api/Migrations/20180214152734_AddPublishedDate.Designer.cs b/server/src/FilterLists.Api/Migrations/20180214152734_AddPublishedDate.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180214152734_AddPublishedDate.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180214152734_AddPublishedDate.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180214152734_AddPublishedDate.cs b/server/src/FilterLists.Api/Migrations/20180214152734_AddPublishedDate.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180214152734_AddPublishedDate.cs rename to server/src/FilterLists.Api/Migrations/20180214152734_AddPublishedDate.cs diff --git a/src/FilterLists.Api/Migrations/20180214153140_DefaultOptionalDatesToNull.Designer.cs b/server/src/FilterLists.Api/Migrations/20180214153140_DefaultOptionalDatesToNull.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180214153140_DefaultOptionalDatesToNull.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180214153140_DefaultOptionalDatesToNull.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180214153140_DefaultOptionalDatesToNull.cs b/server/src/FilterLists.Api/Migrations/20180214153140_DefaultOptionalDatesToNull.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180214153140_DefaultOptionalDatesToNull.cs rename to server/src/FilterLists.Api/Migrations/20180214153140_DefaultOptionalDatesToNull.cs diff --git a/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.Designer.cs b/server/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180324001253_addChatUrl.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.cs b/server/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180324001253_addChatUrl.cs rename to server/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.cs diff --git a/src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.Designer.cs b/server/src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.cs b/server/src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.cs rename to server/src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.cs diff --git a/src/FilterLists.Api/Migrations/20180815233049_AddCantSnapshot.Designer.cs b/server/src/FilterLists.Api/Migrations/20180815233049_AddCantSnapshot.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180815233049_AddCantSnapshot.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180815233049_AddCantSnapshot.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180815233049_AddCantSnapshot.cs b/server/src/FilterLists.Api/Migrations/20180815233049_AddCantSnapshot.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180815233049_AddCantSnapshot.cs rename to server/src/FilterLists.Api/Migrations/20180815233049_AddCantSnapshot.cs diff --git a/src/FilterLists.Api/Migrations/20180818204956_AddRuleRawUniqueIndex.Designer.cs b/server/src/FilterLists.Api/Migrations/20180818204956_AddRuleRawUniqueIndex.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180818204956_AddRuleRawUniqueIndex.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180818204956_AddRuleRawUniqueIndex.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180818204956_AddRuleRawUniqueIndex.cs b/server/src/FilterLists.Api/Migrations/20180818204956_AddRuleRawUniqueIndex.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180818204956_AddRuleRawUniqueIndex.cs rename to server/src/FilterLists.Api/Migrations/20180818204956_AddRuleRawUniqueIndex.cs diff --git a/src/FilterLists.Api/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.Designer.cs b/server/src/FilterLists.Api/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.cs b/server/src/FilterLists.Api/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.cs rename to server/src/FilterLists.Api/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.cs diff --git a/src/FilterLists.Api/Migrations/20180821200425_AddTag.Designer.cs b/server/src/FilterLists.Api/Migrations/20180821200425_AddTag.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180821200425_AddTag.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180821200425_AddTag.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180821200425_AddTag.cs b/server/src/FilterLists.Api/Migrations/20180821200425_AddTag.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180821200425_AddTag.cs rename to server/src/FilterLists.Api/Migrations/20180821200425_AddTag.cs diff --git a/src/FilterLists.Api/Migrations/20180822231632_LengthenRuleRaw.Designer.cs b/server/src/FilterLists.Api/Migrations/20180822231632_LengthenRuleRaw.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180822231632_LengthenRuleRaw.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180822231632_LengthenRuleRaw.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180822231632_LengthenRuleRaw.cs b/server/src/FilterLists.Api/Migrations/20180822231632_LengthenRuleRaw.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180822231632_LengthenRuleRaw.cs rename to server/src/FilterLists.Api/Migrations/20180822231632_LengthenRuleRaw.cs diff --git a/src/FilterLists.Api/Migrations/20180823174733_SimplifySnapshotRuleModel.Designer.cs b/server/src/FilterLists.Api/Migrations/20180823174733_SimplifySnapshotRuleModel.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180823174733_SimplifySnapshotRuleModel.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180823174733_SimplifySnapshotRuleModel.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180823174733_SimplifySnapshotRuleModel.cs b/server/src/FilterLists.Api/Migrations/20180823174733_SimplifySnapshotRuleModel.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180823174733_SimplifySnapshotRuleModel.cs rename to server/src/FilterLists.Api/Migrations/20180823174733_SimplifySnapshotRuleModel.cs diff --git a/src/FilterLists.Api/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.Designer.cs b/server/src/FilterLists.Api/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.cs b/server/src/FilterLists.Api/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.cs rename to server/src/FilterLists.Api/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.cs diff --git a/src/FilterLists.Api/Migrations/20180824155224_AddWaybackTimestamp.Designer.cs b/server/src/FilterLists.Api/Migrations/20180824155224_AddWaybackTimestamp.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180824155224_AddWaybackTimestamp.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180824155224_AddWaybackTimestamp.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180824155224_AddWaybackTimestamp.cs b/server/src/FilterLists.Api/Migrations/20180824155224_AddWaybackTimestamp.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180824155224_AddWaybackTimestamp.cs rename to server/src/FilterLists.Api/Migrations/20180824155224_AddWaybackTimestamp.cs diff --git a/src/FilterLists.Api/Migrations/20180824223021_AddBatchSize.Designer.cs b/server/src/FilterLists.Api/Migrations/20180824223021_AddBatchSize.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180824223021_AddBatchSize.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180824223021_AddBatchSize.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180824223021_AddBatchSize.cs b/server/src/FilterLists.Api/Migrations/20180824223021_AddBatchSize.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180824223021_AddBatchSize.cs rename to server/src/FilterLists.Api/Migrations/20180824223021_AddBatchSize.cs diff --git a/src/FilterLists.Api/Migrations/20180825130502_ExpandBatchSize.Designer.cs b/server/src/FilterLists.Api/Migrations/20180825130502_ExpandBatchSize.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180825130502_ExpandBatchSize.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180825130502_ExpandBatchSize.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180825130502_ExpandBatchSize.cs b/server/src/FilterLists.Api/Migrations/20180825130502_ExpandBatchSize.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180825130502_ExpandBatchSize.cs rename to server/src/FilterLists.Api/Migrations/20180825130502_ExpandBatchSize.cs diff --git a/src/FilterLists.Api/Migrations/20180827001701_DropBatchSize.Designer.cs b/server/src/FilterLists.Api/Migrations/20180827001701_DropBatchSize.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180827001701_DropBatchSize.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180827001701_DropBatchSize.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180827001701_DropBatchSize.cs b/server/src/FilterLists.Api/Migrations/20180827001701_DropBatchSize.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180827001701_DropBatchSize.cs rename to server/src/FilterLists.Api/Migrations/20180827001701_DropBatchSize.cs diff --git a/src/FilterLists.Api/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.Designer.cs b/server/src/FilterLists.Api/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.cs b/server/src/FilterLists.Api/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.cs rename to server/src/FilterLists.Api/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.cs diff --git a/src/FilterLists.Api/Migrations/20180828124832_AddWaybackUrl.Designer.cs b/server/src/FilterLists.Api/Migrations/20180828124832_AddWaybackUrl.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180828124832_AddWaybackUrl.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180828124832_AddWaybackUrl.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180828124832_AddWaybackUrl.cs b/server/src/FilterLists.Api/Migrations/20180828124832_AddWaybackUrl.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180828124832_AddWaybackUrl.cs rename to server/src/FilterLists.Api/Migrations/20180828124832_AddWaybackUrl.cs diff --git a/src/FilterLists.Api/Migrations/20180829152737_DropCantSnapshot.Designer.cs b/server/src/FilterLists.Api/Migrations/20180829152737_DropCantSnapshot.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180829152737_DropCantSnapshot.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180829152737_DropCantSnapshot.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180829152737_DropCantSnapshot.cs b/server/src/FilterLists.Api/Migrations/20180829152737_DropCantSnapshot.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180829152737_DropCantSnapshot.cs rename to server/src/FilterLists.Api/Migrations/20180829152737_DropCantSnapshot.cs diff --git a/src/FilterLists.Api/Migrations/20180830220606_AddMd5Checksum.Designer.cs b/server/src/FilterLists.Api/Migrations/20180830220606_AddMd5Checksum.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180830220606_AddMd5Checksum.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180830220606_AddMd5Checksum.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180830220606_AddMd5Checksum.cs b/server/src/FilterLists.Api/Migrations/20180830220606_AddMd5Checksum.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180830220606_AddMd5Checksum.cs rename to server/src/FilterLists.Api/Migrations/20180830220606_AddMd5Checksum.cs diff --git a/src/FilterLists.Api/Migrations/20180901010618_AddWasUpdated.Designer.cs b/server/src/FilterLists.Api/Migrations/20180901010618_AddWasUpdated.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180901010618_AddWasUpdated.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180901010618_AddWasUpdated.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180901010618_AddWasUpdated.cs b/server/src/FilterLists.Api/Migrations/20180901010618_AddWasUpdated.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180901010618_AddWasUpdated.cs rename to server/src/FilterLists.Api/Migrations/20180901010618_AddWasUpdated.cs diff --git a/src/FilterLists.Api/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.Designer.cs b/server/src/FilterLists.Api/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.cs b/server/src/FilterLists.Api/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.cs rename to server/src/FilterLists.Api/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.cs diff --git a/src/FilterLists.Api/Migrations/20180909161810_AddDependent.Designer.cs b/server/src/FilterLists.Api/Migrations/20180909161810_AddDependent.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180909161810_AddDependent.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180909161810_AddDependent.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180909161810_AddDependent.cs b/server/src/FilterLists.Api/Migrations/20180909161810_AddDependent.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180909161810_AddDependent.cs rename to server/src/FilterLists.Api/Migrations/20180909161810_AddDependent.cs diff --git a/src/FilterLists.Api/Migrations/20180909190202_AddViewUrlMirrors.Designer.cs b/server/src/FilterLists.Api/Migrations/20180909190202_AddViewUrlMirrors.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180909190202_AddViewUrlMirrors.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180909190202_AddViewUrlMirrors.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180909190202_AddViewUrlMirrors.cs b/server/src/FilterLists.Api/Migrations/20180909190202_AddViewUrlMirrors.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180909190202_AddViewUrlMirrors.cs rename to server/src/FilterLists.Api/Migrations/20180909190202_AddViewUrlMirrors.cs diff --git a/src/FilterLists.Api/Migrations/20180916131916_AddIsAbpSubscribable.Designer.cs b/server/src/FilterLists.Api/Migrations/20180916131916_AddIsAbpSubscribable.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180916131916_AddIsAbpSubscribable.Designer.cs rename to server/src/FilterLists.Api/Migrations/20180916131916_AddIsAbpSubscribable.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20180916131916_AddIsAbpSubscribable.cs b/server/src/FilterLists.Api/Migrations/20180916131916_AddIsAbpSubscribable.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20180916131916_AddIsAbpSubscribable.cs rename to server/src/FilterLists.Api/Migrations/20180916131916_AddIsAbpSubscribable.cs diff --git a/src/FilterLists.Api/Migrations/20181005170600_RenameDiscontinuedToUpdated.Designer.cs b/server/src/FilterLists.Api/Migrations/20181005170600_RenameDiscontinuedToUpdated.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20181005170600_RenameDiscontinuedToUpdated.Designer.cs rename to server/src/FilterLists.Api/Migrations/20181005170600_RenameDiscontinuedToUpdated.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20181005170600_RenameDiscontinuedToUpdated.cs b/server/src/FilterLists.Api/Migrations/20181005170600_RenameDiscontinuedToUpdated.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20181005170600_RenameDiscontinuedToUpdated.cs rename to server/src/FilterLists.Api/Migrations/20181005170600_RenameDiscontinuedToUpdated.cs diff --git a/src/FilterLists.Api/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.Designer.cs b/server/src/FilterLists.Api/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.Designer.cs rename to server/src/FilterLists.Api/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.cs b/server/src/FilterLists.Api/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.cs rename to server/src/FilterLists.Api/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.cs diff --git a/src/FilterLists.Api/Migrations/20181018170013_UseSignedPrimaryKeys.Designer.cs b/server/src/FilterLists.Api/Migrations/20181018170013_UseSignedPrimaryKeys.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20181018170013_UseSignedPrimaryKeys.Designer.cs rename to server/src/FilterLists.Api/Migrations/20181018170013_UseSignedPrimaryKeys.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20181018170013_UseSignedPrimaryKeys.cs b/server/src/FilterLists.Api/Migrations/20181018170013_UseSignedPrimaryKeys.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20181018170013_UseSignedPrimaryKeys.cs rename to server/src/FilterLists.Api/Migrations/20181018170013_UseSignedPrimaryKeys.cs diff --git a/src/FilterLists.Api/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.Designer.cs b/server/src/FilterLists.Api/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.Designer.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.Designer.cs rename to server/src/FilterLists.Api/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.Designer.cs diff --git a/src/FilterLists.Api/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.cs b/server/src/FilterLists.Api/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.cs similarity index 100% rename from src/FilterLists.Api/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.cs rename to server/src/FilterLists.Api/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.cs diff --git a/src/FilterLists.Api/Migrations/Extensions/MigrationBuilderExtensions.cs b/server/src/FilterLists.Api/Migrations/Extensions/MigrationBuilderExtensions.cs similarity index 100% rename from src/FilterLists.Api/Migrations/Extensions/MigrationBuilderExtensions.cs rename to server/src/FilterLists.Api/Migrations/Extensions/MigrationBuilderExtensions.cs diff --git a/src/FilterLists.Api/Migrations/FilterListsDbContextModelSnapshot.cs b/server/src/FilterLists.Api/Migrations/FilterListsDbContextModelSnapshot.cs similarity index 100% rename from src/FilterLists.Api/Migrations/FilterListsDbContextModelSnapshot.cs rename to server/src/FilterLists.Api/Migrations/FilterListsDbContextModelSnapshot.cs diff --git a/src/FilterLists.Api/Program.cs b/server/src/FilterLists.Api/Program.cs similarity index 100% rename from src/FilterLists.Api/Program.cs rename to server/src/FilterLists.Api/Program.cs diff --git a/src/FilterLists.Api/Properties/launchSettings.json b/server/src/FilterLists.Api/Properties/launchSettings.json similarity index 100% rename from src/FilterLists.Api/Properties/launchSettings.json rename to server/src/FilterLists.Api/Properties/launchSettings.json diff --git a/src/FilterLists.Api/SkipEmptyContractResolver.cs b/server/src/FilterLists.Api/SkipEmptyContractResolver.cs similarity index 100% rename from src/FilterLists.Api/SkipEmptyContractResolver.cs rename to server/src/FilterLists.Api/SkipEmptyContractResolver.cs diff --git a/src/FilterLists.Api/Startup.cs b/server/src/FilterLists.Api/Startup.cs similarity index 100% rename from src/FilterLists.Api/Startup.cs rename to server/src/FilterLists.Api/Startup.cs diff --git a/src/FilterLists.Api/V1/Controllers/BaseController.cs b/server/src/FilterLists.Api/V1/Controllers/BaseController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/BaseController.cs rename to server/src/FilterLists.Api/V1/Controllers/BaseController.cs diff --git a/src/FilterLists.Api/V1/Controllers/DependentsController.cs b/server/src/FilterLists.Api/V1/Controllers/DependentsController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/DependentsController.cs rename to server/src/FilterLists.Api/V1/Controllers/DependentsController.cs diff --git a/src/FilterLists.Api/V1/Controllers/ForksController.cs b/server/src/FilterLists.Api/V1/Controllers/ForksController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/ForksController.cs rename to server/src/FilterLists.Api/V1/Controllers/ForksController.cs diff --git a/src/FilterLists.Api/V1/Controllers/LanguagesController.cs b/server/src/FilterLists.Api/V1/Controllers/LanguagesController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/LanguagesController.cs rename to server/src/FilterLists.Api/V1/Controllers/LanguagesController.cs diff --git a/src/FilterLists.Api/V1/Controllers/LicensesController.cs b/server/src/FilterLists.Api/V1/Controllers/LicensesController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/LicensesController.cs rename to server/src/FilterLists.Api/V1/Controllers/LicensesController.cs diff --git a/src/FilterLists.Api/V1/Controllers/ListsController.cs b/server/src/FilterLists.Api/V1/Controllers/ListsController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/ListsController.cs rename to server/src/FilterLists.Api/V1/Controllers/ListsController.cs diff --git a/src/FilterLists.Api/V1/Controllers/ListsLanguagesController.cs b/server/src/FilterLists.Api/V1/Controllers/ListsLanguagesController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/ListsLanguagesController.cs rename to server/src/FilterLists.Api/V1/Controllers/ListsLanguagesController.cs diff --git a/src/FilterLists.Api/V1/Controllers/ListsMaintainersController.cs b/server/src/FilterLists.Api/V1/Controllers/ListsMaintainersController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/ListsMaintainersController.cs rename to server/src/FilterLists.Api/V1/Controllers/ListsMaintainersController.cs diff --git a/src/FilterLists.Api/V1/Controllers/ListsTagsController.cs b/server/src/FilterLists.Api/V1/Controllers/ListsTagsController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/ListsTagsController.cs rename to server/src/FilterLists.Api/V1/Controllers/ListsTagsController.cs diff --git a/src/FilterLists.Api/V1/Controllers/MaintainersController.cs b/server/src/FilterLists.Api/V1/Controllers/MaintainersController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/MaintainersController.cs rename to server/src/FilterLists.Api/V1/Controllers/MaintainersController.cs diff --git a/src/FilterLists.Api/V1/Controllers/MergesController.cs b/server/src/FilterLists.Api/V1/Controllers/MergesController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/MergesController.cs rename to server/src/FilterLists.Api/V1/Controllers/MergesController.cs diff --git a/src/FilterLists.Api/V1/Controllers/RulesController.cs b/server/src/FilterLists.Api/V1/Controllers/RulesController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/RulesController.cs rename to server/src/FilterLists.Api/V1/Controllers/RulesController.cs diff --git a/src/FilterLists.Api/V1/Controllers/SoftwareController.cs b/server/src/FilterLists.Api/V1/Controllers/SoftwareController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/SoftwareController.cs rename to server/src/FilterLists.Api/V1/Controllers/SoftwareController.cs diff --git a/src/FilterLists.Api/V1/Controllers/SoftwareSyntaxesController.cs b/server/src/FilterLists.Api/V1/Controllers/SoftwareSyntaxesController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/SoftwareSyntaxesController.cs rename to server/src/FilterLists.Api/V1/Controllers/SoftwareSyntaxesController.cs diff --git a/src/FilterLists.Api/V1/Controllers/SyntaxesController.cs b/server/src/FilterLists.Api/V1/Controllers/SyntaxesController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/SyntaxesController.cs rename to server/src/FilterLists.Api/V1/Controllers/SyntaxesController.cs diff --git a/src/FilterLists.Api/V1/Controllers/TagsController.cs b/server/src/FilterLists.Api/V1/Controllers/TagsController.cs similarity index 100% rename from src/FilterLists.Api/V1/Controllers/TagsController.cs rename to server/src/FilterLists.Api/V1/Controllers/TagsController.cs diff --git a/src/FilterLists.Api/V1/Interfaces/IGet.cs b/server/src/FilterLists.Api/V1/Interfaces/IGet.cs similarity index 100% rename from src/FilterLists.Api/V1/Interfaces/IGet.cs rename to server/src/FilterLists.Api/V1/Interfaces/IGet.cs diff --git a/src/FilterLists.Api/V1/Interfaces/ISeed.cs b/server/src/FilterLists.Api/V1/Interfaces/ISeed.cs similarity index 100% rename from src/FilterLists.Api/V1/Interfaces/ISeed.cs rename to server/src/FilterLists.Api/V1/Interfaces/ISeed.cs diff --git a/src/FilterLists.Data/Entities/BaseEntity.cs b/server/src/FilterLists.Data/Entities/BaseEntity.cs similarity index 100% rename from src/FilterLists.Data/Entities/BaseEntity.cs rename to server/src/FilterLists.Data/Entities/BaseEntity.cs diff --git a/src/FilterLists.Data/Entities/FilterList.cs b/server/src/FilterLists.Data/Entities/FilterList.cs similarity index 100% rename from src/FilterLists.Data/Entities/FilterList.cs rename to server/src/FilterLists.Data/Entities/FilterList.cs diff --git a/src/FilterLists.Data/Entities/IBaseEntity.cs b/server/src/FilterLists.Data/Entities/IBaseEntity.cs similarity index 100% rename from src/FilterLists.Data/Entities/IBaseEntity.cs rename to server/src/FilterLists.Data/Entities/IBaseEntity.cs diff --git a/src/FilterLists.Data/Entities/Junctions/BaseJunctionEntity.cs b/server/src/FilterLists.Data/Entities/Junctions/BaseJunctionEntity.cs similarity index 100% rename from src/FilterLists.Data/Entities/Junctions/BaseJunctionEntity.cs rename to server/src/FilterLists.Data/Entities/Junctions/BaseJunctionEntity.cs diff --git a/src/FilterLists.Data/Entities/Junctions/Dependent.cs b/server/src/FilterLists.Data/Entities/Junctions/Dependent.cs similarity index 100% rename from src/FilterLists.Data/Entities/Junctions/Dependent.cs rename to server/src/FilterLists.Data/Entities/Junctions/Dependent.cs diff --git a/src/FilterLists.Data/Entities/Junctions/FilterListLanguage.cs b/server/src/FilterLists.Data/Entities/Junctions/FilterListLanguage.cs similarity index 100% rename from src/FilterLists.Data/Entities/Junctions/FilterListLanguage.cs rename to server/src/FilterLists.Data/Entities/Junctions/FilterListLanguage.cs diff --git a/src/FilterLists.Data/Entities/Junctions/FilterListMaintainer.cs b/server/src/FilterLists.Data/Entities/Junctions/FilterListMaintainer.cs similarity index 100% rename from src/FilterLists.Data/Entities/Junctions/FilterListMaintainer.cs rename to server/src/FilterLists.Data/Entities/Junctions/FilterListMaintainer.cs diff --git a/src/FilterLists.Data/Entities/Junctions/FilterListTag.cs b/server/src/FilterLists.Data/Entities/Junctions/FilterListTag.cs similarity index 100% rename from src/FilterLists.Data/Entities/Junctions/FilterListTag.cs rename to server/src/FilterLists.Data/Entities/Junctions/FilterListTag.cs diff --git a/src/FilterLists.Data/Entities/Junctions/Fork.cs b/server/src/FilterLists.Data/Entities/Junctions/Fork.cs similarity index 100% rename from src/FilterLists.Data/Entities/Junctions/Fork.cs rename to server/src/FilterLists.Data/Entities/Junctions/Fork.cs diff --git a/src/FilterLists.Data/Entities/Junctions/Merge.cs b/server/src/FilterLists.Data/Entities/Junctions/Merge.cs similarity index 100% rename from src/FilterLists.Data/Entities/Junctions/Merge.cs rename to server/src/FilterLists.Data/Entities/Junctions/Merge.cs diff --git a/src/FilterLists.Data/Entities/Junctions/SnapshotRule.cs b/server/src/FilterLists.Data/Entities/Junctions/SnapshotRule.cs similarity index 100% rename from src/FilterLists.Data/Entities/Junctions/SnapshotRule.cs rename to server/src/FilterLists.Data/Entities/Junctions/SnapshotRule.cs diff --git a/src/FilterLists.Data/Entities/Junctions/SoftwareSyntax.cs b/server/src/FilterLists.Data/Entities/Junctions/SoftwareSyntax.cs similarity index 100% rename from src/FilterLists.Data/Entities/Junctions/SoftwareSyntax.cs rename to server/src/FilterLists.Data/Entities/Junctions/SoftwareSyntax.cs diff --git a/src/FilterLists.Data/Entities/Language.cs b/server/src/FilterLists.Data/Entities/Language.cs similarity index 100% rename from src/FilterLists.Data/Entities/Language.cs rename to server/src/FilterLists.Data/Entities/Language.cs diff --git a/src/FilterLists.Data/Entities/License.cs b/server/src/FilterLists.Data/Entities/License.cs similarity index 100% rename from src/FilterLists.Data/Entities/License.cs rename to server/src/FilterLists.Data/Entities/License.cs diff --git a/src/FilterLists.Data/Entities/Maintainer.cs b/server/src/FilterLists.Data/Entities/Maintainer.cs similarity index 100% rename from src/FilterLists.Data/Entities/Maintainer.cs rename to server/src/FilterLists.Data/Entities/Maintainer.cs diff --git a/src/FilterLists.Data/Entities/Rule.cs b/server/src/FilterLists.Data/Entities/Rule.cs similarity index 100% rename from src/FilterLists.Data/Entities/Rule.cs rename to server/src/FilterLists.Data/Entities/Rule.cs diff --git a/src/FilterLists.Data/Entities/Snapshot.cs b/server/src/FilterLists.Data/Entities/Snapshot.cs similarity index 100% rename from src/FilterLists.Data/Entities/Snapshot.cs rename to server/src/FilterLists.Data/Entities/Snapshot.cs diff --git a/src/FilterLists.Data/Entities/Software.cs b/server/src/FilterLists.Data/Entities/Software.cs similarity index 100% rename from src/FilterLists.Data/Entities/Software.cs rename to server/src/FilterLists.Data/Entities/Software.cs diff --git a/src/FilterLists.Data/Entities/Syntax.cs b/server/src/FilterLists.Data/Entities/Syntax.cs similarity index 100% rename from src/FilterLists.Data/Entities/Syntax.cs rename to server/src/FilterLists.Data/Entities/Syntax.cs diff --git a/src/FilterLists.Data/Entities/Tag.cs b/server/src/FilterLists.Data/Entities/Tag.cs similarity index 100% rename from src/FilterLists.Data/Entities/Tag.cs rename to server/src/FilterLists.Data/Entities/Tag.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/BaseEntityTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/BaseEntityTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/BaseEntityTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/BaseEntityTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/FilterListTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/FilterListTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/FilterListTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/FilterListTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/Junctions/BaseJunctionTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/BaseJunctionTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/Junctions/BaseJunctionTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/BaseJunctionTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/Junctions/DependentTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/DependentTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/Junctions/DependentTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/DependentTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListLanguageTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListLanguageTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListLanguageTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListLanguageTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListMaintainerTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListMaintainerTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListMaintainerTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListMaintainerTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListTagTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListTagTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListTagTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListTagTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/Junctions/ForkTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/ForkTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/Junctions/ForkTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/ForkTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/Junctions/MergeTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/MergeTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/Junctions/MergeTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/MergeTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/Junctions/SnapshotRuleTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/SnapshotRuleTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/Junctions/SnapshotRuleTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/SnapshotRuleTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/Junctions/SoftwareSyntaxTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/SoftwareSyntaxTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/Junctions/SoftwareSyntaxTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/Junctions/SoftwareSyntaxTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/LanguageTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/LanguageTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/LanguageTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/LanguageTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/LicenseTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/LicenseTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/LicenseTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/LicenseTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/MaintainerTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/MaintainerTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/MaintainerTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/MaintainerTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/RuleTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/RuleTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/RuleTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/RuleTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/SnapshotTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/SnapshotTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/SnapshotTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/SnapshotTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/SoftwareTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/SoftwareTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/SoftwareTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/SoftwareTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/SyntaxTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/SyntaxTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/SyntaxTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/SyntaxTypeConfiguration.cs diff --git a/src/FilterLists.Data/EntityTypeConfigurations/TagTypeConfiguration.cs b/server/src/FilterLists.Data/EntityTypeConfigurations/TagTypeConfiguration.cs similarity index 100% rename from src/FilterLists.Data/EntityTypeConfigurations/TagTypeConfiguration.cs rename to server/src/FilterLists.Data/EntityTypeConfigurations/TagTypeConfiguration.cs diff --git a/src/FilterLists.Data/FilterLists.Data.csproj b/server/src/FilterLists.Data/FilterLists.Data.csproj similarity index 100% rename from src/FilterLists.Data/FilterLists.Data.csproj rename to server/src/FilterLists.Data/FilterLists.Data.csproj diff --git a/src/FilterLists.Data/FilterListsDbContext.cs b/server/src/FilterLists.Data/FilterListsDbContext.cs similarity index 100% rename from src/FilterLists.Data/FilterListsDbContext.cs rename to server/src/FilterLists.Data/FilterListsDbContext.cs diff --git a/src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs b/server/src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs similarity index 100% rename from src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs rename to server/src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs diff --git a/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs similarity index 100% rename from src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs rename to server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs diff --git a/src/FilterLists.Services/Extensions/CollectionExtensions.cs b/server/src/FilterLists.Services/Extensions/CollectionExtensions.cs similarity index 100% rename from src/FilterLists.Services/Extensions/CollectionExtensions.cs rename to server/src/FilterLists.Services/Extensions/CollectionExtensions.cs diff --git a/src/FilterLists.Services/Extensions/StringExtensions.cs b/server/src/FilterLists.Services/Extensions/StringExtensions.cs similarity index 100% rename from src/FilterLists.Services/Extensions/StringExtensions.cs rename to server/src/FilterLists.Services/Extensions/StringExtensions.cs diff --git a/src/FilterLists.Services/Extensions/TaskExtensions.cs b/server/src/FilterLists.Services/Extensions/TaskExtensions.cs similarity index 100% rename from src/FilterLists.Services/Extensions/TaskExtensions.cs rename to server/src/FilterLists.Services/Extensions/TaskExtensions.cs diff --git a/src/FilterLists.Services/FilterList/FilterListService.cs b/server/src/FilterLists.Services/FilterList/FilterListService.cs similarity index 100% rename from src/FilterLists.Services/FilterList/FilterListService.cs rename to server/src/FilterLists.Services/FilterList/FilterListService.cs diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/FilterListDtoMappingProfile.cs b/server/src/FilterLists.Services/FilterList/MappingProfiles/FilterListDtoMappingProfile.cs similarity index 100% rename from src/FilterLists.Services/FilterList/MappingProfiles/FilterListDtoMappingProfile.cs rename to server/src/FilterLists.Services/FilterList/MappingProfiles/FilterListDtoMappingProfile.cs diff --git a/src/FilterLists.Services/FilterList/Models/FilterListDto.cs b/server/src/FilterLists.Services/FilterList/Models/FilterListDto.cs similarity index 100% rename from src/FilterLists.Services/FilterList/Models/FilterListDto.cs rename to server/src/FilterLists.Services/FilterList/Models/FilterListDto.cs diff --git a/src/FilterLists.Services/FilterLists.Services.csproj b/server/src/FilterLists.Services/FilterLists.Services.csproj similarity index 100% rename from src/FilterLists.Services/FilterLists.Services.csproj rename to server/src/FilterLists.Services/FilterLists.Services.csproj diff --git a/src/FilterLists.Services/Language/LanguageService.cs b/server/src/FilterLists.Services/Language/LanguageService.cs similarity index 100% rename from src/FilterLists.Services/Language/LanguageService.cs rename to server/src/FilterLists.Services/Language/LanguageService.cs diff --git a/src/FilterLists.Services/Language/MappingProfiles/LanguageDtoMappingProfile.cs b/server/src/FilterLists.Services/Language/MappingProfiles/LanguageDtoMappingProfile.cs similarity index 100% rename from src/FilterLists.Services/Language/MappingProfiles/LanguageDtoMappingProfile.cs rename to server/src/FilterLists.Services/Language/MappingProfiles/LanguageDtoMappingProfile.cs diff --git a/src/FilterLists.Services/Language/Models/LanguageDto.cs b/server/src/FilterLists.Services/Language/Models/LanguageDto.cs similarity index 100% rename from src/FilterLists.Services/Language/Models/LanguageDto.cs rename to server/src/FilterLists.Services/Language/Models/LanguageDto.cs diff --git a/src/FilterLists.Services/License/LicenseService.cs b/server/src/FilterLists.Services/License/LicenseService.cs similarity index 100% rename from src/FilterLists.Services/License/LicenseService.cs rename to server/src/FilterLists.Services/License/LicenseService.cs diff --git a/src/FilterLists.Services/License/MappingProfiles/LicenseDtoMappingProfile.cs b/server/src/FilterLists.Services/License/MappingProfiles/LicenseDtoMappingProfile.cs similarity index 100% rename from src/FilterLists.Services/License/MappingProfiles/LicenseDtoMappingProfile.cs rename to server/src/FilterLists.Services/License/MappingProfiles/LicenseDtoMappingProfile.cs diff --git a/src/FilterLists.Services/License/Models/LicenseDto.cs b/server/src/FilterLists.Services/License/Models/LicenseDto.cs similarity index 100% rename from src/FilterLists.Services/License/Models/LicenseDto.cs rename to server/src/FilterLists.Services/License/Models/LicenseDto.cs diff --git a/src/FilterLists.Services/Maintainer/MaintainerService.cs b/server/src/FilterLists.Services/Maintainer/MaintainerService.cs similarity index 100% rename from src/FilterLists.Services/Maintainer/MaintainerService.cs rename to server/src/FilterLists.Services/Maintainer/MaintainerService.cs diff --git a/src/FilterLists.Services/Maintainer/MappingProfiles/MaintainerDtoMappingProfile.cs b/server/src/FilterLists.Services/Maintainer/MappingProfiles/MaintainerDtoMappingProfile.cs similarity index 100% rename from src/FilterLists.Services/Maintainer/MappingProfiles/MaintainerDtoMappingProfile.cs rename to server/src/FilterLists.Services/Maintainer/MappingProfiles/MaintainerDtoMappingProfile.cs diff --git a/src/FilterLists.Services/Maintainer/Models/MaintainerDto.cs b/server/src/FilterLists.Services/Maintainer/Models/MaintainerDto.cs similarity index 100% rename from src/FilterLists.Services/Maintainer/Models/MaintainerDto.cs rename to server/src/FilterLists.Services/Maintainer/Models/MaintainerDto.cs diff --git a/src/FilterLists.Services/RuleService.cs b/server/src/FilterLists.Services/RuleService.cs similarity index 100% rename from src/FilterLists.Services/RuleService.cs rename to server/src/FilterLists.Services/RuleService.cs diff --git a/src/FilterLists.Services/Seed/Models/FilterListSeedDto.cs b/server/src/FilterLists.Services/Seed/Models/FilterListSeedDto.cs similarity index 100% rename from src/FilterLists.Services/Seed/Models/FilterListSeedDto.cs rename to server/src/FilterLists.Services/Seed/Models/FilterListSeedDto.cs diff --git a/src/FilterLists.Services/Seed/Models/Junctions/DependentSeedDto.cs b/server/src/FilterLists.Services/Seed/Models/Junctions/DependentSeedDto.cs similarity index 100% rename from src/FilterLists.Services/Seed/Models/Junctions/DependentSeedDto.cs rename to server/src/FilterLists.Services/Seed/Models/Junctions/DependentSeedDto.cs diff --git a/src/FilterLists.Services/Seed/Models/Junctions/FilterListLanguageSeedDto.cs b/server/src/FilterLists.Services/Seed/Models/Junctions/FilterListLanguageSeedDto.cs similarity index 100% rename from src/FilterLists.Services/Seed/Models/Junctions/FilterListLanguageSeedDto.cs rename to server/src/FilterLists.Services/Seed/Models/Junctions/FilterListLanguageSeedDto.cs diff --git a/src/FilterLists.Services/Seed/Models/Junctions/FilterListMaintainerSeedDto.cs b/server/src/FilterLists.Services/Seed/Models/Junctions/FilterListMaintainerSeedDto.cs similarity index 100% rename from src/FilterLists.Services/Seed/Models/Junctions/FilterListMaintainerSeedDto.cs rename to server/src/FilterLists.Services/Seed/Models/Junctions/FilterListMaintainerSeedDto.cs diff --git a/src/FilterLists.Services/Seed/Models/Junctions/FilterListTagSeedDto.cs b/server/src/FilterLists.Services/Seed/Models/Junctions/FilterListTagSeedDto.cs similarity index 100% rename from src/FilterLists.Services/Seed/Models/Junctions/FilterListTagSeedDto.cs rename to server/src/FilterLists.Services/Seed/Models/Junctions/FilterListTagSeedDto.cs diff --git a/src/FilterLists.Services/Seed/Models/Junctions/ForkSeedDto.cs b/server/src/FilterLists.Services/Seed/Models/Junctions/ForkSeedDto.cs similarity index 100% rename from src/FilterLists.Services/Seed/Models/Junctions/ForkSeedDto.cs rename to server/src/FilterLists.Services/Seed/Models/Junctions/ForkSeedDto.cs diff --git a/src/FilterLists.Services/Seed/Models/Junctions/MergeSeedDto.cs b/server/src/FilterLists.Services/Seed/Models/Junctions/MergeSeedDto.cs similarity index 100% rename from src/FilterLists.Services/Seed/Models/Junctions/MergeSeedDto.cs rename to server/src/FilterLists.Services/Seed/Models/Junctions/MergeSeedDto.cs diff --git a/src/FilterLists.Services/Seed/Models/Junctions/SoftwareSyntaxSeedDto.cs b/server/src/FilterLists.Services/Seed/Models/Junctions/SoftwareSyntaxSeedDto.cs similarity index 100% rename from src/FilterLists.Services/Seed/Models/Junctions/SoftwareSyntaxSeedDto.cs rename to server/src/FilterLists.Services/Seed/Models/Junctions/SoftwareSyntaxSeedDto.cs diff --git a/src/FilterLists.Services/Seed/Models/LanguageSeedDto.cs b/server/src/FilterLists.Services/Seed/Models/LanguageSeedDto.cs similarity index 100% rename from src/FilterLists.Services/Seed/Models/LanguageSeedDto.cs rename to server/src/FilterLists.Services/Seed/Models/LanguageSeedDto.cs diff --git a/src/FilterLists.Services/Seed/Models/LicenseSeedDto.cs b/server/src/FilterLists.Services/Seed/Models/LicenseSeedDto.cs similarity index 100% rename from src/FilterLists.Services/Seed/Models/LicenseSeedDto.cs rename to server/src/FilterLists.Services/Seed/Models/LicenseSeedDto.cs diff --git a/src/FilterLists.Services/Seed/Models/MaintainerSeedDto.cs b/server/src/FilterLists.Services/Seed/Models/MaintainerSeedDto.cs similarity index 100% rename from src/FilterLists.Services/Seed/Models/MaintainerSeedDto.cs rename to server/src/FilterLists.Services/Seed/Models/MaintainerSeedDto.cs diff --git a/src/FilterLists.Services/Seed/Models/SoftwareSeedDto.cs b/server/src/FilterLists.Services/Seed/Models/SoftwareSeedDto.cs similarity index 100% rename from src/FilterLists.Services/Seed/Models/SoftwareSeedDto.cs rename to server/src/FilterLists.Services/Seed/Models/SoftwareSeedDto.cs diff --git a/src/FilterLists.Services/Seed/Models/SyntaxSeedDto.cs b/server/src/FilterLists.Services/Seed/Models/SyntaxSeedDto.cs similarity index 100% rename from src/FilterLists.Services/Seed/Models/SyntaxSeedDto.cs rename to server/src/FilterLists.Services/Seed/Models/SyntaxSeedDto.cs diff --git a/src/FilterLists.Services/Seed/Models/TagSeedDto.cs b/server/src/FilterLists.Services/Seed/Models/TagSeedDto.cs similarity index 100% rename from src/FilterLists.Services/Seed/Models/TagSeedDto.cs rename to server/src/FilterLists.Services/Seed/Models/TagSeedDto.cs diff --git a/src/FilterLists.Services/Seed/SeedService.cs b/server/src/FilterLists.Services/Seed/SeedService.cs similarity index 100% rename from src/FilterLists.Services/Seed/SeedService.cs rename to server/src/FilterLists.Services/Seed/SeedService.cs diff --git a/src/FilterLists.Services/Service.cs b/server/src/FilterLists.Services/Service.cs similarity index 100% rename from src/FilterLists.Services/Service.cs rename to server/src/FilterLists.Services/Service.cs diff --git a/src/FilterLists.Services/Software/MappingProfiles/SoftwareDtoMappingProfile.cs b/server/src/FilterLists.Services/Software/MappingProfiles/SoftwareDtoMappingProfile.cs similarity index 100% rename from src/FilterLists.Services/Software/MappingProfiles/SoftwareDtoMappingProfile.cs rename to server/src/FilterLists.Services/Software/MappingProfiles/SoftwareDtoMappingProfile.cs diff --git a/src/FilterLists.Services/Software/Models/SoftwareDto.cs b/server/src/FilterLists.Services/Software/Models/SoftwareDto.cs similarity index 100% rename from src/FilterLists.Services/Software/Models/SoftwareDto.cs rename to server/src/FilterLists.Services/Software/Models/SoftwareDto.cs diff --git a/src/FilterLists.Services/Software/SoftwareService.cs b/server/src/FilterLists.Services/Software/SoftwareService.cs similarity index 100% rename from src/FilterLists.Services/Software/SoftwareService.cs rename to server/src/FilterLists.Services/Software/SoftwareService.cs diff --git a/src/FilterLists.Services/Syntax/MappingProfiles/SyntaxDtoMappingProfile.cs b/server/src/FilterLists.Services/Syntax/MappingProfiles/SyntaxDtoMappingProfile.cs similarity index 100% rename from src/FilterLists.Services/Syntax/MappingProfiles/SyntaxDtoMappingProfile.cs rename to server/src/FilterLists.Services/Syntax/MappingProfiles/SyntaxDtoMappingProfile.cs diff --git a/src/FilterLists.Services/Syntax/Models/SyntaxDto.cs b/server/src/FilterLists.Services/Syntax/Models/SyntaxDto.cs similarity index 100% rename from src/FilterLists.Services/Syntax/Models/SyntaxDto.cs rename to server/src/FilterLists.Services/Syntax/Models/SyntaxDto.cs diff --git a/src/FilterLists.Services/Syntax/SyntaxService.cs b/server/src/FilterLists.Services/Syntax/SyntaxService.cs similarity index 100% rename from src/FilterLists.Services/Syntax/SyntaxService.cs rename to server/src/FilterLists.Services/Syntax/SyntaxService.cs diff --git a/src/FilterLists.Services/Tag/MappingProfiles/TagDtoMappingProfile.cs b/server/src/FilterLists.Services/Tag/MappingProfiles/TagDtoMappingProfile.cs similarity index 100% rename from src/FilterLists.Services/Tag/MappingProfiles/TagDtoMappingProfile.cs rename to server/src/FilterLists.Services/Tag/MappingProfiles/TagDtoMappingProfile.cs diff --git a/src/FilterLists.Services/Tag/Models/TagDto.cs b/server/src/FilterLists.Services/Tag/Models/TagDto.cs similarity index 100% rename from src/FilterLists.Services/Tag/Models/TagDto.cs rename to server/src/FilterLists.Services/Tag/Models/TagDto.cs diff --git a/src/FilterLists.Services/Tag/TagService.cs b/server/src/FilterLists.Services/Tag/TagService.cs similarity index 100% rename from src/FilterLists.Services/Tag/TagService.cs rename to server/src/FilterLists.Services/Tag/TagService.cs diff --git a/src/FilterLists.Services/UserAgentService.cs b/server/src/FilterLists.Services/UserAgentService.cs similarity index 100% rename from src/FilterLists.Services/UserAgentService.cs rename to server/src/FilterLists.Services/UserAgentService.cs diff --git a/src/FilterLists.Services/Wayback/Models/ArchivedSnapshots.cs b/server/src/FilterLists.Services/Wayback/Models/ArchivedSnapshots.cs similarity index 100% rename from src/FilterLists.Services/Wayback/Models/ArchivedSnapshots.cs rename to server/src/FilterLists.Services/Wayback/Models/ArchivedSnapshots.cs diff --git a/src/FilterLists.Services/Wayback/Models/Availability.cs b/server/src/FilterLists.Services/Wayback/Models/Availability.cs similarity index 100% rename from src/FilterLists.Services/Wayback/Models/Availability.cs rename to server/src/FilterLists.Services/Wayback/Models/Availability.cs diff --git a/src/FilterLists.Services/Wayback/Models/Closest.cs b/server/src/FilterLists.Services/Wayback/Models/Closest.cs similarity index 100% rename from src/FilterLists.Services/Wayback/Models/Closest.cs rename to server/src/FilterLists.Services/Wayback/Models/Closest.cs diff --git a/src/FilterLists.Services/Wayback/Models/SnapshotMetaDto.cs b/server/src/FilterLists.Services/Wayback/Models/SnapshotMetaDto.cs similarity index 100% rename from src/FilterLists.Services/Wayback/Models/SnapshotMetaDto.cs rename to server/src/FilterLists.Services/Wayback/Models/SnapshotMetaDto.cs diff --git a/src/FilterLists.Services/Wayback/WaybackService.cs b/server/src/FilterLists.Services/Wayback/WaybackService.cs similarity index 100% rename from src/FilterLists.Services/Wayback/WaybackService.cs rename to server/src/FilterLists.Services/Wayback/WaybackService.cs diff --git a/tests/FilterLists.Agent.Tests/Extensions/UriExtensionsTests.cs b/server/tests/FilterLists.Agent.Tests/Extensions/UriExtensionsTests.cs similarity index 100% rename from tests/FilterLists.Agent.Tests/Extensions/UriExtensionsTests.cs rename to server/tests/FilterLists.Agent.Tests/Extensions/UriExtensionsTests.cs diff --git a/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj b/server/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj similarity index 100% rename from tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj rename to server/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj diff --git a/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.ruleset b/server/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.ruleset similarity index 100% rename from tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.ruleset rename to server/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.ruleset diff --git a/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj b/server/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj similarity index 100% rename from tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj rename to server/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj diff --git a/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.ruleset b/server/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.ruleset similarity index 100% rename from tests/FilterLists.Data.Tests/FilterLists.Data.Tests.ruleset rename to server/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.ruleset diff --git a/tests/FilterLists.Data.Tests/SeedFilterListsDbContextTests.cs b/server/tests/FilterLists.Data.Tests/SeedFilterListsDbContextTests.cs similarity index 100% rename from tests/FilterLists.Data.Tests/SeedFilterListsDbContextTests.cs rename to server/tests/FilterLists.Data.Tests/SeedFilterListsDbContextTests.cs diff --git a/tests/FilterLists.Services.Tests/Extensions/CollectionExtensionsTests.cs b/server/tests/FilterLists.Services.Tests/Extensions/CollectionExtensionsTests.cs similarity index 100% rename from tests/FilterLists.Services.Tests/Extensions/CollectionExtensionsTests.cs rename to server/tests/FilterLists.Services.Tests/Extensions/CollectionExtensionsTests.cs diff --git a/tests/FilterLists.Services.Tests/Extensions/StringExtensionsTests.cs b/server/tests/FilterLists.Services.Tests/Extensions/StringExtensionsTests.cs similarity index 100% rename from tests/FilterLists.Services.Tests/Extensions/StringExtensionsTests.cs rename to server/tests/FilterLists.Services.Tests/Extensions/StringExtensionsTests.cs diff --git a/tests/FilterLists.Services.Tests/Extensions/TaskExtensionsTests.cs b/server/tests/FilterLists.Services.Tests/Extensions/TaskExtensionsTests.cs similarity index 100% rename from tests/FilterLists.Services.Tests/Extensions/TaskExtensionsTests.cs rename to server/tests/FilterLists.Services.Tests/Extensions/TaskExtensionsTests.cs diff --git a/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj b/server/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj similarity index 100% rename from tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj rename to server/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj diff --git a/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.ruleset b/server/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.ruleset similarity index 100% rename from tests/FilterLists.Services.Tests/FilterLists.Services.Tests.ruleset rename to server/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.ruleset diff --git a/tests/FilterLists.Services.Tests/UserAgentServiceTests.cs b/server/tests/FilterLists.Services.Tests/UserAgentServiceTests.cs similarity index 100% rename from tests/FilterLists.Services.Tests/UserAgentServiceTests.cs rename to server/tests/FilterLists.Services.Tests/UserAgentServiceTests.cs diff --git a/tests/FilterLists.Services.Tests/WaybackServiceTests.cs b/server/tests/FilterLists.Services.Tests/WaybackServiceTests.cs similarity index 100% rename from tests/FilterLists.Services.Tests/WaybackServiceTests.cs rename to server/tests/FilterLists.Services.Tests/WaybackServiceTests.cs