[SG-998] and [SG-999] Vault and Autofill team refactor (#4542)

* Move DeprecatedVaultFilterService to vault folder

* [libs] move VaultItemsComponent

* [libs] move AddEditComponent

* [libs] move AddEditCustomFields

* [libs] move attachmentsComponent

* [libs] folderAddEditComponent

* [libs] IconComponent

* [libs] PasswordRepormptComponent

* [libs] PremiumComponent

* [libs] ViewCustomFieldsComponent

* [libs] ViewComponent

* [libs] PasswordRepromptService

* [libs] Move FolderService and FolderApiService abstractions

* [libs] FolderService imports

* [libs] PasswordHistoryComponent

* [libs] move Sync and SyncNotifier abstractions

* [libs] SyncService imports

* [libs] fix file casing for passwordReprompt abstraction

* [libs] SyncNotifier import fix

* [libs] CipherServiceAbstraction

* [libs] PasswordRepromptService abstraction

* [libs] Fix file casing for angular passwordReprompt service

* [libs] fix file casing for SyncNotifierService

* [libs] CipherRepromptType

* [libs] rename CipherRepromptType

* [libs] CipherType

* [libs] Rename CipherType

* [libs] CipherData

* [libs] FolderData

* [libs] PasswordHistoryData

* [libs] AttachmentData

* [libs] CardData

* [libs] FieldData

* [libs] IdentityData

* [libs] LocalData

* [libs] LoginData

* [libs] SecureNoteData

* [libs] LoginUriData

* [libs] Domain classes

* [libs] SecureNote

* [libs] Request models

* [libs] Response models

* [libs] View part 1

* [libs] Views part 2

* [libs] Move folder services

* [libs] Views fixes

* [libs] Move sync services

* [libs] cipher service

* [libs] Types

* [libs] Sync file casing

* [libs] Fix folder service import

* [libs] Move spec files

* [libs] casing fixes on spec files

* [browser] Autofill background, clipboard, commands

* [browser] Fix ContextMenusBackground casing

* [browser] Rename fix

* [browser] Autofill content

* [browser] autofill.js

* [libs] enpass importer spec fix

* [browser] autofill models

* [browser] autofill manifest path updates

* [browser] Autofill notification files

* [browser] autofill services

* [browser] Fix file casing

* [browser] Vault popup loose components

* [browser] Vault components

* [browser] Manifest fixes

* [browser] Vault services

* [cli] vault commands and models

* [browser] File capitilization fixes

* [desktop] Vault components and services

* [web] vault loose components

* [web] Vault components

* [browser] Fix misc-utils import

* [libs] Fix psono spec imports

* [fix] Add comments to address lint rules

.eslintignore

@@ -11,7 +11,7 @@ storybook-static
 **/gulpfile.js
 
 apps/browser/config/config.js
-apps/browser/src/content/autofill.js
+apps/browser/src/autofill/content/autofill.js
 apps/browser/src/scripts/duo.js
 
 apps/desktop/desktop_native

.github/whitelist-capital-letters.txt

@@ -27,7 +27,6 @@
 ./libs/angular/src/components/captchaProtected.component.ts
 ./libs/angular/src/validators/inputsFieldMatch.validator.ts
 ./libs/angular/src/validators/notAllowedValueAsync.validator.ts
-./libs/angular/src/services/passwordReprompt.service.ts
 ./libs/angular/src/services/theming/themeBuilder.ts
 ./libs/angular/src/interfaces/selectOptions.ts
 ./libs/components/src/stories/Introduction.stories.mdx
@@ -36,14 +35,7 @@
 ./libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts
 ./libs/common/spec/web/services/webCryptoFunction.service.spec.ts
 ./libs/common/spec/shared/interceptConsole.ts
-./libs/common/spec/models/view/passwordHistoryView.spec.ts
-./libs/common/spec/models/view/cipherView.spec.ts
-./libs/common/spec/models/view/folderView.spec.ts
-./libs/common/spec/models/view/attachmentView.spec.ts
-./libs/common/spec/models/view/loginView.spec.ts
-./libs/common/spec/models/domain/loginUri.spec.ts
 ./libs/common/spec/models/domain/encString.spec.ts
-./libs/common/spec/models/domain/secureNote.spec.ts
 ./libs/common/spec/models/domain/symmetricCryptoKey.spec.ts
 ./libs/common/spec/models/domain/encArrayBuffer.spec.ts
 ./libs/common/spec/models/domain/sendAccess.spec.ts
@@ -63,10 +55,8 @@
 ./libs/common/src/misc/serviceUtils.spec.ts
 ./libs/common/src/types/twoFactorResponse.ts
 ./libs/common/src/types/authResponse.ts
-./libs/common/src/types/syncEventArgs.ts
 ./libs/common/src/enums/kdfType.ts
 ./libs/common/src/enums/fileUploadType.ts
-./libs/common/src/enums/cipherType.ts
 ./libs/common/src/enums/twoFactorProviderType.ts
 ./libs/common/src/enums/clientType.ts
 ./libs/common/src/enums/encryptedExportType.ts
@@ -107,7 +97,6 @@
 ./libs/common/src/enums/authRequestType.ts
 ./libs/common/src/enums/emergencyAccessStatusType.ts
 ./libs/common/src/enums/nativeMessagingVersion.ts
-./libs/common/src/enums/cipherRepromptType.ts
 ./libs/common/src/enums/organizationUserType.ts
 ./libs/common/src/factories/accountFactory.ts
 ./libs/common/src/factories/globalStateFactory.ts
@@ -120,7 +109,6 @@
 ./libs/common/src/abstractions/fileDownload/fileDownload.service.ts
 ./libs/common/src/abstractions/fileDownload/fileDownloadRequest.ts
 ./libs/common/src/abstractions/passwordGeneration.service.ts
-./libs/common/src/abstractions/passwordReprompt.service.ts
 ./libs/common/src/abstractions/formValidationErrors.service.ts
 ./libs/common/src/abstractions/vaultTimeout/vaultTimeoutSettings.service.ts
 ./libs/common/src/abstractions/vaultTimeout/vaultTimeout.service.ts
@@ -131,7 +119,6 @@
 ./libs/common/src/abstractions/appId.service.ts
 ./libs/common/src/abstractions/usernameGeneration.service.ts
 ./libs/common/src/abstractions/twoFactor.service.ts
-./libs/common/src/abstractions/sync/syncNotifier.service.abstraction.ts
 ./libs/common/src/services/userVerification/userVerification-api.service.ts
 ./libs/common/src/services/userVerification/userVerification.service.ts
 ./libs/common/src/services/azureFileUpload.service.ts
@@ -148,7 +135,6 @@
 ./libs/common/src/services/usernameGeneration.service.ts
 ./libs/common/src/services/noopMessaging.service.ts
 ./libs/common/src/services/twoFactor.service.ts
-./libs/common/src/services/sync/syncNotifier.service.ts
 ./libs/common/src/services/memoryStorage.service.ts
 ./libs/common/src/services/bitwardenFileUpload.service.ts
 ./libs/common/src/services/webCryptoFunction.service.ts
@@ -178,24 +164,16 @@
 ./apps/browser/src/background/models/addLoginRuntimeMessage.ts
 ./apps/browser/src/background/models/addChangePasswordQueueMessage.ts
 ./apps/browser/src/background/models/addLoginQueueMessage.ts
-./apps/browser/src/background/models/iconDetails.ts
 ./apps/browser/src/background/models/changePasswordRuntimeMessage.ts
 ./apps/browser/src/background/models/notificationQueueMessage.ts
 ./apps/browser/src/background/models/notificationQueueMessageType.ts
 ./apps/browser/src/background/models/lockedVaultPendingNotificationsItem.ts
-./apps/browser/src/background/contextMenus.background.ts
 ./apps/browser/src/background/webRequest.background.ts
 ./apps/browser/src/popup/services/debounceNavigationService.ts
-./apps/browser/src/content/contextMenuHandler.ts
-./apps/browser/src/content/notificationBar.ts
 ./apps/browser/src/models/browserComponentState.ts
-./apps/browser/src/models/autofillScript.ts
 ./apps/browser/src/models/browserSendComponentState.ts
 ./apps/browser/src/models/browserGroupingsComponentState.ts
 ./apps/browser/src/models/biometricErrors.ts
-./apps/browser/src/models/autofillPageDetails.ts
-./apps/browser/src/models/autofillForm.ts
-./apps/browser/src/models/autofillField.ts
 ./apps/browser/src/browser/safariApp.ts
 ./apps/browser/src/browser/browserApi.ts
 ./apps/browser/src/safari/desktop/ViewController.swift
@@ -222,7 +200,6 @@
 ./apps/browser/src/services/abstractions/abstractKeyGeneration.service.ts
 ./apps/browser/src/services/browserLocalStorage.service.ts
 ./apps/browser/src/services/localBackedSessionStorage.service.ts
-./apps/browser/src/services/vaultFilter.service.ts
 ./apps/browser/src/services/browserMessagingPrivateModePopup.service.ts
 ./apps/browser/src/services/browserMessaging.service.ts
 ./apps/browser/src/services/keyGeneration.service.ts

.prettierignore

@@ -9,7 +9,7 @@ storybook-static
 # External libraries / auto synced locales
 apps/browser/src/_locales
 apps/browser/src/scripts/duo.js
-apps/browser/src/content/autofill.js
+apps/browser/src/autofill/content/autofill.js
 apps/browser/src/safari
 
 apps/desktop/src/locales

apps/browser/src/alarms/alarm-state.ts

@@ -1,5 +1,5 @@
+import { clearClipboardAlarmName } from "../autofill/clipboard";
 import { BrowserApi } from "../browser/browserApi";
-import { clearClipboardAlarmName } from "../clipboard";
 
 export const alarmKeys = [clearClipboardAlarmName] as const;
 export type AlarmKeys = typeof alarmKeys[number];

apps/browser/src/alarms/on-alarm-listener.ts

@@ -1,4 +1,4 @@
-import { ClearClipboard, clearClipboardAlarmName } from "../clipboard";
+import { ClearClipboard, clearClipboardAlarmName } from "../autofill/clipboard";
 
 import { alarmKeys, clearAlarmTime, getAlarmTime } from "./alarm-state";
 

apps/browser/src/autofill/background/context-menus.background.ts

@@ -1,8 +1,7 @@
-import { BrowserApi } from "../browser/browserApi";
+import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem";
+import { BrowserApi } from "../../browser/browserApi";
 import { ContextMenuClickedHandler } from "../browser/context-menu-clicked-handler";
 
-import LockedVaultPendingNotificationsItem from "./models/lockedVaultPendingNotificationsItem";
-
 export default class ContextMenusBackground {
   private contextMenus: typeof chrome.contextMenus;
 

apps/browser/src/autofill/background/notification.background.ts

@@ -1,28 +1,27 @@
 import { firstValueFrom } from "rxjs";
 
 import { AuthService } from "@bitwarden/common/abstractions/auth.service";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
-import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { PolicyType } from "@bitwarden/common/enums/policyType";
 import { ThemeType } from "@bitwarden/common/enums/themeType";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
-import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view";
-import { LoginView } from "@bitwarden/common/models/view/login.view";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
+import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
 
-import { BrowserApi } from "../browser/browserApi";
+import AddChangePasswordQueueMessage from "../../background/models/addChangePasswordQueueMessage";
+import AddLoginQueueMessage from "../../background/models/addLoginQueueMessage";
+import AddLoginRuntimeMessage from "../../background/models/addLoginRuntimeMessage";
+import ChangePasswordRuntimeMessage from "../../background/models/changePasswordRuntimeMessage";
+import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem";
+import { NotificationQueueMessageType } from "../../background/models/notificationQueueMessageType";
+import { BrowserApi } from "../../browser/browserApi";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 import { AutofillService } from "../services/abstractions/autofill.service";
-import { BrowserStateService } from "../services/abstractions/browser-state.service";
-
-import AddChangePasswordQueueMessage from "./models/addChangePasswordQueueMessage";
-import AddLoginQueueMessage from "./models/addLoginQueueMessage";
-import AddLoginRuntimeMessage from "./models/addLoginRuntimeMessage";
-import ChangePasswordRuntimeMessage from "./models/changePasswordRuntimeMessage";
-import LockedVaultPendingNotificationsItem from "./models/lockedVaultPendingNotificationsItem";
-import { NotificationQueueMessageType } from "./models/notificationQueueMessageType";
 
 export default class NotificationBackground {
   private notificationQueue: (AddLoginQueueMessage | AddChangePasswordQueueMessage)[] = [];

apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts

@@ -1,15 +1,30 @@
-import { AutofillService as AbstractAutoFillService } from "../../services/abstractions/autofill.service";
-import AutofillService from "../../services/autofill.service";
-
-import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory";
 import {
   EventCollectionServiceInitOptions,
   eventCollectionServiceFactory,
-} from "./event-collection-service.factory";
-import { CachedServices, factory, FactoryOptions } from "./factory-options";
-import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory";
-import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
-import { totpServiceFactory, TotpServiceInitOptions } from "./totp-service.factory";
+} from "../../../background/service_factories/event-collection-service.factory";
+import {
+  CachedServices,
+  factory,
+  FactoryOptions,
+} from "../../../background/service_factories/factory-options";
+import {
+  logServiceFactory,
+  LogServiceInitOptions,
+} from "../../../background/service_factories/log-service.factory";
+import {
+  stateServiceFactory,
+  StateServiceInitOptions,
+} from "../../../background/service_factories/state-service.factory";
+import {
+  totpServiceFactory,
+  TotpServiceInitOptions,
+} from "../../../background/service_factories/totp-service.factory";
+import {
+  cipherServiceFactory,
+  CipherServiceInitOptions,
+} from "../../../vault/background/service_factories/cipher-service.factory";
+import { AutofillService as AbstractAutoFillService } from "../../services/abstractions/autofill.service";
+import AutofillService from "../../services/autofill.service";
 
 type AutoFillServiceOptions = FactoryOptions;
 

apps/browser/src/autofill/background/tabs.background.ts

@@ -1,4 +1,5 @@
-import MainBackground from "./main.background";
+import MainBackground from "../../background/main.background";
+
 import NotificationBackground from "./notification.background";
 
 export default class TabsBackground {

apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts

@@ -1,10 +1,10 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
 import { AuthService } from "@bitwarden/common/abstractions/auth.service";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
-import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType";
-import { CipherType } from "@bitwarden/common/enums/cipherType";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 
 import { CipherContextMenuHandler } from "./cipher-context-menu-handler";
 import { MainContextMenuHandler } from "./main-context-menu-handler";

apps/browser/src/autofill/browser/cipher-context-menu-handler.ts

@@ -1,27 +1,27 @@
 import { AuthService } from "@bitwarden/common/abstractions/auth.service";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
-import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType";
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import {
   authServiceFactory,
   AuthServiceInitOptions,
-} from "../background/service_factories/auth-service.factory";
+} from "../../background/service_factories/auth-service.factory";
+import { CachedServices } from "../../background/service_factories/factory-options";
+import { searchServiceFactory } from "../../background/service_factories/search-service.factory";
+import { BrowserApi } from "../../browser/browserApi";
+import { Account } from "../../models/account";
 import {
   cipherServiceFactory,
   CipherServiceInitOptions,
-} from "../background/service_factories/cipher-service.factory";
-import { CachedServices } from "../background/service_factories/factory-options";
-import { searchServiceFactory } from "../background/service_factories/search-service.factory";
-import { Account } from "../models/account";
+} from "../../vault/background/service_factories/cipher-service.factory";
 
-import { BrowserApi } from "./browserApi";
 import { MainContextMenuHandler } from "./main-context-menu-handler";
 
 const NOT_IMPLEMENTED = (..._args: unknown[]) => Promise.resolve();

apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts

@@ -1,13 +1,13 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
 import { AuthService } from "@bitwarden/common/abstractions/auth.service";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
-import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType";
-import { CipherType } from "@bitwarden/common/enums/cipherType";
-import { Cipher } from "@bitwarden/common/models/domain/cipher";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import { AutofillTabCommand } from "../commands/autofill-tab-command";
 

apps/browser/src/autofill/browser/context-menu-clicked-handler.ts

@@ -1,35 +1,35 @@
 import { AuthService } from "@bitwarden/common/abstractions/auth.service";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
-import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType";
 import { EventType } from "@bitwarden/common/enums/eventType";
 import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
-import LockedVaultPendingNotificationsItem from "../background/models/lockedVaultPendingNotificationsItem";
+import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem";
 import {
   authServiceFactory,
   AuthServiceInitOptions,
-} from "../background/service_factories/auth-service.factory";
-import { autofillServiceFactory } from "../background/service_factories/autofill-service.factory";
+} from "../../background/service_factories/auth-service.factory";
+import { eventCollectionServiceFactory } from "../../background/service_factories/event-collection-service.factory";
+import { CachedServices } from "../../background/service_factories/factory-options";
+import { passwordGenerationServiceFactory } from "../../background/service_factories/password-generation-service.factory";
+import { searchServiceFactory } from "../../background/service_factories/search-service.factory";
+import { stateServiceFactory } from "../../background/service_factories/state-service.factory";
+import { totpServiceFactory } from "../../background/service_factories/totp-service.factory";
+import { BrowserApi } from "../../browser/browserApi";
+import { Account } from "../../models/account";
 import {
   cipherServiceFactory,
   CipherServiceInitOptions,
-} from "../background/service_factories/cipher-service.factory";
-import { eventCollectionServiceFactory } from "../background/service_factories/event-collection-service.factory";
-import { CachedServices } from "../background/service_factories/factory-options";
-import { passwordGenerationServiceFactory } from "../background/service_factories/password-generation-service.factory";
-import { searchServiceFactory } from "../background/service_factories/search-service.factory";
-import { stateServiceFactory } from "../background/service_factories/state-service.factory";
-import { totpServiceFactory } from "../background/service_factories/totp-service.factory";
-import { BrowserApi } from "../browser/browserApi";
+} from "../../vault/background/service_factories/cipher-service.factory";
+import { autofillServiceFactory } from "../background/service_factories/autofill-service.factory";
 import { copyToClipboard, GeneratePasswordToClipboardCommand } from "../clipboard";
 import { AutofillTabCommand } from "../commands/autofill-tab-command";
-import { Account } from "../models/account";
 
 import {
   AUTOFILL_ID,

apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts

@@ -1,11 +1,11 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { CipherType } from "@bitwarden/common/enums/cipherType";
-import { Cipher } from "@bitwarden/common/models/domain/cipher";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
-import { BrowserStateService } from "../services/abstractions/browser-state.service";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 
 import { MainContextMenuHandler } from "./main-context-menu-handler";
 

apps/browser/src/autofill/browser/main-context-menu-handler.ts

@@ -1,21 +1,21 @@
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
-import { CachedServices } from "../background/service_factories/factory-options";
+import { CachedServices } from "../../background/service_factories/factory-options";
 import {
   i18nServiceFactory,
   I18nServiceInitOptions,
-} from "../background/service_factories/i18n-service.factory";
+} from "../../background/service_factories/i18n-service.factory";
 import {
   stateServiceFactory,
   StateServiceInitOptions,
-} from "../background/service_factories/state-service.factory";
-import { Account } from "../models/account";
-import { BrowserStateService } from "../services/abstractions/browser-state.service";
+} from "../../background/service_factories/state-service.factory";
+import { Account } from "../../models/account";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 
 export const ROOT_ID = "root";
 

apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts

@@ -1,4 +1,4 @@
-import { BrowserApi } from "../browser/browserApi";
+import { BrowserApi } from "../../browser/browserApi";
 
 import { ClearClipboard } from "./clear-clipboard";
 

apps/browser/src/autofill/clipboard/clear-clipboard.ts

@@ -1,4 +1,4 @@
-import { BrowserApi } from "../browser/browserApi";
+import { BrowserApi } from "../../browser/browserApi";
 
 export const clearClipboardAlarmName = "clearClipboard";
 

apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts

@@ -1,4 +1,4 @@
-import { BrowserApi } from "../browser/browserApi";
+import { BrowserApi } from "../../browser/browserApi";
 
 /**
  * Copies text to the clipboard in a MV3 safe way.

apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts

@@ -2,14 +2,14 @@ import { mock, MockProxy } from "jest-mock-extended";
 
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 
-import { setAlarmTime } from "../alarms/alarm-state";
-import { BrowserApi } from "../browser/browserApi";
-import { BrowserStateService } from "../services/abstractions/browser-state.service";
+import { setAlarmTime } from "../../alarms/alarm-state";
+import { BrowserApi } from "../../browser/browserApi";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 
 import { clearClipboardAlarmName } from "./clear-clipboard";
 import { GeneratePasswordToClipboardCommand } from "./generate-password-to-clipboard-command";
 
-jest.mock("../alarms/alarm-state", () => {
+jest.mock("../../alarms/alarm-state", () => {
   return {
     setAlarmTime: jest.fn(),
   };

apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts

@@ -1,7 +1,7 @@
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 
-import { setAlarmTime } from "../alarms/alarm-state";
-import { BrowserStateService } from "../services/abstractions/browser-state.service";
+import { setAlarmTime } from "../../alarms/alarm-state";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 
 import { clearClipboardAlarmName } from "./clear-clipboard";
 import { copyToClipboard } from "./copy-to-clipboard-command";

apps/browser/src/autofill/commands/autofill-tab-command.ts

@@ -1,6 +1,6 @@
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
-import AutofillPageDetails from "../models/autofillPageDetails";
+import AutofillPageDetails from "../models/autofill-page-details";
 import { AutofillService } from "../services/abstractions/autofill.service";
 
 export class AutofillTabCommand {

apps/browser/src/autofill/content/misc-utils.ts

@@ -1,4 +1,4 @@
-import { TabMessage } from "../types/tab-messages";
+import { TabMessage } from "../../types/tab-messages";
 
 async function copyText(text: string) {
   await window.navigator.clipboard.writeText(text);

apps/browser/src/autofill/content/notification-bar.ts

@@ -1,5 +1,5 @@
-import AddLoginRuntimeMessage from "../background/models/addLoginRuntimeMessage";
-import ChangePasswordRuntimeMessage from "../background/models/changePasswordRuntimeMessage";
+import AddLoginRuntimeMessage from "../../background/models/addLoginRuntimeMessage";
+import ChangePasswordRuntimeMessage from "../../background/models/changePasswordRuntimeMessage";
 
 document.addEventListener("DOMContentLoaded", (event) => {
   if (window.location.hostname.endsWith("vault.bitwarden.com")) {

apps/browser/src/autofill/models/autofill-page-details.ts

@@ -1,5 +1,5 @@
-import AutofillField from "./autofillField";
-import AutofillForm from "./autofillForm";
+import AutofillField from "./autofill-field";
+import AutofillForm from "./autofill-form";
 
 export default class AutofillPageDetails {
   documentUUID: string;

apps/browser/src/autofill/services/abstractions/autofill.service.ts

@@ -1,8 +1,8 @@
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
-import AutofillField from "../../models/autofillField";
-import AutofillForm from "../../models/autofillForm";
-import AutofillPageDetails from "../../models/autofillPageDetails";
+import AutofillField from "../../models/autofill-field";
+import AutofillForm from "../../models/autofill-form";
+import AutofillPageDetails from "../../models/autofill-page-details";
 
 export interface PageDetail {
   frameId: number;

apps/browser/src/autofill/services/autofill.service.ts

@@ -1,19 +1,25 @@
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
-import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType";
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { EventType } from "@bitwarden/common/enums/eventType";
 import { FieldType } from "@bitwarden/common/enums/fieldType";
 import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
-import { FieldView } from "@bitwarden/common/models/view/field.view";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
-import { BrowserApi } from "../browser/browserApi";
-import AutofillField from "../models/autofillField";
-import AutofillPageDetails from "../models/autofillPageDetails";
-import AutofillScript from "../models/autofillScript";
+import { BrowserApi } from "../../browser/browserApi";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
+import {
+  AutoFillConstants,
+  CreditCardAutoFillConstants,
+  IdentityAutoFillConstants,
+} from "../../services/autofillConstants";
+import AutofillField from "../models/autofill-field";
+import AutofillPageDetails from "../models/autofill-page-details";
+import AutofillScript from "../models/autofill-script";
 
 import {
   AutoFillOptions,
@@ -21,12 +27,6 @@ import {
   PageDetail,
   FormData,
 } from "./abstractions/autofill.service";
-import { BrowserStateService } from "./abstractions/browser-state.service";
-import {
-  AutoFillConstants,
-  CreditCardAutoFillConstants,
-  IdentityAutoFillConstants,
-} from "./autofillConstants";
 
 export interface GenerateFillScriptOptions {
   skipUsernameOnlyFill: boolean;

apps/browser/src/background/main.background.ts

@@ -3,7 +3,6 @@ import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstracti
 import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/abstractions/appId.service";
 import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.service";
 import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/abstractions/auth.service";
-import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService as CollectionServiceAbstraction } from "@bitwarden/common/abstractions/collection.service";
 import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service";
 import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/abstractions/cryptoFunction.service";
@@ -12,8 +11,6 @@ import { EventCollectionService as EventCollectionServiceAbstraction } from "@bi
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { ExportService as ExportServiceAbstraction } from "@bitwarden/common/abstractions/export.service";
 import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/fileUpload.service";
-import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction";
-import { InternalFolderService as InternalFolderServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
 import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@bitwarden/common/abstractions/keyConnector.service";
 import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service";
@@ -32,8 +29,6 @@ import {
   AbstractMemoryStorageService,
   AbstractStorageService,
 } from "@bitwarden/common/abstractions/storage.service";
-import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/abstractions/sync/sync.service.abstraction";
-import { SyncNotifierService as SyncNotifierServiceAbstraction } from "@bitwarden/common/abstractions/sync/syncNotifier.service.abstraction";
 import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/abstractions/system.service";
 import { TokenService as TokenServiceAbstraction } from "@bitwarden/common/abstractions/token.service";
 import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/abstractions/totp.service";
@@ -45,13 +40,11 @@ import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarde
 import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service";
 import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
 import { AvatarUpdateService } from "@bitwarden/common/services/account/avatar-update.service";
 import { ApiService } from "@bitwarden/common/services/api.service";
 import { AppIdService } from "@bitwarden/common/services/appId.service";
 import { AuditService } from "@bitwarden/common/services/audit.service";
 import { AuthService } from "@bitwarden/common/services/auth.service";
-import { CipherService } from "@bitwarden/common/services/cipher.service";
 import { CollectionService } from "@bitwarden/common/services/collection.service";
 import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service";
 import { ContainerService } from "@bitwarden/common/services/container.service";
@@ -61,7 +54,6 @@ import { EventCollectionService } from "@bitwarden/common/services/event/event-c
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
 import { ExportService } from "@bitwarden/common/services/export.service";
 import { FileUploadService } from "@bitwarden/common/services/fileUpload.service";
-import { FolderApiService } from "@bitwarden/common/services/folder/folder-api.service";
 import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service";
 import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 import { NotificationsService } from "@bitwarden/common/services/notifications.service";
@@ -71,8 +63,6 @@ import { ProviderService } from "@bitwarden/common/services/provider.service";
 import { SearchService } from "@bitwarden/common/services/search.service";
 import { SendService } from "@bitwarden/common/services/send.service";
 import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service";
-import { SyncService } from "@bitwarden/common/services/sync/sync.service";
-import { SyncNotifierService } from "@bitwarden/common/services/sync/syncNotifier.service";
 import { SystemService } from "@bitwarden/common/services/system.service";
 import { TokenService } from "@bitwarden/common/services/token.service";
 import { TotpService } from "@bitwarden/common/services/totp.service";
@@ -82,22 +72,34 @@ import { UserVerificationService } from "@bitwarden/common/services/userVerifica
 import { UsernameGenerationService } from "@bitwarden/common/services/usernameGeneration.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vaultTimeout/vaultTimeoutSettings.service";
 import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service";
+import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
+import { InternalFolderService as InternalFolderServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { SyncNotifierService as SyncNotifierServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync-notifier.service.abstraction";
+import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { CipherService } from "@bitwarden/common/vault/services/cipher.service";
+import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
+import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service";
+import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service";
 
+import ContextMenusBackground from "../autofill/background/context-menus.background";
+import NotificationBackground from "../autofill/background/notification.background";
+import TabsBackground from "../autofill/background/tabs.background";
+import { CipherContextMenuHandler } from "../autofill/browser/cipher-context-menu-handler";
+import { ContextMenuClickedHandler } from "../autofill/browser/context-menu-clicked-handler";
+import { MainContextMenuHandler } from "../autofill/browser/main-context-menu-handler";
+import { AutofillTabCommand } from "../autofill/commands/autofill-tab-command";
+import { AutofillService as AutofillServiceAbstraction } from "../autofill/services/abstractions/autofill.service";
+import AutofillService from "../autofill/services/autofill.service";
 import { BrowserApi } from "../browser/browserApi";
-import { CipherContextMenuHandler } from "../browser/cipher-context-menu-handler";
-import { ContextMenuClickedHandler } from "../browser/context-menu-clicked-handler";
-import { MainContextMenuHandler } from "../browser/main-context-menu-handler";
 import { SafariApp } from "../browser/safariApp";
-import { AutofillTabCommand } from "../commands/autofill-tab-command";
 import { flagEnabled } from "../flags";
 import { UpdateBadge } from "../listeners/update-badge";
 import { Account } from "../models/account";
 import { PopupUtilsService } from "../popup/services/popup-utils.service";
-import { AutofillService as AutofillServiceAbstraction } from "../services/abstractions/autofill.service";
 import { BrowserStateService as StateServiceAbstraction } from "../services/abstractions/browser-state.service";
-import AutofillService from "../services/autofill.service";
 import { BrowserEnvironmentService } from "../services/browser-environment.service";
-import { BrowserFolderService } from "../services/browser-folder.service";
 import { BrowserI18nService } from "../services/browser-i18n.service";
 import { BrowserOrganizationService } from "../services/browser-organization.service";
 import { BrowserPolicyService } from "../services/browser-policy.service";
@@ -110,16 +112,14 @@ import BrowserMessagingPrivateModeBackgroundService from "../services/browserMes
 import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service";
 import { KeyGenerationService } from "../services/keyGeneration.service";
 import { LocalBackedSessionStorageService } from "../services/localBackedSessionStorage.service";
-import { VaultFilterService } from "../services/vaultFilter.service";
 import VaultTimeoutService from "../services/vaultTimeout/vaultTimeout.service";
+import { BrowserFolderService } from "../vault/services/browser-folder.service";
+import { VaultFilterService } from "../vault/services/vault-filter.service";
 
 import CommandsBackground from "./commands.background";
-import ContextMenusBackground from "./contextMenus.background";
 import IdleBackground from "./idle.background";
 import { NativeMessagingBackground } from "./nativeMessaging.background";
-import NotificationBackground from "./notification.background";
 import RuntimeBackground from "./runtime.background";
-import TabsBackground from "./tabs.background";
 import WebRequestBackground from "./webRequest.background";
 
 export default class MainBackground {

apps/browser/src/background/runtime.background.ts

@@ -5,8 +5,8 @@ import { NotificationsService } from "@bitwarden/common/abstractions/notificatio
 import { SystemService } from "@bitwarden/common/abstractions/system.service";
 import { Utils } from "@bitwarden/common/misc/utils";
 
+import { AutofillService } from "../autofill/services/abstractions/autofill.service";
 import { BrowserApi } from "../browser/browserApi";
-import { AutofillService } from "../services/abstractions/autofill.service";
 import { BrowserEnvironmentService } from "../services/browser-environment.service";
 import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service";
 

apps/browser/src/background/service_factories/event-collection-service.factory.ts

@@ -1,7 +1,11 @@
 import { EventCollectionService as AbstractEventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
 
-import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory";
+import {
+  cipherServiceFactory,
+  CipherServiceInitOptions,
+} from "../../vault/background/service_factories/cipher-service.factory";
+
 import {
   eventUploadServiceFactory,
   EventUploadServiceInitOptions,

apps/browser/src/background/service_factories/search-service.factory.ts

@@ -1,7 +1,11 @@
 import { SearchService as AbstractSearchService } from "@bitwarden/common/abstractions/search.service";
 import { SearchService } from "@bitwarden/common/services/search.service";
 
-import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory";
+import {
+  cipherServiceFactory,
+  CipherServiceInitOptions,
+} from "../../vault/background/service_factories/cipher-service.factory";
+
 import { CachedServices, factory, FactoryOptions } from "./factory-options";
 import { i18nServiceFactory, I18nServiceInitOptions } from "./i18n-service.factory";
 import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory";

apps/browser/src/background/service_factories/vault-timeout-service.factory.ts

@@ -1,16 +1,22 @@
 import { VaultTimeoutService as AbstractVaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 
 import VaultTimeoutService from "../../services/vaultTimeout/vaultTimeout.service";
+import {
+  cipherServiceFactory,
+  CipherServiceInitOptions,
+} from "../../vault/background/service_factories/cipher-service.factory";
+import {
+  folderServiceFactory,
+  FolderServiceInitOptions,
+} from "../../vault/background/service_factories/folder-service.factory";
 
 import { authServiceFactory, AuthServiceInitOptions } from "./auth-service.factory";
-import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory";
 import {
   collectionServiceFactory,
   CollectionServiceInitOptions,
 } from "./collection-service.factory";
 import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory";
 import { CachedServices, factory, FactoryOptions } from "./factory-options";
-import { folderServiceFactory, FolderServiceInitOptions } from "./folder-service.factory";
 import {
   keyConnectorServiceFactory,
   KeyConnectorServiceInitOptions,

apps/browser/src/background/webRequest.background.ts

@@ -1,8 +1,8 @@
 import { AuthService } from "@bitwarden/common/abstractions/auth.service";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
 import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 
 import { BrowserApi } from "../browser/browserApi";
 

apps/browser/src/listeners/index.ts

@@ -1,5 +1,5 @@
-import { CipherContextMenuHandler } from "../browser/cipher-context-menu-handler";
-import { ContextMenuClickedHandler } from "../browser/context-menu-clicked-handler";
+import { CipherContextMenuHandler } from "../autofill/browser/cipher-context-menu-handler";
+import { ContextMenuClickedHandler } from "../autofill/browser/context-menu-clicked-handler";
 
 import { combine } from "./combine";
 import { onCommandListener } from "./onCommandListener";

apps/browser/src/listeners/onCommandListener.ts

@@ -3,8 +3,10 @@ import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStat
 import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
 
+import { autofillServiceFactory } from "../autofill/background/service_factories/autofill-service.factory";
+import { GeneratePasswordToClipboardCommand } from "../autofill/clipboard";
+import { AutofillTabCommand } from "../autofill/commands/autofill-tab-command";
 import { authServiceFactory } from "../background/service_factories/auth-service.factory";
-import { autofillServiceFactory } from "../background/service_factories/autofill-service.factory";
 import { CachedServices } from "../background/service_factories/factory-options";
 import { logServiceFactory } from "../background/service_factories/log-service.factory";
 import {
@@ -13,8 +15,6 @@ import {
 } from "../background/service_factories/password-generation-service.factory";
 import { stateServiceFactory } from "../background/service_factories/state-service.factory";
 import { BrowserApi } from "../browser/browserApi";
-import { GeneratePasswordToClipboardCommand } from "../clipboard";
-import { AutofillTabCommand } from "../commands/autofill-tab-command";
 import { Account } from "../models/account";
 
 export const onCommandListener = async (command: string, tab: chrome.tabs.Tab) => {

apps/browser/src/listeners/update-badge.ts

@@ -1,5 +1,4 @@
 import { AuthService } from "@bitwarden/common/abstractions/auth.service";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service";
 import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
@@ -7,16 +6,17 @@ import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
 import { ContainerService } from "@bitwarden/common/services/container.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 
-import IconDetails from "../background/models/iconDetails";
 import { authServiceFactory } from "../background/service_factories/auth-service.factory";
-import { cipherServiceFactory } from "../background/service_factories/cipher-service.factory";
 import { searchServiceFactory } from "../background/service_factories/search-service.factory";
 import { stateServiceFactory } from "../background/service_factories/state-service.factory";
 import { BrowserApi } from "../browser/browserApi";
 import { Account } from "../models/account";
 import { BrowserStateService } from "../services/abstractions/browser-state.service";
 import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service";
+import IconDetails from "../vault/background/models/icon-details";
+import { cipherServiceFactory } from "../vault/background/service_factories/cipher-service.factory";
 
 export type BadgeOptions = {
   tab?: chrome.tabs.Tab;

apps/browser/src/models/browserGroupingsComponentState.ts

@@ -1,9 +1,9 @@
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/models/view/collection.view";
-import { FolderView } from "@bitwarden/common/models/view/folder.view";
 import { DeepJsonify } from "@bitwarden/common/types/deep-jsonify";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
 import { BrowserComponentState } from "./browserComponentState";
 

apps/browser/src/popup/accounts/login.component.ts

@@ -15,8 +15,8 @@ import { LoginService } from "@bitwarden/common/abstractions/login.service";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction";
 import { Utils } from "@bitwarden/common/misc/utils";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 @Component({
   selector: "app-login",

apps/browser/src/popup/accounts/set-password.component.ts

@@ -13,7 +13,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 @Component({
   selector: "app-set-password",

apps/browser/src/popup/accounts/sso.component.ts

@@ -11,9 +11,9 @@ import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 import { BrowserApi } from "../../browser/browserApi";
 

apps/browser/src/popup/accounts/two-factor.component.ts

@@ -14,9 +14,9 @@ import { LoginService } from "@bitwarden/common/abstractions/login.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction";
 import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service";
 import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 import { BrowserApi } from "../../browser/browserApi";
 import { PopupUtilsService } from "../services/popup-utils.service";

apps/browser/src/popup/accounts/update-temp-password.component.ts

@@ -10,7 +10,7 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 @Component({
   selector: "app-update-temp-password",

apps/browser/src/popup/app-routing.module.ts

@@ -5,6 +5,15 @@ import { AuthGuard } from "@bitwarden/angular/guards/auth.guard";
 import { LockGuard } from "@bitwarden/angular/guards/lock.guard";
 import { UnauthGuard } from "@bitwarden/angular/guards/unauth.guard";
 
+import { AddEditComponent } from "../vault/popup/components/vault/add-edit.component";
+import { AttachmentsComponent } from "../vault/popup/components/vault/attachments.component";
+import { CurrentTabComponent } from "../vault/popup/components/vault/current-tab.component";
+import { PasswordHistoryComponent } from "../vault/popup/components/vault/password-history.component";
+import { ShareComponent } from "../vault/popup/components/vault/share.component";
+import { VaultFilterComponent } from "../vault/popup/components/vault/vault-filter.component";
+import { VaultItemsComponent } from "../vault/popup/components/vault/vault-items.component";
+import { ViewComponent } from "../vault/popup/components/vault/view.component";
+
 import { EnvironmentComponent } from "./accounts/environment.component";
 import { HintComponent } from "./accounts/hint.component";
 import { HomeComponent } from "./accounts/home.component";
@@ -32,15 +41,7 @@ import { PremiumComponent } from "./settings/premium.component";
 import { SettingsComponent } from "./settings/settings.component";
 import { SyncComponent } from "./settings/sync.component";
 import { TabsComponent } from "./tabs.component";
-import { AddEditComponent } from "./vault/add-edit.component";
-import { AttachmentsComponent } from "./vault/attachments.component";
 import { CollectionsComponent } from "./vault/collections.component";
-import { CurrentTabComponent } from "./vault/current-tab.component";
-import { PasswordHistoryComponent } from "./vault/password-history.component";
-import { ShareComponent } from "./vault/share.component";
-import { VaultFilterComponent } from "./vault/vault-filter.component";
-import { VaultItemsComponent } from "./vault/vault-items.component";
-import { ViewComponent } from "./vault/view.component";
 
 const routes: Routes = [
   {

apps/browser/src/popup/app.module.ts

@@ -67,6 +67,22 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { ColorPasswordCountPipe } from "@bitwarden/angular/pipes/color-password-count.pipe";
 import { ColorPasswordPipe } from "@bitwarden/angular/pipes/color-password.pipe";
 
+import { CollectionsComponent } from "../popup/vault/collections.component";
+import { ActionButtonsComponent } from "../vault/popup/components/action-buttons.component";
+import { CipherRowComponent } from "../vault/popup/components/cipher-row.component";
+import { PasswordRepromptComponent } from "../vault/popup/components/password-reprompt.component";
+import { AddEditCustomFieldsComponent } from "../vault/popup/components/vault/add-edit-custom-fields.component";
+import { AddEditComponent } from "../vault/popup/components/vault/add-edit.component";
+import { AttachmentsComponent } from "../vault/popup/components/vault/attachments.component";
+import { CurrentTabComponent } from "../vault/popup/components/vault/current-tab.component";
+import { PasswordHistoryComponent } from "../vault/popup/components/vault/password-history.component";
+import { ShareComponent } from "../vault/popup/components/vault/share.component";
+import { VaultFilterComponent } from "../vault/popup/components/vault/vault-filter.component";
+import { VaultItemsComponent } from "../vault/popup/components/vault/vault-items.component";
+import { VaultSelectComponent } from "../vault/popup/components/vault/vault-select.component";
+import { ViewCustomFieldsComponent } from "../vault/popup/components/vault/view-custom-fields.component";
+import { ViewComponent } from "../vault/popup/components/vault/view.component";
+
 import { EnvironmentComponent } from "./accounts/environment.component";
 import { HintComponent } from "./accounts/hint.component";
 import { HomeComponent } from "./accounts/home.component";
@@ -81,9 +97,6 @@ import { TwoFactorComponent } from "./accounts/two-factor.component";
 import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component";
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";
-import { ActionButtonsComponent } from "./components/action-buttons.component";
-import { CipherRowComponent } from "./components/cipher-row.component";
-import { PasswordRepromptComponent } from "./components/password-reprompt.component";
 import { PopOutComponent } from "./components/pop-out.component";
 import { PrivateModeWarningComponent } from "./components/private-mode-warning.component";
 import { SendListComponent } from "./components/send-list.component";
@@ -107,18 +120,6 @@ import { SettingsComponent } from "./settings/settings.component";
 import { SyncComponent } from "./settings/sync.component";
 import { VaultTimeoutInputComponent } from "./settings/vault-timeout-input.component";
 import { TabsComponent } from "./tabs.component";
-import { AddEditCustomFieldsComponent } from "./vault/add-edit-custom-fields.component";
-import { AddEditComponent } from "./vault/add-edit.component";
-import { AttachmentsComponent } from "./vault/attachments.component";
-import { CollectionsComponent } from "./vault/collections.component";
-import { CurrentTabComponent } from "./vault/current-tab.component";
-import { PasswordHistoryComponent } from "./vault/password-history.component";
-import { ShareComponent } from "./vault/share.component";
-import { VaultFilterComponent } from "./vault/vault-filter.component";
-import { VaultItemsComponent } from "./vault/vault-items.component";
-import { VaultSelectComponent } from "./vault/vault-select.component";
-import { ViewCustomFieldsComponent } from "./vault/view-custom-fields.component";
-import { ViewComponent } from "./vault/view.component";
 
 registerLocaleData(localeAr, "ar");
 registerLocaleData(localeAz, "az");

apps/browser/src/popup/generator/generator.component.ts

@@ -9,7 +9,7 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { UsernameGenerationService } from "@bitwarden/common/abstractions/usernameGeneration.service";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 @Component({
   selector: "app-generator",

apps/browser/src/popup/send/send-groupings.component.ts

@@ -10,9 +10,9 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { SendService } from "@bitwarden/common/abstractions/send.service";
-import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction";
 import { SendType } from "@bitwarden/common/enums/sendType";
 import { SendView } from "@bitwarden/common/models/view/send.view";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 import { BrowserSendComponentState } from "../../models/browserSendComponentState";
 import { BrowserStateService } from "../../services/abstractions/browser-state.service";

apps/browser/src/popup/services/popup-search.service.ts

@@ -1,7 +1,7 @@
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service";
 import { SearchService } from "@bitwarden/common/services/search.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 
 export class PopupSearchService extends SearchService {
   constructor(

apps/browser/src/popup/services/services.module.ts

@@ -10,7 +10,6 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/abstractions/auth.service";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { ConfigApiServiceAbstraction } from "@bitwarden/common/abstractions/config/config-api.service.abstraction";
 import { ConfigServiceAbstraction } from "@bitwarden/common/abstractions/config/config.service.abstraction";
@@ -23,11 +22,6 @@ import { EventUploadService } from "@bitwarden/common/abstractions/event/event-u
 import { ExportService } from "@bitwarden/common/abstractions/export.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { FileUploadService } from "@bitwarden/common/abstractions/fileUpload.service";
-import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction";
-import {
-  FolderService,
-  InternalFolderService,
-} from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
 import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
 import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service";
@@ -36,7 +30,6 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi
 import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
-import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
 import {
@@ -56,7 +49,6 @@ import {
   AbstractMemoryStorageService,
   AbstractStorageService,
 } from "@bitwarden/common/abstractions/storage.service";
-import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction";
 import { TokenService } from "@bitwarden/common/abstractions/token.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service";
@@ -69,19 +61,26 @@ import { GlobalState } from "@bitwarden/common/models/domain/global-state";
 import { AuthService } from "@bitwarden/common/services/auth.service";
 import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service";
 import { ContainerService } from "@bitwarden/common/services/container.service";
-import { FolderApiService } from "@bitwarden/common/services/folder/folder-api.service";
 import { LoginService } from "@bitwarden/common/services/login.service";
 import { PolicyApiService } from "@bitwarden/common/services/policy/policy-api.service";
 import { SearchService } from "@bitwarden/common/services/search.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
+import {
+  FolderService,
+  InternalFolderService,
+} from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
 
+import { AutofillService } from "../../autofill/services/abstractions/autofill.service";
 import MainBackground from "../../background/main.background";
 import { BrowserApi } from "../../browser/browserApi";
 import { Account } from "../../models/account";
-import { AutofillService } from "../../services/abstractions/autofill.service";
 import { BrowserStateService as StateServiceAbstraction } from "../../services/abstractions/browser-state.service";
 import { BrowserConfigService } from "../../services/browser-config.service";
 import { BrowserEnvironmentService } from "../../services/browser-environment.service";
-import { BrowserFolderService } from "../../services/browser-folder.service";
 import { BrowserI18nService } from "../../services/browser-i18n.service";
 import { BrowserOrganizationService } from "../../services/browser-organization.service";
 import { BrowserPolicyService } from "../../services/browser-policy.service";
@@ -90,12 +89,13 @@ import { BrowserStateService } from "../../services/browser-state.service";
 import { BrowserFileDownloadService } from "../../services/browserFileDownloadService";
 import BrowserMessagingService from "../../services/browserMessaging.service";
 import BrowserMessagingPrivateModePopupService from "../../services/browserMessagingPrivateModePopup.service";
-import { VaultFilterService } from "../../services/vaultFilter.service";
+import { PasswordRepromptService } from "../../vault/popup/services/password-reprompt.service";
+import { BrowserFolderService } from "../../vault/services/browser-folder.service";
+import { VaultFilterService } from "../../vault/services/vault-filter.service";
 
 import { DebounceNavigationService } from "./debounceNavigationService";
 import { InitService } from "./init.service";
 import { LockGuardService } from "./lock-guard.service";
-import { PasswordRepromptService } from "./password-reprompt.service";
 import { PopupSearchService } from "./popup-search.service";
 import { PopupUtilsService } from "./popup-utils.service";
 import { UnauthGuardService } from "./unauth-guard.service";

apps/browser/src/popup/settings/folder-add-edit.component.ts

@@ -2,12 +2,12 @@ import { Component } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { first } from "rxjs/operators";
 
-import { FolderAddEditComponent as BaseFolderAddEditComponent } from "@bitwarden/angular/components/folder-add-edit.component";
-import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction";
-import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
+import { FolderAddEditComponent as BaseFolderAddEditComponent } from "@bitwarden/angular/vault/components/folder-add-edit.component";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
+import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 
 @Component({
   selector: "app-folder-add-edit",

apps/browser/src/popup/settings/folders.component.ts

@@ -2,8 +2,8 @@ import { Component } from "@angular/core";
 import { Router } from "@angular/router";
 import { map, Observable } from "rxjs";
 
-import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
-import { FolderView } from "@bitwarden/common/models/view/folder.view";
+import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
 @Component({
   selector: "app-folders",

apps/browser/src/popup/settings/premium.component.ts

@@ -1,7 +1,7 @@
 import { CurrencyPipe, Location } from "@angular/common";
 import { Component } from "@angular/core";
 
-import { PremiumComponent as BasePremiumComponent } from "@bitwarden/angular/components/premium.component";
+import { PremiumComponent as BasePremiumComponent } from "@bitwarden/angular/vault/components/premium.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";

apps/browser/src/popup/settings/sync.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 @Component({
   selector: "app-sync",

apps/browser/src/popup/vault/collections.component.ts

@@ -4,11 +4,11 @@ import { ActivatedRoute } from "@angular/router";
 import { first } from "rxjs/operators";
 
 import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/components/collections.component";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 
 @Component({
   selector: "app-vault-collections",

apps/browser/src/vault/background/service_factories/cipher-service.factory.ts

@@ -1,19 +1,44 @@
-import { CipherService as AbstractCipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
-import { CipherService } from "@bitwarden/common/services/cipher.service";
+import { CipherService as AbstractCipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherService } from "@bitwarden/common/vault/services/cipher.service";
 
-import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory";
-import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory";
-import { encryptServiceFactory, EncryptServiceInitOptions } from "./encrypt-service.factory";
-import { CachedServices, factory, FactoryOptions } from "./factory-options";
+import {
+  apiServiceFactory,
+  ApiServiceInitOptions,
+} from "../../../background/service_factories/api-service.factory";
+import {
+  cryptoServiceFactory,
+  CryptoServiceInitOptions,
+} from "../../../background/service_factories/crypto-service.factory";
+import {
+  encryptServiceFactory,
+  EncryptServiceInitOptions,
+} from "../../../background/service_factories/encrypt-service.factory";
+import {
+  CachedServices,
+  factory,
+  FactoryOptions,
+} from "../../../background/service_factories/factory-options";
 import {
   FileUploadServiceInitOptions,
   fileUploadServiceFactory,
-} from "./file-upload-service.factory";
-import { i18nServiceFactory, I18nServiceInitOptions } from "./i18n-service.factory";
-import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory";
-import { SettingsServiceInitOptions, settingsServiceFactory } from "./settings-service.factory";
-import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
+} from "../../../background/service_factories/file-upload-service.factory";
+import {
+  i18nServiceFactory,
+  I18nServiceInitOptions,
+} from "../../../background/service_factories/i18n-service.factory";
+import {
+  logServiceFactory,
+  LogServiceInitOptions,
+} from "../../../background/service_factories/log-service.factory";
+import {
+  SettingsServiceInitOptions,
+  settingsServiceFactory,
+} from "../../../background/service_factories/settings-service.factory";
+import {
+  stateServiceFactory,
+  StateServiceInitOptions,
+} from "../../../background/service_factories/state-service.factory";
 
 type CipherServiceFactoryOptions = FactoryOptions & {
   cipherServiceOptions?: {

apps/browser/src/vault/background/service_factories/folder-service.factory.ts

@@ -1,15 +1,25 @@
-import { FolderService as AbstractFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
+import { FolderService as AbstractFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 
-import { BrowserFolderService } from "../../services/browser-folder.service";
-
-import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory";
-import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory";
-import { CachedServices, factory, FactoryOptions } from "./factory-options";
-import { i18nServiceFactory, I18nServiceInitOptions } from "./i18n-service.factory";
+import {
+  cryptoServiceFactory,
+  CryptoServiceInitOptions,
+} from "../../../background/service_factories/crypto-service.factory";
+import {
+  CachedServices,
+  factory,
+  FactoryOptions,
+} from "../../../background/service_factories/factory-options";
+import {
+  i18nServiceFactory,
+  I18nServiceInitOptions,
+} from "../../../background/service_factories/i18n-service.factory";
 import {
   stateServiceFactory as stateServiceFactory,
   StateServiceInitOptions,
-} from "./state-service.factory";
+} from "../../../background/service_factories/state-service.factory";
+import { BrowserFolderService } from "../../services/browser-folder.service";
+
+import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory";
 
 type FolderServiceFactoryOptions = FactoryOptions;
 

apps/browser/src/vault/background/service_factories/sync-notifier-service.factory.ts

@@ -1,7 +1,11 @@
-import { SyncNotifierService as AbstractSyncNotifierService } from "@bitwarden/common/abstractions/sync/syncNotifier.service.abstraction";
-import { SyncNotifierService } from "@bitwarden/common/services/sync/syncNotifier.service";
+import { SyncNotifierService as AbstractSyncNotifierService } from "@bitwarden/common/vault/abstractions/sync/sync-notifier.service.abstraction";
+import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service";
 
-import { FactoryOptions, CachedServices, factory } from "./factory-options";
+import {
+  FactoryOptions,
+  CachedServices,
+  factory,
+} from "../../../background/service_factories/factory-options";
 
 type SyncNotifierServiceFactoryOptions = FactoryOptions;
 

apps/browser/src/vault/popup/components/action-buttons.component.ts

@@ -2,14 +2,14 @@ import { Component, EventEmitter, Input, Output } from "@angular/core";
 
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
-import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType";
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { EventType } from "@bitwarden/common/enums/eventType";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
+import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
+import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 @Component({
   selector: "app-action-buttons",

apps/browser/src/vault/popup/components/cipher-row.component.ts

@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
 
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 @Component({
   selector: "app-cipher-row",

apps/browser/src/vault/popup/components/password-reprompt.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "@bitwarden/angular/components/password-reprompt.component";
+import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "@bitwarden/angular/vault/components/password-reprompt.component";
 
 @Component({
   templateUrl: "password-reprompt.component.html",

apps/browser/src/vault/popup/components/vault/add-edit-custom-fields.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/components/add-edit-custom-fields.component";
+import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/vault/components/add-edit-custom-fields.component";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 

apps/browser/src/vault/popup/components/vault/add-edit.component.ts

@@ -3,25 +3,25 @@ import { Component } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { first } from "rxjs/operators";
 
-import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/components/add-edit.component";
+import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/vault/components/add-edit.component";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { CipherType } from "@bitwarden/common/enums/cipherType";
-import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 
-import { BrowserApi } from "../../browser/browserApi";
-import { PopupUtilsService } from "../services/popup-utils.service";
+import { BrowserApi } from "../../../../browser/browserApi";
+import { PopupUtilsService } from "../../../../popup/services/popup-utils.service";
 
 @Component({
   selector: "app-vault-add-edit",

apps/browser/src/vault/popup/components/vault/attachments.component.ts

@@ -3,15 +3,15 @@ import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { first } from "rxjs/operators";
 
-import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/components/attachments.component";
+import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/vault/components/attachments.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 
 @Component({
   selector: "app-vault-attachments",

apps/browser/src/vault/popup/components/vault/current-tab.component.ts

@@ -4,23 +4,23 @@ import { Subject } from "rxjs";
 import { debounceTime, takeUntil } from "rxjs/operators";
 
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction";
-import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType";
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
-import { BrowserApi } from "../../browser/browserApi";
-import { AutofillService } from "../../services/abstractions/autofill.service";
-import { VaultFilterService } from "../../services/vaultFilter.service";
-import { PopupUtilsService } from "../services/popup-utils.service";
+import { AutofillService } from "../../../../autofill/services/abstractions/autofill.service";
+import { BrowserApi } from "../../../../browser/browserApi";
+import { PopupUtilsService } from "../../../../popup/services/popup-utils.service";
+import { VaultFilterService } from "../../../services/vault-filter.service";
 
 const BroadcasterSubscriptionId = "CurrentTabComponent";
 

apps/browser/src/vault/popup/components/vault/password-history.component.ts

@@ -3,10 +3,10 @@ import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { first } from "rxjs/operators";
 
-import { PasswordHistoryComponent as BasePasswordHistoryComponent } from "@bitwarden/angular/components/password-history.component";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
+import { PasswordHistoryComponent as BasePasswordHistoryComponent } from "@bitwarden/angular/vault/components/password-history.component";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 
 @Component({
   selector: "app-password-history",

apps/browser/src/vault/popup/components/vault/share.component.ts

@@ -3,12 +3,12 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { first } from "rxjs/operators";
 
 import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 
 @Component({
   selector: "app-vault-share",

apps/browser/src/vault/popup/components/vault/vault-filter.component.ts

@@ -6,21 +6,21 @@ import { first } from "rxjs/operators";
 
 import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
-import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction";
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/models/view/collection.view";
-import { FolderView } from "@bitwarden/common/models/view/folder.view";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
-import { BrowserApi } from "../../browser/browserApi";
-import { BrowserGroupingsComponentState } from "../../models/browserGroupingsComponentState";
-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
-import { VaultFilterService } from "../../services/vaultFilter.service";
-import { PopupUtilsService } from "../services/popup-utils.service";
+import { BrowserApi } from "../../../../browser/browserApi";
+import { BrowserGroupingsComponentState } from "../../../../models/browserGroupingsComponentState";
+import { PopupUtilsService } from "../../../../popup/services/popup-utils.service";
+import { BrowserStateService } from "../../../../services/abstractions/browser-state.service";
+import { VaultFilterService } from "../../../services/vault-filter.service";
 
 const ComponentId = "VaultComponent";
 

apps/browser/src/vault/popup/components/vault/vault-items.component.ts

@@ -3,27 +3,27 @@ import { ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit } from "@angula
 import { ActivatedRoute, Router } from "@angular/router";
 import { first } from "rxjs/operators";
 
-import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angular/components/vault-items.component";
+import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angular/vault/components/vault-items.component";
 import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
-import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/models/view/collection.view";
-import { FolderView } from "@bitwarden/common/models/view/folder.view";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
-import { BrowserApi } from "../../browser/browserApi";
-import { BrowserComponentState } from "../../models/browserComponentState";
-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
-import { VaultFilterService } from "../../services/vaultFilter.service";
-import { PopupUtilsService } from "../services/popup-utils.service";
+import { BrowserApi } from "../../../../browser/browserApi";
+import { BrowserComponentState } from "../../../../models/browserComponentState";
+import { PopupUtilsService } from "../../../../popup/services/popup-utils.service";
+import { BrowserStateService } from "../../../../services/abstractions/browser-state.service";
+import { VaultFilterService } from "../../../services/vault-filter.service";
 
 const ComponentId = "VaultItemsComponent";
 

apps/browser/src/vault/popup/components/vault/vault-select.component.ts

@@ -23,7 +23,7 @@ import {
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { Organization } from "@bitwarden/common/models/domain/organization";
 
-import { VaultFilterService } from "../../services/vaultFilter.service";
+import { VaultFilterService } from "../../../services/vault-filter.service";
 
 @Component({
   selector: "app-vault-select",

apps/browser/src/vault/popup/components/vault/view-custom-fields.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { ViewCustomFieldsComponent as BaseViewCustomFieldsComponent } from "@bitwarden/angular/components/view-custom-fields.component";
+import { ViewCustomFieldsComponent as BaseViewCustomFieldsComponent } from "@bitwarden/angular/vault/components/view-custom-fields.component";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 
 @Component({

apps/browser/src/vault/popup/components/vault/view.component.ts

@@ -3,30 +3,30 @@ import { ChangeDetectorRef, Component, NgZone } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { first } from "rxjs/operators";
 
-import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/components/view.component";
+import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/vault/components/view.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
-import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { TokenService } from "@bitwarden/common/abstractions/token.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
-import { CipherType } from "@bitwarden/common/enums/cipherType";
-import { Cipher } from "@bitwarden/common/models/domain/cipher";
-import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
+import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 
-import { BrowserApi } from "../../browser/browserApi";
-import { AutofillService } from "../../services/abstractions/autofill.service";
-import { PopupUtilsService } from "../services/popup-utils.service";
+import { AutofillService } from "../../../../autofill/services/abstractions/autofill.service";
+import { BrowserApi } from "../../../../browser/browserApi";
+import { PopupUtilsService } from "../../../../popup/services/popup-utils.service";
 
 const BroadcasterSubscriptionId = "ChildViewComponent";
 

apps/browser/src/vault/popup/services/password-reprompt.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from "@angular/core";
 
-import { PasswordRepromptService as BasePasswordRepromptService } from "@bitwarden/angular/services/passwordReprompt.service";
+import { PasswordRepromptService as BasePasswordRepromptService } from "@bitwarden/angular/vault/services/password-reprompt.service";
 
 import { PasswordRepromptComponent } from "../components/password-reprompt.component";
 

apps/browser/src/vault/services/browser-folder.service.ts

@@ -1,10 +1,10 @@
 import { BehaviorSubject } from "rxjs";
 
-import { Folder } from "@bitwarden/common/models/domain/folder";
-import { FolderView } from "@bitwarden/common/models/view/folder.view";
-import { FolderService as BaseFolderService } from "@bitwarden/common/services/folder/folder.service";
+import { Folder } from "@bitwarden/common/vault/models/domain/folder";
+import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
+import { FolderService as BaseFolderService } from "@bitwarden/common/vault/services/folder/folder.service";
 
-import { browserSession, sessionSync } from "../decorators/session-sync-observable";
+import { browserSession, sessionSync } from "../../decorators/session-sync-observable";
 
 @browserSession
 export class BrowserFolderService extends BaseFolderService {

apps/browser/src/vault/services/vault-filter.service.ts

@@ -1,12 +1,12 @@
 import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { VaultFilterService as BaseVaultFilterService } from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service";
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
-import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 export class VaultFilterService extends BaseVaultFilterService {
   vaultFilter: VaultFilter = new VaultFilter();