diff --git a/FilterLists.sln b/FilterLists.sln index 1a0eb20ed..4b46114be 100644 --- a/FilterLists.sln +++ b/FilterLists.sln @@ -3,20 +3,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30413.136 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Api", "directory\api\src\FilterLists.Directory.Api\FilterLists.Directory.Api.csproj", "{FE50F471-7DC0-44AB-8DAB-2909E3207FF9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Api", "services\directory\src\FilterLists.Directory.Api\FilterLists.Directory.Api.csproj", "{FE50F471-7DC0-44AB-8DAB-2909E3207FF9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Directory", "Directory", "{AE5D6471-1B6E-4B06-A313-34EF81F35342}" ProjectSection(SolutionItems) = preProject - directory\api\.dockerignore = directory\api\.dockerignore + services\directory\.dockerignore = services\directory\.dockerignore EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Domain", "directory\api\src\FilterLists.Directory.Domain\FilterLists.Directory.Domain.csproj", "{05496C09-DA31-4543-9EC4-D56BCADBB027}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Domain", "services\directory\src\FilterLists.Directory.Domain\FilterLists.Directory.Domain.csproj", "{05496C09-DA31-4543-9EC4-D56BCADBB027}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Application", "directory\api\src\FilterLists.Directory.Application\FilterLists.Directory.Application.csproj", "{CB1BCB34-C2A1-4E94-A90E-359FB4720B96}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Application", "services\directory\src\FilterLists.Directory.Application\FilterLists.Directory.Application.csproj", "{CB1BCB34-C2A1-4E94-A90E-359FB4720B96}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure", "directory\api\src\FilterLists.Directory.Infrastructure\FilterLists.Directory.Infrastructure.csproj", "{74C798F8-892A-40F2-8D2E-395E83853771}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure", "services\directory\src\FilterLists.Directory.Infrastructure\FilterLists.Directory.Infrastructure.csproj", "{74C798F8-892A-40F2-8D2E-395E83853771}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure.Migrations", "directory\api\src\FilterLists.Directory.Infrastructure.Migrations\FilterLists.Directory.Infrastructure.Migrations.csproj", "{4F7D51FE-A1F3-4473-A8C3-D57EBDD8E60E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure.Migrations", "services\directory\src\FilterLists.Directory.Infrastructure.Migrations\FilterLists.Directory.Infrastructure.Migrations.csproj", "{4F7D51FE-A1F3-4473-A8C3-D57EBDD8E60E}" EndProject Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{8F04C802-830B-4B6D-8D53-5D2A87B4223D}" EndProject diff --git a/directory/web/package-lock.json b/directory/web/package-lock.json deleted file mode 100644 index f4b640e7d..000000000 Binary files a/directory/web/package-lock.json and /dev/null differ diff --git a/directory/web/package.json b/directory/web/package.json deleted file mode 100644 index 0f518f8a7..000000000 --- a/directory/web/package.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "name": "filterlists.web", - "version": "0.1.0", - "private": true, - "dependencies": { - "@testing-library/jest-dom": "^5.11.4", - "@testing-library/react": "^10.4.9", - "@testing-library/user-event": "^12.1.2", - "@types/jest": "^26.0.10", - "@types/node": "^14.6.0", - "@types/react": "^16.9.46", - "@types/react-dom": "^16.9.8", - "@types/react-router-dom": "^5.1.5", - "antd": "^4.6.1", - "babel-plugin-import": "^1.13.0", - "customize-cra": "^1.0.0", - "react": "^16.13.1", - "react-app-rewired": "^2.1.6", - "react-dom": "^16.13.1", - "react-router-dom": "^5.2.0", - "react-scripts": "^3.4.3", - "slugify": "^1.4.5", - "typescript": "^4.0.2" - }, - "scripts": { - "start": "react-app-rewired start", - "build": "react-app-rewired build", - "test": "react-app-rewired test", - "eject": "react-scripts eject" - }, - "proxy": "https://filterlists.com", - "eslintConfig": { - "extends": [ - "react-app", - "plugin:prettier/recommended" - ] - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, - "lint-staged": { - "**/*.{json,js,jsx,ts,tsx,css,scss,yaml,md}": [ - "prettier --write", - "git add" - ] - }, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] - }, - "devDependencies": { - "eslint-config-prettier": "^6.11.0", - "eslint-plugin-prettier": "^3.1.4", - "husky": "^4.2.5", - "lint-staged": "^10.2.11", - "prettier": "^2.0.5" - } -} diff --git a/docker-compose.yml b/docker-compose.yml index 4e36ba615..2d1214c94 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: filterlists.directory.web: image: ${DOCKER_REGISTRY-}filterlists_directory_web build: - context: ./directory/web + context: ./web networks: - reverse_proxy depends_on: @@ -23,8 +23,8 @@ services: filterlists.directory.api: image: ${DOCKER_REGISTRY-}filterlists_directory_api build: - context: ./directory/api - dockerfile: src/FilterLists.Directory.Api/Dockerfile + context: ./services + dockerfile: directory/src/FilterLists.Directory.Api/Dockerfile networks: - reverse_proxy - directory.api @@ -49,4 +49,4 @@ networks: directory.api: volumes: - directory.db: \ No newline at end of file + directory.db: diff --git a/directory/api/.dockerignore b/services/.dockerignore similarity index 100% rename from directory/api/.dockerignore rename to services/.dockerignore diff --git a/directory/api/src/FilterLists.Directory.Api/Controllers/FilterListsController.cs b/services/directory/src/FilterLists.Directory.Api/Controllers/FilterListsController.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Api/Controllers/FilterListsController.cs rename to services/directory/src/FilterLists.Directory.Api/Controllers/FilterListsController.cs diff --git a/directory/api/src/FilterLists.Directory.Api/Dockerfile b/services/directory/src/FilterLists.Directory.Api/Dockerfile similarity index 100% rename from directory/api/src/FilterLists.Directory.Api/Dockerfile rename to services/directory/src/FilterLists.Directory.Api/Dockerfile diff --git a/directory/api/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj b/services/directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj similarity index 100% rename from directory/api/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj rename to services/directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj diff --git a/directory/api/src/FilterLists.Directory.Api/Program.cs b/services/directory/src/FilterLists.Directory.Api/Program.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Api/Program.cs rename to services/directory/src/FilterLists.Directory.Api/Program.cs diff --git a/directory/api/src/FilterLists.Directory.Api/Properties/launchSettings.json b/services/directory/src/FilterLists.Directory.Api/Properties/launchSettings.json similarity index 100% rename from directory/api/src/FilterLists.Directory.Api/Properties/launchSettings.json rename to services/directory/src/FilterLists.Directory.Api/Properties/launchSettings.json diff --git a/directory/api/src/FilterLists.Directory.Api/Startup.cs b/services/directory/src/FilterLists.Directory.Api/Startup.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Api/Startup.cs rename to services/directory/src/FilterLists.Directory.Api/Startup.cs diff --git a/directory/api/src/FilterLists.Directory.Api/appsettings.Development.json b/services/directory/src/FilterLists.Directory.Api/appsettings.Development.json similarity index 100% rename from directory/api/src/FilterLists.Directory.Api/appsettings.Development.json rename to services/directory/src/FilterLists.Directory.Api/appsettings.Development.json diff --git a/directory/api/src/FilterLists.Directory.Api/debug.Dockerfile b/services/directory/src/FilterLists.Directory.Api/debug.Dockerfile similarity index 100% rename from directory/api/src/FilterLists.Directory.Api/debug.Dockerfile rename to services/directory/src/FilterLists.Directory.Api/debug.Dockerfile diff --git a/directory/api/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj b/services/directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj similarity index 100% rename from directory/api/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj rename to services/directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj diff --git a/directory/api/src/FilterLists.Directory.Application/GetLists.cs b/services/directory/src/FilterLists.Directory.Application/GetLists.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Application/GetLists.cs rename to services/directory/src/FilterLists.Directory.Application/GetLists.cs diff --git a/directory/api/src/FilterLists.Directory.Application/ServicesRegistrationExtension.cs b/services/directory/src/FilterLists.Directory.Application/ServicesRegistrationExtension.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Application/ServicesRegistrationExtension.cs rename to services/directory/src/FilterLists.Directory.Application/ServicesRegistrationExtension.cs diff --git a/directory/api/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj b/services/directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj similarity index 100% rename from directory/api/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj rename to services/directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj diff --git a/directory/api/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj rename to services/directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj diff --git a/directory/api/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.Designer.cs b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.Designer.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.Designer.cs rename to services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.Designer.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.cs b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.cs rename to services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs rename to services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj b/services/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj rename to services/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlMirror.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlMirror.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlMirror.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlMirror.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlPartial.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlPartial.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlPartial.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlPartial.cs diff --git a/directory/api/src/FilterLists.Directory.Infrastructure/ServiceRegistrationExtension.cs b/services/directory/src/FilterLists.Directory.Infrastructure/ServiceRegistrationExtension.cs similarity index 100% rename from directory/api/src/FilterLists.Directory.Infrastructure/ServiceRegistrationExtension.cs rename to services/directory/src/FilterLists.Directory.Infrastructure/ServiceRegistrationExtension.cs diff --git a/directory/web/.dockerignore b/web/.dockerignore similarity index 100% rename from directory/web/.dockerignore rename to web/.dockerignore diff --git a/directory/web/.env b/web/.env similarity index 100% rename from directory/web/.env rename to web/.env diff --git a/directory/web/.gitignore b/web/.gitignore similarity index 100% rename from directory/web/.gitignore rename to web/.gitignore diff --git a/directory/web/Dockerfile b/web/Dockerfile similarity index 100% rename from directory/web/Dockerfile rename to web/Dockerfile diff --git a/directory/web/config-overrides.js b/web/config-overrides.js similarity index 100% rename from directory/web/config-overrides.js rename to web/config-overrides.js diff --git a/directory/web/public/icon_filterlists.png b/web/public/icon_filterlists.png similarity index 100% rename from directory/web/public/icon_filterlists.png rename to web/public/icon_filterlists.png diff --git a/directory/web/public/index.html b/web/public/index.html similarity index 100% rename from directory/web/public/index.html rename to web/public/index.html diff --git a/directory/web/public/logo_filterlists.png b/web/public/logo_filterlists.png similarity index 100% rename from directory/web/public/logo_filterlists.png rename to web/public/logo_filterlists.png diff --git a/directory/web/public/manifest.json b/web/public/manifest.json similarity index 100% rename from directory/web/public/manifest.json rename to web/public/manifest.json diff --git a/directory/web/public/robots.txt b/web/public/robots.txt similarity index 100% rename from directory/web/public/robots.txt rename to web/public/robots.txt diff --git a/directory/web/reverse-proxy/conf.d/default.conf b/web/reverse-proxy/conf.d/default.conf similarity index 100% rename from directory/web/reverse-proxy/conf.d/default.conf rename to web/reverse-proxy/conf.d/default.conf diff --git a/directory/web/src/App.test.tsx b/web/src/App.test.tsx similarity index 100% rename from directory/web/src/App.test.tsx rename to web/src/App.test.tsx diff --git a/directory/web/src/App.tsx b/web/src/App.tsx similarity index 100% rename from directory/web/src/App.tsx rename to web/src/App.tsx diff --git a/directory/web/src/components/Description.tsx b/web/src/components/Description.tsx similarity index 100% rename from directory/web/src/components/Description.tsx rename to web/src/components/Description.tsx diff --git a/directory/web/src/components/LicenseTag.tsx b/web/src/components/LicenseTag.tsx similarity index 100% rename from directory/web/src/components/LicenseTag.tsx rename to web/src/components/LicenseTag.tsx diff --git a/directory/web/src/components/LinkButton.tsx b/web/src/components/LinkButton.tsx similarity index 100% rename from directory/web/src/components/LinkButton.tsx rename to web/src/components/LinkButton.tsx diff --git a/directory/web/src/components/ListInfoButton.tsx b/web/src/components/ListInfoButton.tsx similarity index 100% rename from directory/web/src/components/ListInfoButton.tsx rename to web/src/components/ListInfoButton.tsx diff --git a/directory/web/src/components/PublishedDate.tsx b/web/src/components/PublishedDate.tsx similarity index 100% rename from directory/web/src/components/PublishedDate.tsx rename to web/src/components/PublishedDate.tsx diff --git a/directory/web/src/components/SubscribeButtons.tsx b/web/src/components/SubscribeButtons.tsx similarity index 100% rename from directory/web/src/components/SubscribeButtons.tsx rename to web/src/components/SubscribeButtons.tsx diff --git a/directory/web/src/components/SyntaxTag.tsx b/web/src/components/SyntaxTag.tsx similarity index 100% rename from directory/web/src/components/SyntaxTag.tsx rename to web/src/components/SyntaxTag.tsx diff --git a/directory/web/src/components/index.ts b/web/src/components/index.ts similarity index 100% rename from directory/web/src/components/index.ts rename to web/src/components/index.ts diff --git a/directory/web/src/components/languageCloud/LanguageCloud.module.css b/web/src/components/languageCloud/LanguageCloud.module.css similarity index 100% rename from directory/web/src/components/languageCloud/LanguageCloud.module.css rename to web/src/components/languageCloud/LanguageCloud.module.css diff --git a/directory/web/src/components/languageCloud/LanguageCloud.tsx b/web/src/components/languageCloud/LanguageCloud.tsx similarity index 100% rename from directory/web/src/components/languageCloud/LanguageCloud.tsx rename to web/src/components/languageCloud/LanguageCloud.tsx diff --git a/directory/web/src/components/languageCloud/index.ts b/web/src/components/languageCloud/index.ts similarity index 100% rename from directory/web/src/components/languageCloud/index.ts rename to web/src/components/languageCloud/index.ts diff --git a/directory/web/src/components/listInfoDrawer/ListInfoDrawer.tsx b/web/src/components/listInfoDrawer/ListInfoDrawer.tsx similarity index 100% rename from directory/web/src/components/listInfoDrawer/ListInfoDrawer.tsx rename to web/src/components/listInfoDrawer/ListInfoDrawer.tsx diff --git a/directory/web/src/components/listInfoDrawer/index.ts b/web/src/components/listInfoDrawer/index.ts similarity index 100% rename from directory/web/src/components/listInfoDrawer/index.ts rename to web/src/components/listInfoDrawer/index.ts diff --git a/directory/web/src/components/listInfoDrawer/listInfoDrawer.css b/web/src/components/listInfoDrawer/listInfoDrawer.css similarity index 100% rename from directory/web/src/components/listInfoDrawer/listInfoDrawer.css rename to web/src/components/listInfoDrawer/listInfoDrawer.css diff --git a/directory/web/src/components/listsTable/ListDrawer.tsx b/web/src/components/listsTable/ListDrawer.tsx similarity index 100% rename from directory/web/src/components/listsTable/ListDrawer.tsx rename to web/src/components/listsTable/ListDrawer.tsx diff --git a/directory/web/src/components/listsTable/ListsTable.module.css b/web/src/components/listsTable/ListsTable.module.css similarity index 100% rename from directory/web/src/components/listsTable/ListsTable.module.css rename to web/src/components/listsTable/ListsTable.module.css diff --git a/directory/web/src/components/listsTable/ListsTable.tsx b/web/src/components/listsTable/ListsTable.tsx similarity index 100% rename from directory/web/src/components/listsTable/ListsTable.tsx rename to web/src/components/listsTable/ListsTable.tsx diff --git a/directory/web/src/components/listsTable/ListsTableHoc.tsx b/web/src/components/listsTable/ListsTableHoc.tsx similarity index 100% rename from directory/web/src/components/listsTable/ListsTableHoc.tsx rename to web/src/components/listsTable/ListsTableHoc.tsx diff --git a/directory/web/src/components/listsTable/arraySorter.ts b/web/src/components/listsTable/arraySorter.ts similarity index 100% rename from directory/web/src/components/listsTable/arraySorter.ts rename to web/src/components/listsTable/arraySorter.ts diff --git a/directory/web/src/components/listsTable/index.ts b/web/src/components/listsTable/index.ts similarity index 100% rename from directory/web/src/components/listsTable/index.ts rename to web/src/components/listsTable/index.ts diff --git a/directory/web/src/components/listsTable/listsTable.css b/web/src/components/listsTable/listsTable.css similarity index 100% rename from directory/web/src/components/listsTable/listsTable.css rename to web/src/components/listsTable/listsTable.css diff --git a/directory/web/src/components/maintainerCloud/MaintainerCloud.module.css b/web/src/components/maintainerCloud/MaintainerCloud.module.css similarity index 100% rename from directory/web/src/components/maintainerCloud/MaintainerCloud.module.css rename to web/src/components/maintainerCloud/MaintainerCloud.module.css diff --git a/directory/web/src/components/maintainerCloud/MaintainerCloud.tsx b/web/src/components/maintainerCloud/MaintainerCloud.tsx similarity index 100% rename from directory/web/src/components/maintainerCloud/MaintainerCloud.tsx rename to web/src/components/maintainerCloud/MaintainerCloud.tsx diff --git a/directory/web/src/components/maintainerCloud/index.ts b/web/src/components/maintainerCloud/index.ts similarity index 100% rename from directory/web/src/components/maintainerCloud/index.ts rename to web/src/components/maintainerCloud/index.ts diff --git a/directory/web/src/components/maintainers/Maintainers.tsx b/web/src/components/maintainers/Maintainers.tsx similarity index 100% rename from directory/web/src/components/maintainers/Maintainers.tsx rename to web/src/components/maintainers/Maintainers.tsx diff --git a/directory/web/src/components/maintainers/index.ts b/web/src/components/maintainers/index.ts similarity index 100% rename from directory/web/src/components/maintainers/index.ts rename to web/src/components/maintainers/index.ts diff --git a/directory/web/src/components/maintainers/maintainers.css b/web/src/components/maintainers/maintainers.css similarity index 100% rename from directory/web/src/components/maintainers/maintainers.css rename to web/src/components/maintainers/maintainers.css diff --git a/directory/web/src/components/softwareCloud/SoftwareCloud.module.css b/web/src/components/softwareCloud/SoftwareCloud.module.css similarity index 100% rename from directory/web/src/components/softwareCloud/SoftwareCloud.module.css rename to web/src/components/softwareCloud/SoftwareCloud.module.css diff --git a/directory/web/src/components/softwareCloud/SoftwareCloud.tsx b/web/src/components/softwareCloud/SoftwareCloud.tsx similarity index 100% rename from directory/web/src/components/softwareCloud/SoftwareCloud.tsx rename to web/src/components/softwareCloud/SoftwareCloud.tsx diff --git a/directory/web/src/components/softwareCloud/SoftwareIcon.tsx b/web/src/components/softwareCloud/SoftwareIcon.tsx similarity index 100% rename from directory/web/src/components/softwareCloud/SoftwareIcon.tsx rename to web/src/components/softwareCloud/SoftwareIcon.tsx diff --git a/directory/web/src/components/softwareCloud/imgs/01-uBlock-Origin.svg b/web/src/components/softwareCloud/imgs/01-uBlock-Origin.svg similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/01-uBlock-Origin.svg rename to web/src/components/softwareCloud/imgs/01-uBlock-Origin.svg diff --git a/directory/web/src/components/softwareCloud/imgs/02-Adblock-Plus.svg b/web/src/components/softwareCloud/imgs/02-Adblock-Plus.svg similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/02-Adblock-Plus.svg rename to web/src/components/softwareCloud/imgs/02-Adblock-Plus.svg diff --git a/directory/web/src/components/softwareCloud/imgs/03-AdGuard.svg b/web/src/components/softwareCloud/imgs/03-AdGuard.svg similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/03-AdGuard.svg rename to web/src/components/softwareCloud/imgs/03-AdGuard.svg diff --git a/directory/web/src/components/softwareCloud/imgs/04-DNS66.png b/web/src/components/softwareCloud/imgs/04-DNS66.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/04-DNS66.png rename to web/src/components/softwareCloud/imgs/04-DNS66.png diff --git a/directory/web/src/components/softwareCloud/imgs/05-Nano-Adblocker.png b/web/src/components/softwareCloud/imgs/05-Nano-Adblocker.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/05-Nano-Adblocker.png rename to web/src/components/softwareCloud/imgs/05-Nano-Adblocker.png diff --git a/directory/web/src/components/softwareCloud/imgs/06-AdBlock.png b/web/src/components/softwareCloud/imgs/06-AdBlock.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/06-AdBlock.png rename to web/src/components/softwareCloud/imgs/06-AdBlock.png diff --git a/directory/web/src/components/softwareCloud/imgs/07-AdAway.png b/web/src/components/softwareCloud/imgs/07-AdAway.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/07-AdAway.png rename to web/src/components/softwareCloud/imgs/07-AdAway.png diff --git a/directory/web/src/components/softwareCloud/imgs/08-Personal-Blocklist.png b/web/src/components/softwareCloud/imgs/08-Personal-Blocklist.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/08-Personal-Blocklist.png rename to web/src/components/softwareCloud/imgs/08-Personal-Blocklist.png diff --git a/directory/web/src/components/softwareCloud/imgs/10-Redirector.png b/web/src/components/softwareCloud/imgs/10-Redirector.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/10-Redirector.png rename to web/src/components/softwareCloud/imgs/10-Redirector.png diff --git a/directory/web/src/components/softwareCloud/imgs/11-Hosts-File-Editor.png b/web/src/components/softwareCloud/imgs/11-Hosts-File-Editor.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/11-Hosts-File-Editor.png rename to web/src/components/softwareCloud/imgs/11-Hosts-File-Editor.png diff --git a/directory/web/src/components/softwareCloud/imgs/12-Gas-Mask.png b/web/src/components/softwareCloud/imgs/12-Gas-Mask.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/12-Gas-Mask.png rename to web/src/components/softwareCloud/imgs/12-Gas-Mask.png diff --git a/directory/web/src/components/softwareCloud/imgs/13-MinerBlock.svg b/web/src/components/softwareCloud/imgs/13-MinerBlock.svg similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/13-MinerBlock.svg rename to web/src/components/softwareCloud/imgs/13-MinerBlock.svg diff --git a/directory/web/src/components/softwareCloud/imgs/14-Pi-hole.svg b/web/src/components/softwareCloud/imgs/14-Pi-hole.svg similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/14-Pi-hole.svg rename to web/src/components/softwareCloud/imgs/14-Pi-hole.svg diff --git a/directory/web/src/components/softwareCloud/imgs/15-uBlock.svg b/web/src/components/softwareCloud/imgs/15-uBlock.svg similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/15-uBlock.svg rename to web/src/components/softwareCloud/imgs/15-uBlock.svg diff --git a/directory/web/src/components/softwareCloud/imgs/16-Internet-Explorer-TPL.svg b/web/src/components/softwareCloud/imgs/16-Internet-Explorer-TPL.svg similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/16-Internet-Explorer-TPL.svg rename to web/src/components/softwareCloud/imgs/16-Internet-Explorer-TPL.svg diff --git a/directory/web/src/components/softwareCloud/imgs/17-Google-Hit-Hider-by-Domain.png b/web/src/components/softwareCloud/imgs/17-Google-Hit-Hider-by-Domain.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/17-Google-Hit-Hider-by-Domain.png rename to web/src/components/softwareCloud/imgs/17-Google-Hit-Hider-by-Domain.png diff --git a/directory/web/src/components/softwareCloud/imgs/18-FireHOL.png b/web/src/components/softwareCloud/imgs/18-FireHOL.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/18-FireHOL.png rename to web/src/components/softwareCloud/imgs/18-FireHOL.png diff --git a/directory/web/src/components/softwareCloud/imgs/19-Samsung-Knox.png b/web/src/components/softwareCloud/imgs/19-Samsung-Knox.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/19-Samsung-Knox.png rename to web/src/components/softwareCloud/imgs/19-Samsung-Knox.png diff --git a/directory/web/src/components/softwareCloud/imgs/20-Little-Snitch.png b/web/src/components/softwareCloud/imgs/20-Little-Snitch.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/20-Little-Snitch.png rename to web/src/components/softwareCloud/imgs/20-Little-Snitch.png diff --git a/directory/web/src/components/softwareCloud/imgs/21-Privoxy.png b/web/src/components/softwareCloud/imgs/21-Privoxy.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/21-Privoxy.png rename to web/src/components/softwareCloud/imgs/21-Privoxy.png diff --git a/directory/web/src/components/softwareCloud/imgs/22-Diversion.png b/web/src/components/softwareCloud/imgs/22-Diversion.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/22-Diversion.png rename to web/src/components/softwareCloud/imgs/22-Diversion.png diff --git a/directory/web/src/components/softwareCloud/imgs/23-dnsmasq.png b/web/src/components/softwareCloud/imgs/23-dnsmasq.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/23-dnsmasq.png rename to web/src/components/softwareCloud/imgs/23-dnsmasq.png diff --git a/directory/web/src/components/softwareCloud/imgs/24-Slimjet.png b/web/src/components/softwareCloud/imgs/24-Slimjet.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/24-Slimjet.png rename to web/src/components/softwareCloud/imgs/24-Slimjet.png diff --git a/directory/web/src/components/softwareCloud/imgs/25-uMatrix.png b/web/src/components/softwareCloud/imgs/25-uMatrix.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/25-uMatrix.png rename to web/src/components/softwareCloud/imgs/25-uMatrix.png diff --git a/directory/web/src/components/softwareCloud/imgs/26-Blokada.png b/web/src/components/softwareCloud/imgs/26-Blokada.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/26-Blokada.png rename to web/src/components/softwareCloud/imgs/26-Blokada.png diff --git a/directory/web/src/components/softwareCloud/imgs/27-hostsmgr.png b/web/src/components/softwareCloud/imgs/27-hostsmgr.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/27-hostsmgr.png rename to web/src/components/softwareCloud/imgs/27-hostsmgr.png diff --git a/directory/web/src/components/softwareCloud/imgs/28-personalDNSfilter.svg b/web/src/components/softwareCloud/imgs/28-personalDNSfilter.svg similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/28-personalDNSfilter.svg rename to web/src/components/softwareCloud/imgs/28-personalDNSfilter.svg diff --git a/directory/web/src/components/softwareCloud/imgs/29-Unbound.png b/web/src/components/softwareCloud/imgs/29-Unbound.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/29-Unbound.png rename to web/src/components/softwareCloud/imgs/29-Unbound.png diff --git a/directory/web/src/components/softwareCloud/imgs/30-BIND.png b/web/src/components/softwareCloud/imgs/30-BIND.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/30-BIND.png rename to web/src/components/softwareCloud/imgs/30-BIND.png diff --git a/directory/web/src/components/softwareCloud/imgs/31-AdGuard-Home.png b/web/src/components/softwareCloud/imgs/31-AdGuard-Home.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/31-AdGuard-Home.png rename to web/src/components/softwareCloud/imgs/31-AdGuard-Home.png diff --git a/directory/web/src/components/softwareCloud/imgs/31-AdGuard-Home.svg b/web/src/components/softwareCloud/imgs/31-AdGuard-Home.svg similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/31-AdGuard-Home.svg rename to web/src/components/softwareCloud/imgs/31-AdGuard-Home.svg diff --git a/directory/web/src/components/softwareCloud/imgs/32-AdNauseam.png b/web/src/components/softwareCloud/imgs/32-AdNauseam.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/32-AdNauseam.png rename to web/src/components/softwareCloud/imgs/32-AdNauseam.png diff --git a/directory/web/src/components/softwareCloud/imgs/33-Legacy-Unix-Derivatives.png b/web/src/components/softwareCloud/imgs/33-Legacy-Unix-Derivatives.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/33-Legacy-Unix-Derivatives.png rename to web/src/components/softwareCloud/imgs/33-Legacy-Unix-Derivatives.png diff --git a/directory/web/src/components/softwareCloud/imgs/34-Windows-command-line.png b/web/src/components/softwareCloud/imgs/34-Windows-command-line.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/34-Windows-command-line.png rename to web/src/components/softwareCloud/imgs/34-Windows-command-line.png diff --git a/directory/web/src/components/softwareCloud/imgs/35-Shadowsocks.png b/web/src/components/softwareCloud/imgs/35-Shadowsocks.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/35-Shadowsocks.png rename to web/src/components/softwareCloud/imgs/35-Shadowsocks.png diff --git a/directory/web/src/components/softwareCloud/imgs/36-ShadowsocksR.png b/web/src/components/softwareCloud/imgs/36-ShadowsocksR.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/36-ShadowsocksR.png rename to web/src/components/softwareCloud/imgs/36-ShadowsocksR.png diff --git a/directory/web/src/components/softwareCloud/imgs/37-Shadowrocket.png b/web/src/components/softwareCloud/imgs/37-Shadowrocket.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/37-Shadowrocket.png rename to web/src/components/softwareCloud/imgs/37-Shadowrocket.png diff --git a/directory/web/src/components/softwareCloud/imgs/38-DNSRedirector.png b/web/src/components/softwareCloud/imgs/38-DNSRedirector.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/38-DNSRedirector.png rename to web/src/components/softwareCloud/imgs/38-DNSRedirector.png diff --git a/directory/web/src/components/softwareCloud/imgs/39-pfBlockerNG.png b/web/src/components/softwareCloud/imgs/39-pfBlockerNG.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/39-pfBlockerNG.png rename to web/src/components/softwareCloud/imgs/39-pfBlockerNG.png diff --git a/directory/web/src/components/softwareCloud/imgs/40-Opera.png b/web/src/components/softwareCloud/imgs/40-Opera.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/40-Opera.png rename to web/src/components/softwareCloud/imgs/40-Opera.png diff --git a/directory/web/src/components/softwareCloud/imgs/41-Surge.png b/web/src/components/softwareCloud/imgs/41-Surge.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/41-Surge.png rename to web/src/components/softwareCloud/imgs/41-Surge.png diff --git a/directory/web/src/components/softwareCloud/imgs/42-dnscrypt-proxy.png b/web/src/components/softwareCloud/imgs/42-dnscrypt-proxy.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/42-dnscrypt-proxy.png rename to web/src/components/softwareCloud/imgs/42-dnscrypt-proxy.png diff --git a/directory/web/src/components/softwareCloud/imgs/43-SmartDNS.png b/web/src/components/softwareCloud/imgs/43-SmartDNS.png similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/43-SmartDNS.png rename to web/src/components/softwareCloud/imgs/43-SmartDNS.png diff --git a/directory/web/src/components/softwareCloud/imgs/imgs.d.ts b/web/src/components/softwareCloud/imgs/imgs.d.ts similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/imgs.d.ts rename to web/src/components/softwareCloud/imgs/imgs.d.ts diff --git a/directory/web/src/components/softwareCloud/imgs/index.ts b/web/src/components/softwareCloud/imgs/index.ts similarity index 100% rename from directory/web/src/components/softwareCloud/imgs/index.ts rename to web/src/components/softwareCloud/imgs/index.ts diff --git a/directory/web/src/components/softwareCloud/index.ts b/web/src/components/softwareCloud/index.ts similarity index 100% rename from directory/web/src/components/softwareCloud/index.ts rename to web/src/components/softwareCloud/index.ts diff --git a/directory/web/src/components/tagCloud/TagCloud.module.css b/web/src/components/tagCloud/TagCloud.module.css similarity index 100% rename from directory/web/src/components/tagCloud/TagCloud.module.css rename to web/src/components/tagCloud/TagCloud.module.css diff --git a/directory/web/src/components/tagCloud/TagCloud.tsx b/web/src/components/tagCloud/TagCloud.tsx similarity index 100% rename from directory/web/src/components/tagCloud/TagCloud.tsx rename to web/src/components/tagCloud/TagCloud.tsx diff --git a/directory/web/src/components/tagCloud/index.ts b/web/src/components/tagCloud/index.ts similarity index 100% rename from directory/web/src/components/tagCloud/index.ts rename to web/src/components/tagCloud/index.ts diff --git a/directory/web/src/constants.ts b/web/src/constants.ts similarity index 100% rename from directory/web/src/constants.ts rename to web/src/constants.ts diff --git a/directory/web/src/hooks/index.ts b/web/src/hooks/index.ts similarity index 100% rename from directory/web/src/hooks/index.ts rename to web/src/hooks/index.ts diff --git a/directory/web/src/hooks/useApiData.tsx b/web/src/hooks/useApiData.tsx similarity index 100% rename from directory/web/src/hooks/useApiData.tsx rename to web/src/hooks/useApiData.tsx diff --git a/directory/web/src/hooks/useLanguages.tsx b/web/src/hooks/useLanguages.tsx similarity index 100% rename from directory/web/src/hooks/useLanguages.tsx rename to web/src/hooks/useLanguages.tsx diff --git a/directory/web/src/hooks/useLicenses.tsx b/web/src/hooks/useLicenses.tsx similarity index 100% rename from directory/web/src/hooks/useLicenses.tsx rename to web/src/hooks/useLicenses.tsx diff --git a/directory/web/src/hooks/useLists.tsx b/web/src/hooks/useLists.tsx similarity index 100% rename from directory/web/src/hooks/useLists.tsx rename to web/src/hooks/useLists.tsx diff --git a/directory/web/src/hooks/useMaintainers.tsx b/web/src/hooks/useMaintainers.tsx similarity index 100% rename from directory/web/src/hooks/useMaintainers.tsx rename to web/src/hooks/useMaintainers.tsx diff --git a/directory/web/src/hooks/useSearchColumnFilter.tsx b/web/src/hooks/useSearchColumnFilter.tsx similarity index 100% rename from directory/web/src/hooks/useSearchColumnFilter.tsx rename to web/src/hooks/useSearchColumnFilter.tsx diff --git a/directory/web/src/hooks/useSoftware.tsx b/web/src/hooks/useSoftware.tsx similarity index 100% rename from directory/web/src/hooks/useSoftware.tsx rename to web/src/hooks/useSoftware.tsx diff --git a/directory/web/src/hooks/useSyntaxes.tsx b/web/src/hooks/useSyntaxes.tsx similarity index 100% rename from directory/web/src/hooks/useSyntaxes.tsx rename to web/src/hooks/useSyntaxes.tsx diff --git a/directory/web/src/hooks/useTablePageSizer.tsx b/web/src/hooks/useTablePageSizer.tsx similarity index 100% rename from directory/web/src/hooks/useTablePageSizer.tsx rename to web/src/hooks/useTablePageSizer.tsx diff --git a/directory/web/src/hooks/useTags.tsx b/web/src/hooks/useTags.tsx similarity index 100% rename from directory/web/src/hooks/useTags.tsx rename to web/src/hooks/useTags.tsx diff --git a/directory/web/src/index.css b/web/src/index.css similarity index 100% rename from directory/web/src/index.css rename to web/src/index.css diff --git a/directory/web/src/index.tsx b/web/src/index.tsx similarity index 100% rename from directory/web/src/index.tsx rename to web/src/index.tsx diff --git a/directory/web/src/interfaces/Language.ts b/web/src/interfaces/Language.ts similarity index 100% rename from directory/web/src/interfaces/Language.ts rename to web/src/interfaces/Language.ts diff --git a/directory/web/src/interfaces/License.ts b/web/src/interfaces/License.ts similarity index 100% rename from directory/web/src/interfaces/License.ts rename to web/src/interfaces/License.ts diff --git a/directory/web/src/interfaces/List.ts b/web/src/interfaces/List.ts similarity index 100% rename from directory/web/src/interfaces/List.ts rename to web/src/interfaces/List.ts diff --git a/directory/web/src/interfaces/Maintainer.ts b/web/src/interfaces/Maintainer.ts similarity index 100% rename from directory/web/src/interfaces/Maintainer.ts rename to web/src/interfaces/Maintainer.ts diff --git a/directory/web/src/interfaces/Software.ts b/web/src/interfaces/Software.ts similarity index 100% rename from directory/web/src/interfaces/Software.ts rename to web/src/interfaces/Software.ts diff --git a/directory/web/src/interfaces/Syntax.ts b/web/src/interfaces/Syntax.ts similarity index 100% rename from directory/web/src/interfaces/Syntax.ts rename to web/src/interfaces/Syntax.ts diff --git a/directory/web/src/interfaces/Tag.ts b/web/src/interfaces/Tag.ts similarity index 100% rename from directory/web/src/interfaces/Tag.ts rename to web/src/interfaces/Tag.ts diff --git a/directory/web/src/react-app-env.d.ts b/web/src/react-app-env.d.ts similarity index 100% rename from directory/web/src/react-app-env.d.ts rename to web/src/react-app-env.d.ts diff --git a/directory/web/src/utils/index.ts b/web/src/utils/index.ts similarity index 100% rename from directory/web/src/utils/index.ts rename to web/src/utils/index.ts diff --git a/directory/web/src/utils/nameof.ts b/web/src/utils/nameof.ts similarity index 100% rename from directory/web/src/utils/nameof.ts rename to web/src/utils/nameof.ts diff --git a/directory/web/tsconfig.json b/web/tsconfig.json similarity index 100% rename from directory/web/tsconfig.json rename to web/tsconfig.json