diff --git a/.dockerignore b/API/.dockerignore similarity index 100% rename from .dockerignore rename to API/.dockerignore diff --git a/YABA.API/Controllers/BookmarksController.cs b/API/YABA.API/Controllers/BookmarksController.cs similarity index 100% rename from YABA.API/Controllers/BookmarksController.cs rename to API/YABA.API/Controllers/BookmarksController.cs diff --git a/YABA.API/Controllers/MiscController.cs b/API/YABA.API/Controllers/MiscController.cs similarity index 100% rename from YABA.API/Controllers/MiscController.cs rename to API/YABA.API/Controllers/MiscController.cs diff --git a/YABA.API/Controllers/TagsController.cs b/API/YABA.API/Controllers/TagsController.cs similarity index 100% rename from YABA.API/Controllers/TagsController.cs rename to API/YABA.API/Controllers/TagsController.cs diff --git a/YABA.API/Controllers/TestController.cs b/API/YABA.API/Controllers/TestController.cs similarity index 100% rename from YABA.API/Controllers/TestController.cs rename to API/YABA.API/Controllers/TestController.cs diff --git a/YABA.API/Controllers/UsersController.cs b/API/YABA.API/Controllers/UsersController.cs similarity index 100% rename from YABA.API/Controllers/UsersController.cs rename to API/YABA.API/Controllers/UsersController.cs diff --git a/YABA.API/Dockerfile b/API/YABA.API/Dockerfile similarity index 100% rename from YABA.API/Dockerfile rename to API/YABA.API/Dockerfile diff --git a/YABA.API/Extensions/ControllerExtensions.cs b/API/YABA.API/Extensions/ControllerExtensions.cs similarity index 100% rename from YABA.API/Extensions/ControllerExtensions.cs rename to API/YABA.API/Extensions/ControllerExtensions.cs diff --git a/YABA.API/Middlewares/AddCustomClaimsMiddleware.cs b/API/YABA.API/Middlewares/AddCustomClaimsMiddleware.cs similarity index 100% rename from YABA.API/Middlewares/AddCustomClaimsMiddleware.cs rename to API/YABA.API/Middlewares/AddCustomClaimsMiddleware.cs diff --git a/YABA.API/Middlewares/AddCustomLoggingPropertiesMiddleware.cs b/API/YABA.API/Middlewares/AddCustomLoggingPropertiesMiddleware.cs similarity index 100% rename from YABA.API/Middlewares/AddCustomLoggingPropertiesMiddleware.cs rename to API/YABA.API/Middlewares/AddCustomLoggingPropertiesMiddleware.cs diff --git a/YABA.API/Program.cs b/API/YABA.API/Program.cs similarity index 100% rename from YABA.API/Program.cs rename to API/YABA.API/Program.cs diff --git a/YABA.API/Properties/launchSettings.json b/API/YABA.API/Properties/launchSettings.json similarity index 100% rename from YABA.API/Properties/launchSettings.json rename to API/YABA.API/Properties/launchSettings.json diff --git a/YABA.API/Settings/Auth0Settings.cs b/API/YABA.API/Settings/Auth0Settings.cs similarity index 100% rename from YABA.API/Settings/Auth0Settings.cs rename to API/YABA.API/Settings/Auth0Settings.cs diff --git a/YABA.API/Settings/AutoMapperProfile.cs b/API/YABA.API/Settings/AutoMapperProfile.cs similarity index 100% rename from YABA.API/Settings/AutoMapperProfile.cs rename to API/YABA.API/Settings/AutoMapperProfile.cs diff --git a/YABA.API/Settings/DevOnlyAttribute.cs b/API/YABA.API/Settings/DevOnlyAttribute.cs similarity index 100% rename from YABA.API/Settings/DevOnlyAttribute.cs rename to API/YABA.API/Settings/DevOnlyAttribute.cs diff --git a/YABA.API/Settings/Swashbuckle/RemoveVersionParameterFilter.cs b/API/YABA.API/Settings/Swashbuckle/RemoveVersionParameterFilter.cs similarity index 100% rename from YABA.API/Settings/Swashbuckle/RemoveVersionParameterFilter.cs rename to API/YABA.API/Settings/Swashbuckle/RemoveVersionParameterFilter.cs diff --git a/YABA.API/Settings/Swashbuckle/ReplaceVersionWithExactValueInPathFilter.cs b/API/YABA.API/Settings/Swashbuckle/ReplaceVersionWithExactValueInPathFilter.cs similarity index 100% rename from YABA.API/Settings/Swashbuckle/ReplaceVersionWithExactValueInPathFilter.cs rename to API/YABA.API/Settings/Swashbuckle/ReplaceVersionWithExactValueInPathFilter.cs diff --git a/YABA.API/ViewModels/Bookmarks/BookmarkResponse.cs b/API/YABA.API/ViewModels/Bookmarks/BookmarkResponse.cs similarity index 100% rename from YABA.API/ViewModels/Bookmarks/BookmarkResponse.cs rename to API/YABA.API/ViewModels/Bookmarks/BookmarkResponse.cs diff --git a/YABA.API/ViewModels/Bookmarks/DeleteBookmarksRequest.cs b/API/YABA.API/ViewModels/Bookmarks/DeleteBookmarksRequest.cs similarity index 100% rename from YABA.API/ViewModels/Bookmarks/DeleteBookmarksRequest.cs rename to API/YABA.API/ViewModels/Bookmarks/DeleteBookmarksRequest.cs diff --git a/YABA.API/ViewModels/Bookmarks/HideBookmarksRequest.cs b/API/YABA.API/ViewModels/Bookmarks/HideBookmarksRequest.cs similarity index 100% rename from YABA.API/ViewModels/Bookmarks/HideBookmarksRequest.cs rename to API/YABA.API/ViewModels/Bookmarks/HideBookmarksRequest.cs diff --git a/YABA.API/ViewModels/Bookmarks/PatchBookmarkRequest.cs b/API/YABA.API/ViewModels/Bookmarks/PatchBookmarkRequest.cs similarity index 100% rename from YABA.API/ViewModels/Bookmarks/PatchBookmarkRequest.cs rename to API/YABA.API/ViewModels/Bookmarks/PatchBookmarkRequest.cs diff --git a/YABA.API/ViewModels/Bookmarks/UpdateBookmarkTagRequest.cs b/API/YABA.API/ViewModels/Bookmarks/UpdateBookmarkTagRequest.cs similarity index 100% rename from YABA.API/ViewModels/Bookmarks/UpdateBookmarkTagRequest.cs rename to API/YABA.API/ViewModels/Bookmarks/UpdateBookmarkTagRequest.cs diff --git a/YABA.API/ViewModels/GetWebsiteMetaDataResponse.cs b/API/YABA.API/ViewModels/GetWebsiteMetaDataResponse.cs similarity index 100% rename from YABA.API/ViewModels/GetWebsiteMetaDataResponse.cs rename to API/YABA.API/ViewModels/GetWebsiteMetaDataResponse.cs diff --git a/YABA.API/ViewModels/Tags/DeleteTagsRequest.cs b/API/YABA.API/ViewModels/Tags/DeleteTagsRequest.cs similarity index 100% rename from YABA.API/ViewModels/Tags/DeleteTagsRequest.cs rename to API/YABA.API/ViewModels/Tags/DeleteTagsRequest.cs diff --git a/YABA.API/ViewModels/Tags/HideTagsRequest.cs b/API/YABA.API/ViewModels/Tags/HideTagsRequest.cs similarity index 100% rename from YABA.API/ViewModels/Tags/HideTagsRequest.cs rename to API/YABA.API/ViewModels/Tags/HideTagsRequest.cs diff --git a/YABA.API/ViewModels/Tags/TagResponse.cs b/API/YABA.API/ViewModels/Tags/TagResponse.cs similarity index 100% rename from YABA.API/ViewModels/Tags/TagResponse.cs rename to API/YABA.API/ViewModels/Tags/TagResponse.cs diff --git a/YABA.API/ViewModels/UserResponse.cs b/API/YABA.API/ViewModels/UserResponse.cs similarity index 100% rename from YABA.API/ViewModels/UserResponse.cs rename to API/YABA.API/ViewModels/UserResponse.cs diff --git a/YABA.API/YABA.API.csproj b/API/YABA.API/YABA.API.csproj similarity index 100% rename from YABA.API/YABA.API.csproj rename to API/YABA.API/YABA.API.csproj diff --git a/YABA.API/appsettings.Development.json b/API/YABA.API/appsettings.Development.json similarity index 100% rename from YABA.API/appsettings.Development.json rename to API/YABA.API/appsettings.Development.json diff --git a/YABA.API/appsettings.json b/API/YABA.API/appsettings.json similarity index 100% rename from YABA.API/appsettings.json rename to API/YABA.API/appsettings.json diff --git a/YABA.Common/Attributes/ClaimNameAttribute.cs b/API/YABA.Common/Attributes/ClaimNameAttribute.cs similarity index 100% rename from YABA.Common/Attributes/ClaimNameAttribute.cs rename to API/YABA.Common/Attributes/ClaimNameAttribute.cs diff --git a/YABA.Common/DTOs/Bookmarks/BookmarkDTO.cs b/API/YABA.Common/DTOs/Bookmarks/BookmarkDTO.cs similarity index 100% rename from YABA.Common/DTOs/Bookmarks/BookmarkDTO.cs rename to API/YABA.Common/DTOs/Bookmarks/BookmarkDTO.cs diff --git a/YABA.Common/DTOs/Bookmarks/CreateBookmarkRequestDTO.cs b/API/YABA.Common/DTOs/Bookmarks/CreateBookmarkRequestDTO.cs similarity index 100% rename from YABA.Common/DTOs/Bookmarks/CreateBookmarkRequestDTO.cs rename to API/YABA.Common/DTOs/Bookmarks/CreateBookmarkRequestDTO.cs diff --git a/YABA.Common/DTOs/Bookmarks/UpdateBookmarkRequestDTO.cs b/API/YABA.Common/DTOs/Bookmarks/UpdateBookmarkRequestDTO.cs similarity index 100% rename from YABA.Common/DTOs/Bookmarks/UpdateBookmarkRequestDTO.cs rename to API/YABA.Common/DTOs/Bookmarks/UpdateBookmarkRequestDTO.cs diff --git a/YABA.Common/DTOs/Tags/CreateTagDTO.cs b/API/YABA.Common/DTOs/Tags/CreateTagDTO.cs similarity index 100% rename from YABA.Common/DTOs/Tags/CreateTagDTO.cs rename to API/YABA.Common/DTOs/Tags/CreateTagDTO.cs diff --git a/YABA.Common/DTOs/Tags/TagDTO.cs b/API/YABA.Common/DTOs/Tags/TagDTO.cs similarity index 100% rename from YABA.Common/DTOs/Tags/TagDTO.cs rename to API/YABA.Common/DTOs/Tags/TagDTO.cs diff --git a/YABA.Common/DTOs/Tags/UpdateTagDTO.cs b/API/YABA.Common/DTOs/Tags/UpdateTagDTO.cs similarity index 100% rename from YABA.Common/DTOs/Tags/UpdateTagDTO.cs rename to API/YABA.Common/DTOs/Tags/UpdateTagDTO.cs diff --git a/YABA.Common/DTOs/UserDTO.cs b/API/YABA.Common/DTOs/UserDTO.cs similarity index 100% rename from YABA.Common/DTOs/UserDTO.cs rename to API/YABA.Common/DTOs/UserDTO.cs diff --git a/YABA.Common/DTOs/WebsiteMetaDataDTO.cs b/API/YABA.Common/DTOs/WebsiteMetaDataDTO.cs similarity index 100% rename from YABA.Common/DTOs/WebsiteMetaDataDTO.cs rename to API/YABA.Common/DTOs/WebsiteMetaDataDTO.cs diff --git a/YABA.Common/Extensions/DictionaryExtensions.cs b/API/YABA.Common/Extensions/DictionaryExtensions.cs similarity index 100% rename from YABA.Common/Extensions/DictionaryExtensions.cs rename to API/YABA.Common/Extensions/DictionaryExtensions.cs diff --git a/YABA.Common/Extensions/EnumExtensions.cs b/API/YABA.Common/Extensions/EnumExtensions.cs similarity index 100% rename from YABA.Common/Extensions/EnumExtensions.cs rename to API/YABA.Common/Extensions/EnumExtensions.cs diff --git a/YABA.Common/Extensions/UserIdentityExtensions.cs b/API/YABA.Common/Extensions/UserIdentityExtensions.cs similarity index 100% rename from YABA.Common/Extensions/UserIdentityExtensions.cs rename to API/YABA.Common/Extensions/UserIdentityExtensions.cs diff --git a/YABA.Common/Interfaces/IBookmark.cs b/API/YABA.Common/Interfaces/IBookmark.cs similarity index 100% rename from YABA.Common/Interfaces/IBookmark.cs rename to API/YABA.Common/Interfaces/IBookmark.cs diff --git a/YABA.Common/Lookups/ClaimsLookup.cs b/API/YABA.Common/Lookups/ClaimsLookup.cs similarity index 100% rename from YABA.Common/Lookups/ClaimsLookup.cs rename to API/YABA.Common/Lookups/ClaimsLookup.cs diff --git a/YABA.Common/Lookups/CrudResultLookup.cs b/API/YABA.Common/Lookups/CrudResultLookup.cs similarity index 100% rename from YABA.Common/Lookups/CrudResultLookup.cs rename to API/YABA.Common/Lookups/CrudResultLookup.cs diff --git a/YABA.Common/YABA.Common.csproj b/API/YABA.Common/YABA.Common.csproj similarity index 100% rename from YABA.Common/YABA.Common.csproj rename to API/YABA.Common/YABA.Common.csproj diff --git a/YABA.Data/Configuration/DependencyInjectionConfiguration.cs b/API/YABA.Data/Configuration/DependencyInjectionConfiguration.cs similarity index 100% rename from YABA.Data/Configuration/DependencyInjectionConfiguration.cs rename to API/YABA.Data/Configuration/DependencyInjectionConfiguration.cs diff --git a/YABA.Data/Context/YABABaseContext.cs b/API/YABA.Data/Context/YABABaseContext.cs similarity index 100% rename from YABA.Data/Context/YABABaseContext.cs rename to API/YABA.Data/Context/YABABaseContext.cs diff --git a/YABA.Data/Context/YABABaseContextFactory.cs b/API/YABA.Data/Context/YABABaseContextFactory.cs similarity index 100% rename from YABA.Data/Context/YABABaseContextFactory.cs rename to API/YABA.Data/Context/YABABaseContextFactory.cs diff --git a/YABA.Data/Context/YABAReadOnlyContext.cs b/API/YABA.Data/Context/YABAReadOnlyContext.cs similarity index 100% rename from YABA.Data/Context/YABAReadOnlyContext.cs rename to API/YABA.Data/Context/YABAReadOnlyContext.cs diff --git a/YABA.Data/Context/YABAReadWriteContext.cs b/API/YABA.Data/Context/YABAReadWriteContext.cs similarity index 100% rename from YABA.Data/Context/YABAReadWriteContext.cs rename to API/YABA.Data/Context/YABAReadWriteContext.cs diff --git a/YABA.Data/Extensions/GenericDbSetExtensions.cs b/API/YABA.Data/Extensions/GenericDbSetExtensions.cs similarity index 100% rename from YABA.Data/Extensions/GenericDbSetExtensions.cs rename to API/YABA.Data/Extensions/GenericDbSetExtensions.cs diff --git a/YABA.Data/Extensions/UsersDbSetExtensions.cs b/API/YABA.Data/Extensions/UsersDbSetExtensions.cs similarity index 100% rename from YABA.Data/Extensions/UsersDbSetExtensions.cs rename to API/YABA.Data/Extensions/UsersDbSetExtensions.cs diff --git a/YABA.Data/Migrations/20230125055348_InitialMigration.Designer.cs b/API/YABA.Data/Migrations/20230125055348_InitialMigration.Designer.cs similarity index 100% rename from YABA.Data/Migrations/20230125055348_InitialMigration.Designer.cs rename to API/YABA.Data/Migrations/20230125055348_InitialMigration.Designer.cs diff --git a/YABA.Data/Migrations/20230125055348_InitialMigration.cs b/API/YABA.Data/Migrations/20230125055348_InitialMigration.cs similarity index 100% rename from YABA.Data/Migrations/20230125055348_InitialMigration.cs rename to API/YABA.Data/Migrations/20230125055348_InitialMigration.cs diff --git a/YABA.Data/Migrations/20230126050046_AddedUrlToBookmark.Designer.cs b/API/YABA.Data/Migrations/20230126050046_AddedUrlToBookmark.Designer.cs similarity index 100% rename from YABA.Data/Migrations/20230126050046_AddedUrlToBookmark.Designer.cs rename to API/YABA.Data/Migrations/20230126050046_AddedUrlToBookmark.Designer.cs diff --git a/YABA.Data/Migrations/20230126050046_AddedUrlToBookmark.cs b/API/YABA.Data/Migrations/20230126050046_AddedUrlToBookmark.cs similarity index 100% rename from YABA.Data/Migrations/20230126050046_AddedUrlToBookmark.cs rename to API/YABA.Data/Migrations/20230126050046_AddedUrlToBookmark.cs diff --git a/YABA.Data/Migrations/20230128064541_ModifiedBookmarkTagsPK_RemovedSoftDeleteFromTagsAndBookmarks.Designer.cs b/API/YABA.Data/Migrations/20230128064541_ModifiedBookmarkTagsPK_RemovedSoftDeleteFromTagsAndBookmarks.Designer.cs similarity index 100% rename from YABA.Data/Migrations/20230128064541_ModifiedBookmarkTagsPK_RemovedSoftDeleteFromTagsAndBookmarks.Designer.cs rename to API/YABA.Data/Migrations/20230128064541_ModifiedBookmarkTagsPK_RemovedSoftDeleteFromTagsAndBookmarks.Designer.cs diff --git a/YABA.Data/Migrations/20230128064541_ModifiedBookmarkTagsPK_RemovedSoftDeleteFromTagsAndBookmarks.cs b/API/YABA.Data/Migrations/20230128064541_ModifiedBookmarkTagsPK_RemovedSoftDeleteFromTagsAndBookmarks.cs similarity index 100% rename from YABA.Data/Migrations/20230128064541_ModifiedBookmarkTagsPK_RemovedSoftDeleteFromTagsAndBookmarks.cs rename to API/YABA.Data/Migrations/20230128064541_ModifiedBookmarkTagsPK_RemovedSoftDeleteFromTagsAndBookmarks.cs diff --git a/YABA.Data/Migrations/20230128193757_ModifiedBookmarkTable_MakeNoteAndDescriptionOptional.Designer.cs b/API/YABA.Data/Migrations/20230128193757_ModifiedBookmarkTable_MakeNoteAndDescriptionOptional.Designer.cs similarity index 100% rename from YABA.Data/Migrations/20230128193757_ModifiedBookmarkTable_MakeNoteAndDescriptionOptional.Designer.cs rename to API/YABA.Data/Migrations/20230128193757_ModifiedBookmarkTable_MakeNoteAndDescriptionOptional.Designer.cs diff --git a/YABA.Data/Migrations/20230128193757_ModifiedBookmarkTable_MakeNoteAndDescriptionOptional.cs b/API/YABA.Data/Migrations/20230128193757_ModifiedBookmarkTable_MakeNoteAndDescriptionOptional.cs similarity index 100% rename from YABA.Data/Migrations/20230128193757_ModifiedBookmarkTable_MakeNoteAndDescriptionOptional.cs rename to API/YABA.Data/Migrations/20230128193757_ModifiedBookmarkTable_MakeNoteAndDescriptionOptional.cs diff --git a/YABA.Data/Migrations/20230304061552_AddUniqueNameAndUserIdComboConstraintToTagsTable_AddUniqueUrlAndUserIdComboConstraintToBookmark.Designer.cs b/API/YABA.Data/Migrations/20230304061552_AddUniqueNameAndUserIdComboConstraintToTagsTable_AddUniqueUrlAndUserIdComboConstraintToBookmark.Designer.cs similarity index 100% rename from YABA.Data/Migrations/20230304061552_AddUniqueNameAndUserIdComboConstraintToTagsTable_AddUniqueUrlAndUserIdComboConstraintToBookmark.Designer.cs rename to API/YABA.Data/Migrations/20230304061552_AddUniqueNameAndUserIdComboConstraintToTagsTable_AddUniqueUrlAndUserIdComboConstraintToBookmark.Designer.cs diff --git a/YABA.Data/Migrations/20230304061552_AddUniqueNameAndUserIdComboConstraintToTagsTable_AddUniqueUrlAndUserIdComboConstraintToBookmark.cs b/API/YABA.Data/Migrations/20230304061552_AddUniqueNameAndUserIdComboConstraintToTagsTable_AddUniqueUrlAndUserIdComboConstraintToBookmark.cs similarity index 100% rename from YABA.Data/Migrations/20230304061552_AddUniqueNameAndUserIdComboConstraintToTagsTable_AddUniqueUrlAndUserIdComboConstraintToBookmark.cs rename to API/YABA.Data/Migrations/20230304061552_AddUniqueNameAndUserIdComboConstraintToTagsTable_AddUniqueUrlAndUserIdComboConstraintToBookmark.cs diff --git a/YABA.Data/Migrations/YABABaseContextModelSnapshot.cs b/API/YABA.Data/Migrations/YABABaseContextModelSnapshot.cs similarity index 100% rename from YABA.Data/Migrations/YABABaseContextModelSnapshot.cs rename to API/YABA.Data/Migrations/YABABaseContextModelSnapshot.cs diff --git a/YABA.Data/YABA.Data.csproj b/API/YABA.Data/YABA.Data.csproj similarity index 100% rename from YABA.Data/YABA.Data.csproj rename to API/YABA.Data/YABA.Data.csproj diff --git a/YABA.Models/Bookmark.cs b/API/YABA.Models/Bookmark.cs similarity index 100% rename from YABA.Models/Bookmark.cs rename to API/YABA.Models/Bookmark.cs diff --git a/YABA.Models/BookmarkTag.cs b/API/YABA.Models/BookmarkTag.cs similarity index 100% rename from YABA.Models/BookmarkTag.cs rename to API/YABA.Models/BookmarkTag.cs diff --git a/YABA.Models/Interfaces/IDateCreatedTrackable.cs b/API/YABA.Models/Interfaces/IDateCreatedTrackable.cs similarity index 100% rename from YABA.Models/Interfaces/IDateCreatedTrackable.cs rename to API/YABA.Models/Interfaces/IDateCreatedTrackable.cs diff --git a/YABA.Models/Interfaces/IDateModifiedTrackable.cs b/API/YABA.Models/Interfaces/IDateModifiedTrackable.cs similarity index 100% rename from YABA.Models/Interfaces/IDateModifiedTrackable.cs rename to API/YABA.Models/Interfaces/IDateModifiedTrackable.cs diff --git a/YABA.Models/Interfaces/IIdentifiable.cs b/API/YABA.Models/Interfaces/IIdentifiable.cs similarity index 100% rename from YABA.Models/Interfaces/IIdentifiable.cs rename to API/YABA.Models/Interfaces/IIdentifiable.cs diff --git a/YABA.Models/Interfaces/ISoftDeletable.cs b/API/YABA.Models/Interfaces/ISoftDeletable.cs similarity index 100% rename from YABA.Models/Interfaces/ISoftDeletable.cs rename to API/YABA.Models/Interfaces/ISoftDeletable.cs diff --git a/YABA.Models/Tag.cs b/API/YABA.Models/Tag.cs similarity index 100% rename from YABA.Models/Tag.cs rename to API/YABA.Models/Tag.cs diff --git a/YABA.Models/User.cs b/API/YABA.Models/User.cs similarity index 100% rename from YABA.Models/User.cs rename to API/YABA.Models/User.cs diff --git a/YABA.Models/YABA.Models.csproj b/API/YABA.Models/YABA.Models.csproj similarity index 100% rename from YABA.Models/YABA.Models.csproj rename to API/YABA.Models/YABA.Models.csproj diff --git a/YABA.Service.Tests/UserServiceTests/IsUserRegisteredTests.cs b/API/YABA.Service.Tests/UserServiceTests/IsUserRegisteredTests.cs similarity index 100% rename from YABA.Service.Tests/UserServiceTests/IsUserRegisteredTests.cs rename to API/YABA.Service.Tests/UserServiceTests/IsUserRegisteredTests.cs diff --git a/YABA.Service.Tests/YABA.Service.Tests.csproj b/API/YABA.Service.Tests/YABA.Service.Tests.csproj similarity index 100% rename from YABA.Service.Tests/YABA.Service.Tests.csproj rename to API/YABA.Service.Tests/YABA.Service.Tests.csproj diff --git a/YABA.Service/BookmarkService.cs b/API/YABA.Service/BookmarkService.cs similarity index 100% rename from YABA.Service/BookmarkService.cs rename to API/YABA.Service/BookmarkService.cs diff --git a/YABA.Service/Configuration/AutoMapperProfile.cs b/API/YABA.Service/Configuration/AutoMapperProfile.cs similarity index 100% rename from YABA.Service/Configuration/AutoMapperProfile.cs rename to API/YABA.Service/Configuration/AutoMapperProfile.cs diff --git a/YABA.Service/Configuration/DependencyInjectionConfiguration.cs b/API/YABA.Service/Configuration/DependencyInjectionConfiguration.cs similarity index 100% rename from YABA.Service/Configuration/DependencyInjectionConfiguration.cs rename to API/YABA.Service/Configuration/DependencyInjectionConfiguration.cs diff --git a/YABA.Service/Interfaces/IBookmarkService.cs b/API/YABA.Service/Interfaces/IBookmarkService.cs similarity index 100% rename from YABA.Service/Interfaces/IBookmarkService.cs rename to API/YABA.Service/Interfaces/IBookmarkService.cs diff --git a/YABA.Service/Interfaces/IMiscService.cs b/API/YABA.Service/Interfaces/IMiscService.cs similarity index 100% rename from YABA.Service/Interfaces/IMiscService.cs rename to API/YABA.Service/Interfaces/IMiscService.cs diff --git a/YABA.Service/Interfaces/ITagsService.cs b/API/YABA.Service/Interfaces/ITagsService.cs similarity index 100% rename from YABA.Service/Interfaces/ITagsService.cs rename to API/YABA.Service/Interfaces/ITagsService.cs diff --git a/YABA.Service/Interfaces/IUserService.cs b/API/YABA.Service/Interfaces/IUserService.cs similarity index 100% rename from YABA.Service/Interfaces/IUserService.cs rename to API/YABA.Service/Interfaces/IUserService.cs diff --git a/YABA.Service/MiscService.cs b/API/YABA.Service/MiscService.cs similarity index 100% rename from YABA.Service/MiscService.cs rename to API/YABA.Service/MiscService.cs diff --git a/YABA.Service/TagsService.cs b/API/YABA.Service/TagsService.cs similarity index 100% rename from YABA.Service/TagsService.cs rename to API/YABA.Service/TagsService.cs diff --git a/YABA.Service/UserService.cs b/API/YABA.Service/UserService.cs similarity index 100% rename from YABA.Service/UserService.cs rename to API/YABA.Service/UserService.cs diff --git a/YABA.Service/YABA.Service.csproj b/API/YABA.Service/YABA.Service.csproj similarity index 100% rename from YABA.Service/YABA.Service.csproj rename to API/YABA.Service/YABA.Service.csproj diff --git a/YABA.sln b/API/YABA.sln similarity index 100% rename from YABA.sln rename to API/YABA.sln diff --git a/yaba-web/README.md b/Web/README.md similarity index 100% rename from yaba-web/README.md rename to Web/README.md diff --git a/yaba-web/package-lock.json b/Web/package-lock.json similarity index 100% rename from yaba-web/package-lock.json rename to Web/package-lock.json diff --git a/yaba-web/package.json b/Web/package.json similarity index 100% rename from yaba-web/package.json rename to Web/package.json diff --git a/yaba-web/public/favicon.ico b/Web/public/favicon.ico similarity index 100% rename from yaba-web/public/favicon.ico rename to Web/public/favicon.ico diff --git a/yaba-web/public/index.html b/Web/public/index.html similarity index 100% rename from yaba-web/public/index.html rename to Web/public/index.html diff --git a/yaba-web/public/logo192.png b/Web/public/logo192.png similarity index 100% rename from yaba-web/public/logo192.png rename to Web/public/logo192.png diff --git a/yaba-web/public/logo512.png b/Web/public/logo512.png similarity index 100% rename from yaba-web/public/logo512.png rename to Web/public/logo512.png diff --git a/yaba-web/public/manifest.json b/Web/public/manifest.json similarity index 100% rename from yaba-web/public/manifest.json rename to Web/public/manifest.json diff --git a/yaba-web/public/robots.txt b/Web/public/robots.txt similarity index 100% rename from yaba-web/public/robots.txt rename to Web/public/robots.txt diff --git a/yaba-web/src/App.js b/Web/src/App.js similarity index 100% rename from yaba-web/src/App.js rename to Web/src/App.js diff --git a/yaba-web/src/api/apiHelper.js b/Web/src/api/apiHelper.js similarity index 100% rename from yaba-web/src/api/apiHelper.js rename to Web/src/api/apiHelper.js diff --git a/yaba-web/src/api/index.js b/Web/src/api/index.js similarity index 100% rename from yaba-web/src/api/index.js rename to Web/src/api/index.js diff --git a/yaba-web/src/api/v1/bookmarks.js b/Web/src/api/v1/bookmarks.js similarity index 100% rename from yaba-web/src/api/v1/bookmarks.js rename to Web/src/api/v1/bookmarks.js diff --git a/yaba-web/src/api/v1/misc.js b/Web/src/api/v1/misc.js similarity index 100% rename from yaba-web/src/api/v1/misc.js rename to Web/src/api/v1/misc.js diff --git a/yaba-web/src/api/v1/tags.js b/Web/src/api/v1/tags.js similarity index 100% rename from yaba-web/src/api/v1/tags.js rename to Web/src/api/v1/tags.js diff --git a/yaba-web/src/components/auth0ProviderWithNavigate.jsx b/Web/src/components/auth0ProviderWithNavigate.jsx similarity index 100% rename from yaba-web/src/components/auth0ProviderWithNavigate.jsx rename to Web/src/components/auth0ProviderWithNavigate.jsx diff --git a/yaba-web/src/components/bookmarks/bookmark.jsx b/Web/src/components/bookmarks/bookmark.jsx similarity index 100% rename from yaba-web/src/components/bookmarks/bookmark.jsx rename to Web/src/components/bookmarks/bookmark.jsx diff --git a/yaba-web/src/components/external/index.js b/Web/src/components/external/index.js similarity index 100% rename from yaba-web/src/components/external/index.js rename to Web/src/components/external/index.js diff --git a/yaba-web/src/components/footer.jsx b/Web/src/components/footer.jsx similarity index 100% rename from yaba-web/src/components/footer.jsx rename to Web/src/components/footer.jsx diff --git a/yaba-web/src/components/header.jsx b/Web/src/components/header.jsx similarity index 100% rename from yaba-web/src/components/header.jsx rename to Web/src/components/header.jsx diff --git a/yaba-web/src/components/index.js b/Web/src/components/index.js similarity index 100% rename from yaba-web/src/components/index.js rename to Web/src/components/index.js diff --git a/yaba-web/src/components/protectedRoute.jsx b/Web/src/components/protectedRoute.jsx similarity index 100% rename from yaba-web/src/components/protectedRoute.jsx rename to Web/src/components/protectedRoute.jsx diff --git a/yaba-web/src/components/shared/interceptModal.jsx b/Web/src/components/shared/interceptModal.jsx similarity index 100% rename from yaba-web/src/components/shared/interceptModal.jsx rename to Web/src/components/shared/interceptModal.jsx diff --git a/yaba-web/src/components/shared/searchForm.jsx b/Web/src/components/shared/searchForm.jsx similarity index 100% rename from yaba-web/src/components/shared/searchForm.jsx rename to Web/src/components/shared/searchForm.jsx diff --git a/yaba-web/src/components/shared/splashScreen.jsx b/Web/src/components/shared/splashScreen.jsx similarity index 100% rename from yaba-web/src/components/shared/splashScreen.jsx rename to Web/src/components/shared/splashScreen.jsx diff --git a/yaba-web/src/components/tags/tag.jsx b/Web/src/components/tags/tag.jsx similarity index 100% rename from yaba-web/src/components/tags/tag.jsx rename to Web/src/components/tags/tag.jsx diff --git a/yaba-web/src/components/tags/upsertTagModal.jsx b/Web/src/components/tags/upsertTagModal.jsx similarity index 100% rename from yaba-web/src/components/tags/upsertTagModal.jsx rename to Web/src/components/tags/upsertTagModal.jsx diff --git a/yaba-web/src/index.js b/Web/src/index.js similarity index 100% rename from yaba-web/src/index.js rename to Web/src/index.js diff --git a/yaba-web/src/styles/component/bookmark.css b/Web/src/styles/component/bookmark.css similarity index 100% rename from yaba-web/src/styles/component/bookmark.css rename to Web/src/styles/component/bookmark.css diff --git a/yaba-web/src/tests/utils/arrayHelper.test.js b/Web/src/tests/utils/arrayHelper.test.js similarity index 100% rename from yaba-web/src/tests/utils/arrayHelper.test.js rename to Web/src/tests/utils/arrayHelper.test.js diff --git a/yaba-web/src/utils/arrayHelper.js b/Web/src/utils/arrayHelper.js similarity index 100% rename from yaba-web/src/utils/arrayHelper.js rename to Web/src/utils/arrayHelper.js diff --git a/yaba-web/src/utils/bookmarkHelper.js b/Web/src/utils/bookmarkHelper.js similarity index 100% rename from yaba-web/src/utils/bookmarkHelper.js rename to Web/src/utils/bookmarkHelper.js diff --git a/yaba-web/src/utils/dateTimeHelper.js b/Web/src/utils/dateTimeHelper.js similarity index 100% rename from yaba-web/src/utils/dateTimeHelper.js rename to Web/src/utils/dateTimeHelper.js diff --git a/yaba-web/src/utils/index.js b/Web/src/utils/index.js similarity index 100% rename from yaba-web/src/utils/index.js rename to Web/src/utils/index.js diff --git a/yaba-web/src/utils/isDevHelper.js b/Web/src/utils/isDevHelper.js similarity index 100% rename from yaba-web/src/utils/isDevHelper.js rename to Web/src/utils/isDevHelper.js diff --git a/yaba-web/src/utils/stringsHelper.js b/Web/src/utils/stringsHelper.js similarity index 100% rename from yaba-web/src/utils/stringsHelper.js rename to Web/src/utils/stringsHelper.js diff --git a/yaba-web/src/utils/tagsHelper.js b/Web/src/utils/tagsHelper.js similarity index 100% rename from yaba-web/src/utils/tagsHelper.js rename to Web/src/utils/tagsHelper.js diff --git a/yaba-web/src/views/baseLayout.jsx b/Web/src/views/baseLayout.jsx similarity index 100% rename from yaba-web/src/views/baseLayout.jsx rename to Web/src/views/baseLayout.jsx diff --git a/yaba-web/src/views/bookmarkDetailView.jsx b/Web/src/views/bookmarkDetailView.jsx similarity index 100% rename from yaba-web/src/views/bookmarkDetailView.jsx rename to Web/src/views/bookmarkDetailView.jsx diff --git a/yaba-web/src/views/bookmarksListView.jsx b/Web/src/views/bookmarksListView.jsx similarity index 100% rename from yaba-web/src/views/bookmarksListView.jsx rename to Web/src/views/bookmarksListView.jsx diff --git a/yaba-web/src/views/homeView.jsx b/Web/src/views/homeView.jsx similarity index 100% rename from yaba-web/src/views/homeView.jsx rename to Web/src/views/homeView.jsx diff --git a/yaba-web/src/views/index.js b/Web/src/views/index.js similarity index 100% rename from yaba-web/src/views/index.js rename to Web/src/views/index.js diff --git a/yaba-web/src/views/notFoundView.jsx b/Web/src/views/notFoundView.jsx similarity index 100% rename from yaba-web/src/views/notFoundView.jsx rename to Web/src/views/notFoundView.jsx diff --git a/yaba-web/src/views/redirectView.jsx b/Web/src/views/redirectView.jsx similarity index 100% rename from yaba-web/src/views/redirectView.jsx rename to Web/src/views/redirectView.jsx diff --git a/yaba-web/src/views/tagsView.jsx b/Web/src/views/tagsView.jsx similarity index 100% rename from yaba-web/src/views/tagsView.jsx rename to Web/src/views/tagsView.jsx diff --git a/yaba-web/src/views/testView.jsx b/Web/src/views/testView.jsx similarity index 100% rename from yaba-web/src/views/testView.jsx rename to Web/src/views/testView.jsx