[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

libs/common/spec/importers/chrome-csv-importer.spec.ts

@@ -1,7 +1,7 @@
 import { ChromeCsvImporter as Importer } from "@bitwarden/common/importers/chrome-csv-importer";
-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 { 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 { data as androidData } from "./test-data/chrome-csv/android-data.csv";
 import { data as simplePasswordData } from "./test-data/chrome-csv/simple-password-data.csv";

libs/common/spec/importers/dashlane-csv-importer.spec.ts

@@ -1,5 +1,5 @@
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { DashlaneCsvImporter as Importer } from "@bitwarden/common/importers/dashlane/dashlane-csv-importer";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 
 import { credentialsData } from "./test-data/dashlane-csv/credentials.csv";
 import { identityData } from "./test-data/dashlane-csv/id.csv";

libs/common/spec/importers/enpass/enpass-json-importer.spec.ts

@@ -1,6 +1,6 @@
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { EnpassJsonImporter as Importer } from "@bitwarden/common/importers/enpass/enpass-json-importer";
-import { FieldView } from "@bitwarden/common/models/view/field.view";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
 import { creditCard } from "./test-data/json/credit-card";
 import { folders } from "./test-data/json/folders";

libs/common/spec/importers/firefox-csv-importer.spec.ts

@@ -1,7 +1,7 @@
 import { FirefoxCsvImporter as Importer } from "@bitwarden/common/importers/firefox-csv-importer";
-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 { 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 { data as firefoxAccountsData } from "./test-data/firefox-csv/firefox-accounts-data.csv";
 import { data as simplePasswordData } from "./test-data/firefox-csv/simple-password-data.csv";

libs/common/spec/importers/keepass2-xml-importer.spec.ts

@@ -1,5 +1,5 @@
 import { KeePass2XmlImporter as Importer } from "@bitwarden/common/importers/keepass2-xml-importer";
-import { FolderView } from "@bitwarden/common/models/view/folder.view";
+import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
 import { TestData, TestData1, TestData2 } from "./keepass2-xml-importer-testdata";
 

libs/common/spec/importers/lastpass-csv-importer.spec.ts

@@ -1,9 +1,9 @@
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { FieldType } from "@bitwarden/common/enums/fieldType";
 import { LastPassCsvImporter as Importer } from "@bitwarden/common/importers/lastpass-csv-importer";
 import { ImportResult } from "@bitwarden/common/models/domain/import-result";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
-import { FieldView } from "@bitwarden/common/models/view/field.view";
+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";
 
 function baseExcept(result: ImportResult) {
   expect(result).not.toBeNull();

libs/common/spec/importers/myki-csv-importer.spec.ts

@@ -1,6 +1,6 @@
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { MykiCsvImporter as Importer } from "@bitwarden/common/importers/myki-csv-importer";
-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 { userAccountData } from "./test-data/myki-csv/user-account.csv";
 import { userCreditCardData } from "./test-data/myki-csv/user-credit-card.csv";

libs/common/spec/importers/nordpass-csv-importer.spec.ts

@@ -1,8 +1,8 @@
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType";
 import { NordPassCsvImporter as Importer } from "@bitwarden/common/importers/nordpass-csv-importer";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
-import { IdentityView } from "@bitwarden/common/models/view/identity.view";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
 
 import { data as creditCardData } from "./test-data/nordpass-csv/nordpass.card.csv";
 import { data as identityData } from "./test-data/nordpass-csv/nordpass.identity.csv";

libs/common/spec/importers/onepassword-1pux-importer.spec.ts

@@ -1,9 +1,9 @@
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { FieldType } from "@bitwarden/common/enums/fieldType";
 import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType";
 import { OnePassword1PuxImporter as Importer } from "@bitwarden/common/importers/onepassword/onepassword-1pux-importer";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { FieldView } from "@bitwarden/common/models/view/field.view";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
 import { APICredentialsData } from "./test-data/onepassword-1pux/api-credentials";
 import { BankAccountData } from "./test-data/onepassword-1pux/bank-account";

libs/common/spec/importers/onepassword-mac-csv-importer.spec.ts

@@ -1,6 +1,6 @@
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { OnePasswordMacCsvImporter as Importer } from "@bitwarden/common/importers/onepassword/onepassword-mac-csv-importer";
-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 { data as creditCardData } from "./test-data/onepassword-csv/credit-card.mac.csv";
 import { data as identityData } from "./test-data/onepassword-csv/identity.mac.csv";

libs/common/spec/importers/onepassword-win-csv-importer.spec.ts

@@ -1,8 +1,8 @@
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { FieldType } from "@bitwarden/common/enums/fieldType";
 import { OnePasswordWinCsvImporter as Importer } from "@bitwarden/common/importers/onepassword/onepassword-win-csv-importer";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
-import { FieldView } from "@bitwarden/common/models/view/field.view";
+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 { data as creditCardData } from "./test-data/onepassword-csv/credit-card.windows.csv";
 import { data as identityData } from "./test-data/onepassword-csv/identity.windows.csv";

libs/common/spec/importers/psono-json-importer.spec.ts

@@ -1,7 +1,7 @@
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { FieldType } from "@bitwarden/common/enums/fieldType";
 import { PsonoJsonImporter as Importer } from "@bitwarden/common/importers/psono/psono-json-importer";
-import { FieldView } from "@bitwarden/common/models/view/field.view";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
 import { ApplicationPasswordsData } from "./test-data/psono-json/application-passwords";
 import { BookmarkData } from "./test-data/psono-json/bookmark.json";

libs/common/spec/importers/safari-csv-importer.spec.ts

@@ -1,7 +1,7 @@
 import { SafariCsvImporter as Importer } from "@bitwarden/common/importers/safari-csv-importer";
-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 { 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 { data as oldSimplePasswordData } from "./test-data/safari-csv/old-simple-password-data.csv";
 import { data as simplePasswordData } from "./test-data/safari-csv/simple-password-data.csv";

libs/common/spec/services/export.service.spec.ts

@@ -2,22 +2,22 @@
 import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
 
 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 { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
-import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
-import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { KdfType, DEFAULT_PBKDF2_ITERATIONS } from "@bitwarden/common/enums/kdfType";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { Cipher } from "@bitwarden/common/models/domain/cipher";
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
-import { Folder } from "@bitwarden/common/models/domain/folder";
-import { Login } from "@bitwarden/common/models/domain/login";
 import { CipherWithIdExport as CipherExport } from "@bitwarden/common/models/export/cipher-with-ids.export";
-import { CipherView } from "@bitwarden/common/models/view/cipher.view";
-import { FolderView } from "@bitwarden/common/models/view/folder.view";
-import { LoginView } from "@bitwarden/common/models/view/login.view";
 import { ExportService } from "@bitwarden/common/services/export.service";
+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 { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
+import { Folder } from "@bitwarden/common/vault/models/domain/folder";
+import { Login } from "@bitwarden/common/vault/models/domain/login";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
+import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
 
 import { BuildTestObject, GetUniqueString } from "../utils";
 

libs/common/spec/services/import.service.spec.ts

@@ -1,16 +1,16 @@
 // eslint-disable-next-line no-restricted-imports
 import { Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
 
-import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction";
 import { BitwardenPasswordProtectedImporter } from "@bitwarden/common/importers/bitwarden-password-protected-importer";
 import { Importer } from "@bitwarden/common/importers/importer";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { ImportService } from "@bitwarden/common/services/import/import.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 
 describe("ImportService", () => {
   let importService: ImportService;

libs/common/src/abstractions/api.service.ts

@@ -1,16 +1,6 @@
 import { OrganizationConnectionType } from "../enums/organizationConnectionType";
 import { SetKeyConnectorKeyRequest } from "../models/request/account/set-key-connector-key.request";
-import { AttachmentRequest } from "../models/request/attachment.request";
 import { BitPayInvoiceRequest } from "../models/request/bit-pay-invoice.request";
-import { CipherBulkDeleteRequest } from "../models/request/cipher-bulk-delete.request";
-import { CipherBulkMoveRequest } from "../models/request/cipher-bulk-move.request";
-import { CipherBulkRestoreRequest } from "../models/request/cipher-bulk-restore.request";
-import { CipherBulkShareRequest } from "../models/request/cipher-bulk-share.request";
-import { CipherCollectionsRequest } from "../models/request/cipher-collections.request";
-import { CipherCreateRequest } from "../models/request/cipher-create.request";
-import { CipherPartialRequest } from "../models/request/cipher-partial.request";
-import { CipherShareRequest } from "../models/request/cipher-share.request";
-import { CipherRequest } from "../models/request/cipher.request";
 import { CollectionBulkDeleteRequest } from "../models/request/collection-bulk-delete.request";
 import { CollectionRequest } from "../models/request/collection.request";
 import { DeleteRecoverRequest } from "../models/request/delete-recover.request";
@@ -74,14 +64,11 @@ import { UpdateTwoFactorYubioOtpRequest } from "../models/request/update-two-fac
 import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request";
 import { VerifyEmailRequest } from "../models/request/verify-email.request";
 import { ApiKeyResponse } from "../models/response/api-key.response";
-import { AttachmentUploadDataResponse } from "../models/response/attachment-upload-data.response";
-import { AttachmentResponse } from "../models/response/attachment.response";
 import { AuthRequestResponse } from "../models/response/auth-request.response";
 import { RegisterResponse } from "../models/response/authentication/register.response";
 import { BillingHistoryResponse } from "../models/response/billing-history.response";
 import { BillingPaymentResponse } from "../models/response/billing-payment.response";
 import { BreachAccountResponse } from "../models/response/breach-account.response";
-import { CipherResponse } from "../models/response/cipher.response";
 import {
   CollectionAccessDetailsResponse,
   CollectionResponse,
@@ -129,7 +116,6 @@ import { SendFileUploadDataResponse } from "../models/response/send-file-upload-
 import { SendResponse } from "../models/response/send.response";
 import { SsoPreValidateResponse } from "../models/response/sso-pre-validate.response";
 import { SubscriptionResponse } from "../models/response/subscription.response";
-import { SyncResponse } from "../models/response/sync.response";
 import { TaxInfoResponse } from "../models/response/tax-info.response";
 import { TaxRateResponse } from "../models/response/tax-rate.response";
 import { TwoFactorAuthenticatorResponse } from "../models/response/two-factor-authenticator.response";
@@ -144,6 +130,20 @@ import {
 import { TwoFactorYubiKeyResponse } from "../models/response/two-factor-yubi-key.response";
 import { UserKeyResponse } from "../models/response/user-key.response";
 import { SendAccessView } from "../models/view/send-access.view";
+import { AttachmentRequest } from "../vault/models/request/attachment.request";
+import { CipherBulkDeleteRequest } from "../vault/models/request/cipher-bulk-delete.request";
+import { CipherBulkMoveRequest } from "../vault/models/request/cipher-bulk-move.request";
+import { CipherBulkRestoreRequest } from "../vault/models/request/cipher-bulk-restore.request";
+import { CipherBulkShareRequest } from "../vault/models/request/cipher-bulk-share.request";
+import { CipherCollectionsRequest } from "../vault/models/request/cipher-collections.request";
+import { CipherCreateRequest } from "../vault/models/request/cipher-create.request";
+import { CipherPartialRequest } from "../vault/models/request/cipher-partial.request";
+import { CipherShareRequest } from "../vault/models/request/cipher-share.request";
+import { CipherRequest } from "../vault/models/request/cipher.request";
+import { AttachmentUploadDataResponse } from "../vault/models/response/attachment-upload-data.response";
+import { AttachmentResponse } from "../vault/models/response/attachment.response";
+import { CipherResponse } from "../vault/models/response/cipher.response";
+import { SyncResponse } from "../vault/models/response/sync.response";
 
 /**
  * @deprecated The `ApiService` class is deprecated and calls should be extracted into individual

libs/common/src/abstractions/fileUpload.service.ts

@@ -1,7 +1,7 @@
 import { EncArrayBuffer } from "../models/domain/enc-array-buffer";
 import { EncString } from "../models/domain/enc-string";
-import { AttachmentUploadDataResponse } from "../models/response/attachment-upload-data.response";
 import { SendFileUploadDataResponse } from "../models/response/send-file-upload-data.response";
+import { AttachmentUploadDataResponse } from "../vault/models/response/attachment-upload-data.response";
 
 export abstract class FileUploadService {
   uploadSendFile: (

libs/common/src/abstractions/search.service.ts

@@ -1,5 +1,5 @@
-import { CipherView } from "../models/view/cipher.view";
 import { SendView } from "../models/view/send.view";
+import { CipherView } from "../vault/models/view/cipher.view";
 
 export abstract class SearchService {
   indexedEntityId?: string = null;

libs/common/src/abstractions/state.service.ts

@@ -3,12 +3,9 @@ import { Observable } from "rxjs";
 import { KdfType } from "../enums/kdfType";
 import { ThemeType } from "../enums/themeType";
 import { UriMatchType } from "../enums/uriMatchType";
-import { CipherData } from "../models/data/cipher.data";
 import { CollectionData } from "../models/data/collection.data";
 import { EncryptedOrganizationKeyData } from "../models/data/encrypted-organization-key.data";
 import { EventData } from "../models/data/event.data";
-import { FolderData } from "../models/data/folder.data";
-import { LocalData } from "../models/data/local.data";
 import { OrganizationData } from "../models/data/organization.data";
 import { PolicyData } from "../models/data/policy.data";
 import { ProviderData } from "../models/data/provider.data";
@@ -23,9 +20,12 @@ import { Policy } from "../models/domain/policy";
 import { StorageOptions } from "../models/domain/storage-options";
 import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
 import { WindowState } from "../models/domain/window-state";
-import { CipherView } from "../models/view/cipher.view";
 import { CollectionView } from "../models/view/collection.view";
 import { SendView } from "../models/view/send.view";
+import { CipherData } from "../vault/models/data/cipher.data";
+import { FolderData } from "../vault/models/data/folder.data";
+import { LocalData } from "../vault/models/data/local.data";
+import { CipherView } from "../vault/models/view/cipher.view";
 
 export abstract class StateService<T extends Account = Account> {
   accounts$: Observable<{ [userId: string]: T }>;

libs/common/src/importers/avast-json-importer.ts

@@ -1,6 +1,6 @@
-import { CipherType } from "../enums/cipherType";
 import { SecureNoteType } from "../enums/secureNoteType";
 import { ImportResult } from "../models/domain/import-result";
+import { CipherType } from "../vault/enums/cipher-type";
 
 import { BaseImporter } from "./base-importer";
 import { Importer } from "./importer";

libs/common/src/importers/base-importer.ts

@@ -1,19 +1,19 @@
 import * as papa from "papaparse";
 
 import { LogService } from "../abstractions/log.service";
-import { CipherType } from "../enums/cipherType";
 import { FieldType } from "../enums/fieldType";
 import { SecureNoteType } from "../enums/secureNoteType";
 import { Utils } from "../misc/utils";
 import { ImportResult } from "../models/domain/import-result";
-import { CipherView } from "../models/view/cipher.view";
 import { CollectionView } from "../models/view/collection.view";
-import { FieldView } from "../models/view/field.view";
-import { FolderView } from "../models/view/folder.view";
-import { LoginUriView } from "../models/view/login-uri.view";
-import { LoginView } from "../models/view/login.view";
-import { SecureNoteView } from "../models/view/secure-note.view";
 import { ConsoleLogService } from "../services/consoleLog.service";
+import { CipherType } from "../vault/enums/cipher-type";
+import { CipherView } from "../vault/models/view/cipher.view";
+import { FieldView } from "../vault/models/view/field.view";
+import { FolderView } from "../vault/models/view/folder.view";
+import { LoginUriView } from "../vault/models/view/login-uri.view";
+import { LoginView } from "../vault/models/view/login.view";
+import { SecureNoteView } from "../vault/models/view/secure-note.view";
 
 export abstract class BaseImporter {
   organizationId: string = null;

libs/common/src/importers/bitwarden-csv-importer.ts

@@ -1,13 +1,13 @@
-import { CipherRepromptType } from "../enums/cipherRepromptType";
-import { CipherType } from "../enums/cipherType";
 import { FieldType } from "../enums/fieldType";
 import { SecureNoteType } from "../enums/secureNoteType";
 import { ImportResult } from "../models/domain/import-result";
-import { CipherView } from "../models/view/cipher.view";
 import { CollectionView } from "../models/view/collection.view";
-import { FieldView } from "../models/view/field.view";
-import { LoginView } from "../models/view/login.view";
-import { SecureNoteView } from "../models/view/secure-note.view";
+import { CipherRepromptType } from "../vault/enums/cipher-reprompt-type";
+import { CipherType } from "../vault/enums/cipher-type";
+import { CipherView } from "../vault/models/view/cipher.view";
+import { FieldView } from "../vault/models/view/field.view";
+import { LoginView } from "../vault/models/view/login.view";
+import { SecureNoteView } from "../vault/models/view/secure-note.view";
 
 import { BaseImporter } from "./base-importer";
 import { Importer } from "./importer";

libs/common/src/importers/dashlane/dashlane-csv-importer.ts

@@ -1,10 +1,10 @@
-import { CipherType } from "../../enums/cipherType";
 import { SecureNoteType } from "../../enums/secureNoteType";
 import { ImportResult } from "../../models/domain/import-result";
-import { CardView } from "../../models/view/card.view";
-import { CipherView } from "../../models/view/cipher.view";
-import { IdentityView } from "../../models/view/identity.view";
-import { LoginView } from "../../models/view/login.view";
+import { CipherType } from "../../vault/enums/cipher-type";
+import { CardView } from "../../vault/models/view/card.view";
+import { CipherView } from "../../vault/models/view/cipher.view";
+import { IdentityView } from "../../vault/models/view/identity.view";
+import { LoginView } from "../../vault/models/view/login.view";
 import { BaseImporter } from "../base-importer";
 import { Importer } from "../importer";
 

libs/common/src/importers/dashlane/dashlane-json-importer.ts

@@ -1,10 +1,10 @@
-import { CipherType } from "../../enums/cipherType";
 import { SecureNoteType } from "../../enums/secureNoteType";
 import { ImportResult } from "../../models/domain/import-result";
-import { CardView } from "../../models/view/card.view";
-import { CipherView } from "../../models/view/cipher.view";
-import { IdentityView } from "../../models/view/identity.view";
-import { SecureNoteView } from "../../models/view/secure-note.view";
+import { CipherType } from "../../vault/enums/cipher-type";
+import { CardView } from "../../vault/models/view/card.view";
+import { CipherView } from "../../vault/models/view/cipher.view";
+import { IdentityView } from "../../vault/models/view/identity.view";
+import { SecureNoteView } from "../../vault/models/view/secure-note.view";
 import { BaseImporter } from "../base-importer";
 import { Importer } from "../importer";
 

libs/common/src/importers/encryptr-csv-importer.ts

@@ -1,6 +1,6 @@
-import { CipherType } from "../enums/cipherType";
 import { ImportResult } from "../models/domain/import-result";
-import { CardView } from "../models/view/card.view";
+import { CipherType } from "../vault/enums/cipher-type";
+import { CardView } from "../vault/models/view/card.view";
 
 import { BaseImporter } from "./base-importer";
 import { Importer } from "./importer";

libs/common/src/importers/enpass/enpass-csv-importer.ts

@@ -1,8 +1,8 @@
-import { CipherType } from "../../enums/cipherType";
 import { SecureNoteType } from "../../enums/secureNoteType";
 import { ImportResult } from "../../models/domain/import-result";
-import { CardView } from "../../models/view/card.view";
-import { SecureNoteView } from "../../models/view/secure-note.view";
+import { CipherType } from "../../vault/enums/cipher-type";
+import { CardView } from "../../vault/models/view/card.view";
+import { SecureNoteView } from "../../vault/models/view/secure-note.view";
 import { BaseImporter } from "../base-importer";
 import { Importer } from "../importer";
 

libs/common/src/importers/enpass/enpass-json-importer.ts

@@ -1,9 +1,9 @@
-import { CipherType } from "../../enums/cipherType";
 import { FieldType } from "../../enums/fieldType";
 import { ImportResult } from "../../models/domain/import-result";
-import { CardView } from "../../models/view/card.view";
-import { CipherView } from "../../models/view/cipher.view";
-import { FolderView } from "../../models/view/folder.view";
+import { CipherType } from "../../vault/enums/cipher-type";
+import { CardView } from "../../vault/models/view/card.view";
+import { CipherView } from "../../vault/models/view/cipher.view";
+import { FolderView } from "../../vault/models/view/folder.view";
 import { BaseImporter } from "../base-importer";
 import { Importer } from "../importer";
 

libs/common/src/importers/fsecure/fsecure-fsk-importer.spec.ts

@@ -1,4 +1,4 @@
-import { CipherType } from "../../enums/cipherType";
+import { CipherType } from "../../vault/enums/cipher-type";
 
 import { FSecureFskImporter as Importer } from "./fsecure-fsk-importer";
 import { CreditCardTestEntry, LoginTestEntry } from "./fsk-test-data";

libs/common/src/importers/fsecure/fsecure-fsk-importer.ts

@@ -1,7 +1,7 @@
-import { CipherType } from "../../enums/cipherType";
 import { ImportResult } from "../../models/domain/import-result";
-import { CardView } from "../../models/view/card.view";
-import { CipherView } from "../../models/view/cipher.view";
+import { CipherType } from "../../vault/enums/cipher-type";
+import { CardView } from "../../vault/models/view/card.view";
+import { CipherView } from "../../vault/models/view/cipher.view";
 import { BaseImporter } from "../base-importer";
 import { Importer } from "../importer";
 

libs/common/src/importers/keepass2-xml-importer.ts

@@ -1,6 +1,6 @@
 import { FieldType } from "../enums/fieldType";
 import { ImportResult } from "../models/domain/import-result";
-import { FolderView } from "../models/view/folder.view";
+import { FolderView } from "../vault/models/view/folder.view";
 
 import { BaseImporter } from "./base-importer";
 import { Importer } from "./importer";

libs/common/src/importers/lastpass-csv-importer.ts

@@ -1,12 +1,12 @@
-import { CipherType } from "../enums/cipherType";
 import { SecureNoteType } from "../enums/secureNoteType";
 import { ImportResult } from "../models/domain/import-result";
-import { CardView } from "../models/view/card.view";
-import { CipherView } from "../models/view/cipher.view";
-import { FolderView } from "../models/view/folder.view";
-import { IdentityView } from "../models/view/identity.view";
-import { LoginView } from "../models/view/login.view";
-import { SecureNoteView } from "../models/view/secure-note.view";
+import { CipherType } from "../vault/enums/cipher-type";
+import { CardView } from "../vault/models/view/card.view";
+import { CipherView } from "../vault/models/view/cipher.view";
+import { FolderView } from "../vault/models/view/folder.view";
+import { IdentityView } from "../vault/models/view/identity.view";
+import { LoginView } from "../vault/models/view/login.view";
+import { SecureNoteView } from "../vault/models/view/secure-note.view";
 
 import { BaseImporter } from "./base-importer";
 import { Importer } from "./importer";

libs/common/src/importers/msecure-csv-importer.ts

@@ -1,7 +1,7 @@
-import { CipherType } from "../enums/cipherType";
 import { SecureNoteType } from "../enums/secureNoteType";
 import { ImportResult } from "../models/domain/import-result";
-import { SecureNoteView } from "../models/view/secure-note.view";
+import { CipherType } from "../vault/enums/cipher-type";
+import { SecureNoteView } from "../vault/models/view/secure-note.view";
 
 import { BaseImporter } from "./base-importer";
 import { Importer } from "./importer";

libs/common/src/importers/myki-csv-importer.ts

@@ -1,10 +1,10 @@
-import { CipherType } from "../enums/cipherType";
 import { SecureNoteType } from "../enums/secureNoteType";
 import { ImportResult } from "../models/domain/import-result";
-import { CardView } from "../models/view/card.view";
-import { CipherView } from "../models/view/cipher.view";
-import { IdentityView } from "../models/view/identity.view";
-import { SecureNoteView } from "../models/view/secure-note.view";
+import { CipherType } from "../vault/enums/cipher-type";
+import { CardView } from "../vault/models/view/card.view";
+import { CipherView } from "../vault/models/view/cipher.view";
+import { IdentityView } from "../vault/models/view/identity.view";
+import { SecureNoteView } from "../vault/models/view/secure-note.view";
 
 import { BaseImporter } from "./base-importer";
 import { Importer } from "./importer";

libs/common/src/importers/nordpass-csv-importer.ts

@@ -1,8 +1,8 @@
-import { CipherType } from "../enums/cipherType";
 import { SecureNoteType } from "../enums/secureNoteType";
 import { ImportResult } from "../models/domain/import-result";
-import { CipherView } from "../models/view/cipher.view";
-import { LoginView } from "../models/view/login.view";
+import { CipherType } from "../vault/enums/cipher-type";
+import { CipherView } from "../vault/models/view/cipher.view";
+import { LoginView } from "../vault/models/view/login.view";
 
 import { BaseImporter } from "./base-importer";
 import { Importer } from "./importer";

libs/common/src/importers/onepassword/cipher-import-context.ts

@@ -1,4 +1,4 @@
-import { CipherView } from "../../models/view/cipher.view";
+import { CipherView } from "../../vault/models/view/cipher.view";
 
 export class CipherImportContext {
   lowerProperty: string;

libs/common/src/importers/onepassword/onepassword-1pif-importer.ts

@@ -1,12 +1,12 @@
-import { CipherType } from "../../enums/cipherType";
 import { FieldType } from "../../enums/fieldType";
 import { SecureNoteType } from "../../enums/secureNoteType";
 import { ImportResult } from "../../models/domain/import-result";
-import { CardView } from "../../models/view/card.view";
-import { CipherView } from "../../models/view/cipher.view";
-import { IdentityView } from "../../models/view/identity.view";
-import { PasswordHistoryView } from "../../models/view/password-history.view";
-import { SecureNoteView } from "../../models/view/secure-note.view";
+import { CipherType } from "../../vault/enums/cipher-type";
+import { CardView } from "../../vault/models/view/card.view";
+import { CipherView } from "../../vault/models/view/cipher.view";
+import { IdentityView } from "../../vault/models/view/identity.view";
+import { PasswordHistoryView } from "../../vault/models/view/password-history.view";
+import { SecureNoteView } from "../../vault/models/view/secure-note.view";
 import { BaseImporter } from "../base-importer";
 import { Importer } from "../importer";
 

libs/common/src/importers/onepassword/onepassword-1pux-importer.ts

@@ -1,14 +1,14 @@
-import { CipherRepromptType } from "../../enums/cipherRepromptType";
-import { CipherType } from "../../enums/cipherType";
 import { FieldType } from "../../enums/fieldType";
 import { SecureNoteType } from "../../enums/secureNoteType";
 import { ImportResult } from "../../models/domain/import-result";
-import { CardView } from "../../models/view/card.view";
-import { CipherView } from "../../models/view/cipher.view";
-import { IdentityView } from "../../models/view/identity.view";
-import { LoginView } from "../../models/view/login.view";
-import { PasswordHistoryView } from "../../models/view/password-history.view";
-import { SecureNoteView } from "../../models/view/secure-note.view";
+import { CipherRepromptType } from "../../vault/enums/cipher-reprompt-type";
+import { CipherType } from "../../vault/enums/cipher-type";
+import { CardView } from "../../vault/models/view/card.view";
+import { CipherView } from "../../vault/models/view/cipher.view";
+import { IdentityView } from "../../vault/models/view/identity.view";
+import { LoginView } from "../../vault/models/view/login.view";
+import { PasswordHistoryView } from "../../vault/models/view/password-history.view";
+import { SecureNoteView } from "../../vault/models/view/secure-note.view";
 import { BaseImporter } from "../base-importer";
 import { Importer } from "../importer";
 

libs/common/src/importers/onepassword/onepassword-csv-importer.ts

@@ -1,7 +1,7 @@
-import { CipherType } from "../../enums/cipherType";
 import { FieldType } from "../../enums/fieldType";
 import { ImportResult } from "../../models/domain/import-result";
-import { CipherView } from "../../models/view/cipher.view";
+import { CipherType } from "../../vault/enums/cipher-type";
+import { CipherView } from "../../vault/models/view/cipher.view";
 import { BaseImporter } from "../base-importer";
 import { Importer } from "../importer";
 

libs/common/src/importers/onepassword/onepassword-mac-csv-importer.ts

@@ -1,7 +1,7 @@
-import { CipherType } from "../../enums/cipherType";
-import { CardView } from "../../models/view/card.view";
-import { CipherView } from "../../models/view/cipher.view";
-import { IdentityView } from "../../models/view/identity.view";
+import { CipherType } from "../../vault/enums/cipher-type";
+import { CardView } from "../../vault/models/view/card.view";
+import { CipherView } from "../../vault/models/view/cipher.view";
+import { IdentityView } from "../../vault/models/view/identity.view";
 import { Importer } from "../importer";
 
 import { IgnoredProperties, OnePasswordCsvImporter } from "./onepassword-csv-importer";

libs/common/src/importers/onepassword/onepassword-win-csv-importer.ts

@@ -1,8 +1,8 @@
-import { CipherType } from "../../enums/cipherType";
-import { CardView } from "../../models/view/card.view";
-import { CipherView } from "../../models/view/cipher.view";
-import { IdentityView } from "../../models/view/identity.view";
-import { LoginView } from "../../models/view/login.view";
+import { CipherType } from "../../vault/enums/cipher-type";
+import { CardView } from "../../vault/models/view/card.view";
+import { CipherView } from "../../vault/models/view/cipher.view";
+import { IdentityView } from "../../vault/models/view/identity.view";
+import { LoginView } from "../../vault/models/view/login.view";
 import { Importer } from "../importer";
 
 import { CipherImportContext } from "./cipher-import-context";

libs/common/src/importers/passwordboss-json-importer.ts

@@ -1,7 +1,7 @@
-import { CipherType } from "../enums/cipherType";
 import { ImportResult } from "../models/domain/import-result";
-import { CardView } from "../models/view/card.view";
-import { FolderView } from "../models/view/folder.view";
+import { CipherType } from "../vault/enums/cipher-type";
+import { CardView } from "../vault/models/view/card.view";
+import { FolderView } from "../vault/models/view/folder.view";
 
 import { BaseImporter } from "./base-importer";
 import { Importer } from "./importer";

libs/common/src/importers/psono/psono-json-importer.ts

@@ -1,9 +1,9 @@
-import { CipherType } from "../../enums/cipherType";
 import { FieldType } from "../../enums/fieldType";
 import { SecureNoteType } from "../../enums/secureNoteType";
 import { ImportResult } from "../../models/domain/import-result";
-import { CipherView } from "../../models/view/cipher.view";
-import { SecureNoteView } from "../../models/view/secure-note.view";
+import { CipherType } from "../../vault/enums/cipher-type";
+import { CipherView } from "../../vault/models/view/cipher.view";
+import { SecureNoteView } from "../../vault/models/view/secure-note.view";
 import { BaseImporter } from "../base-importer";
 import { Importer } from "../importer";
 

libs/common/src/importers/remembear-csv-importer.ts

@@ -1,6 +1,6 @@
-import { CipherType } from "../enums/cipherType";
 import { ImportResult } from "../models/domain/import-result";
-import { CardView } from "../models/view/card.view";
+import { CipherType } from "../vault/enums/cipher-type";
+import { CardView } from "../vault/models/view/card.view";
 
 import { BaseImporter } from "./base-importer";
 import { Importer } from "./importer";

libs/common/src/importers/safeincloud-xml-importer.ts

@@ -1,11 +1,11 @@
-import { CipherType } from "../enums/cipherType";
 import { FieldType } from "../enums/fieldType";
 import { SecureNoteType } from "../enums/secureNoteType";
 import { ImportResult } from "../models/domain/import-result";
-import { CipherView } from "../models/view/cipher.view";
-import { FieldView } from "../models/view/field.view";
-import { FolderView } from "../models/view/folder.view";
-import { SecureNoteView } from "../models/view/secure-note.view";
+import { CipherType } from "../vault/enums/cipher-type";
+import { CipherView } from "../vault/models/view/cipher.view";
+import { FieldView } from "../vault/models/view/field.view";
+import { FolderView } from "../vault/models/view/folder.view";
+import { SecureNoteView } from "../vault/models/view/secure-note.view";
 
 import { BaseImporter } from "./base-importer";
 import { Importer } from "./importer";

libs/common/src/importers/splashid-csv-importer.ts

@@ -1,5 +1,5 @@
 import { ImportResult } from "../models/domain/import-result";
-import { CipherView } from "../models/view/cipher.view";
+import { CipherView } from "../vault/models/view/cipher.view";
 
 import { BaseImporter } from "./base-importer";
 import { Importer } from "./importer";

libs/common/src/importers/truekey-csv-importer.ts

@@ -1,8 +1,8 @@
-import { CipherType } from "../enums/cipherType";
 import { SecureNoteType } from "../enums/secureNoteType";
 import { ImportResult } from "../models/domain/import-result";
-import { CardView } from "../models/view/card.view";
-import { SecureNoteView } from "../models/view/secure-note.view";
+import { CipherType } from "../vault/enums/cipher-type";
+import { CardView } from "../vault/models/view/card.view";
+import { SecureNoteView } from "../vault/models/view/secure-note.view";
 
 import { BaseImporter } from "./base-importer";
 import { Importer } from "./importer";

libs/common/src/importers/zohovault-csv-importer.ts

@@ -1,5 +1,5 @@
 import { ImportResult } from "../models/domain/import-result";
-import { CipherView } from "../models/view/cipher.view";
+import { CipherView } from "../vault/models/view/cipher.view";
 
 import { BaseImporter } from "./base-importer";
 import { Importer } from "./importer";

libs/common/src/misc/linkedFieldOption.decorator.ts

@@ -1,5 +1,5 @@
 import { LinkedIdType } from "../enums/linkedIdType";
-import { ItemView } from "../models/view/item.view";
+import { ItemView } from "../vault/models/view/item.view";
 
 export class LinkedMetadata {
   constructor(readonly propertyKey: string, private readonly _i18nKey?: string) {}

libs/common/src/models/domain/account.ts

@@ -5,17 +5,17 @@ import { KdfType } from "../../enums/kdfType";
 import { UriMatchType } from "../../enums/uriMatchType";
 import { Utils } from "../../misc/utils";
 import { DeepJsonify } from "../../types/deep-jsonify";
-import { CipherData } from "../data/cipher.data";
+import { CipherData } from "../../vault/models/data/cipher.data";
+import { FolderData } from "../../vault/models/data/folder.data";
+import { CipherView } from "../../vault/models/view/cipher.view";
 import { CollectionData } from "../data/collection.data";
 import { EncryptedOrganizationKeyData } from "../data/encrypted-organization-key.data";
 import { EventData } from "../data/event.data";
-import { FolderData } from "../data/folder.data";
 import { OrganizationData } from "../data/organization.data";
 import { PolicyData } from "../data/policy.data";
 import { ProviderData } from "../data/provider.data";
 import { SendData } from "../data/send.data";
 import { ServerConfigData } from "../data/server-config.data";
-import { CipherView } from "../view/cipher.view";
 import { CollectionView } from "../view/collection.view";
 import { SendView } from "../view/send.view";
 

libs/common/src/models/domain/import-result.ts

@@ -1,6 +1,6 @@
-import { CipherView } from "../view/cipher.view";
+import { CipherView } from "../../vault/models/view/cipher.view";
+import { FolderView } from "../../vault/models/view/folder.view";
 import { CollectionView } from "../view/collection.view";
-import { FolderView } from "../view/folder.view";
 
 export class ImportResult {
   success = false;

libs/common/src/models/export/card.export.ts

@@ -1,6 +1,6 @@
-import { Card as CardDomain } from "../domain/card";
+import { Card as CardDomain } from "../../vault/models/domain/card";
+import { CardView } from "../../vault/models/view/card.view";
 import { EncString } from "../domain/enc-string";
-import { CardView } from "../view/card.view";
 
 export class CardExport {
   static template(): CardExport {

libs/common/src/models/export/cipher-with-ids.export.ts

@@ -1,5 +1,5 @@
-import { Cipher as CipherDomain } from "../domain/cipher";
-import { CipherView } from "../view/cipher.view";
+import { Cipher as CipherDomain } from "../../vault/models/domain/cipher";
+import { CipherView } from "../../vault/models/view/cipher.view";
 
 import { CipherExport } from "./cipher.export";
 

libs/common/src/models/export/cipher.export.ts

@@ -1,8 +1,8 @@
-import { CipherRepromptType } from "../../enums/cipherRepromptType";
-import { CipherType } from "../../enums/cipherType";
-import { Cipher as CipherDomain } from "../domain/cipher";
+import { CipherRepromptType } from "../../vault/enums/cipher-reprompt-type";
+import { CipherType } from "../../vault/enums/cipher-type";
+import { Cipher as CipherDomain } from "../../vault/models/domain/cipher";
+import { CipherView } from "../../vault/models/view/cipher.view";
 import { EncString } from "../domain/enc-string";
-import { CipherView } from "../view/cipher.view";
 
 import { CardExport } from "./card.export";
 import { FieldExport } from "./field.export";

libs/common/src/models/export/field.export.ts

@@ -1,8 +1,8 @@
 import { FieldType } from "../../enums/fieldType";
 import { LinkedIdType } from "../../enums/linkedIdType";
+import { Field as FieldDomain } from "../../vault/models/domain/field";
+import { FieldView } from "../../vault/models/view/field.view";
 import { EncString } from "../domain/enc-string";
-import { Field as FieldDomain } from "../domain/field";
-import { FieldView } from "../view/field.view";
 
 export class FieldExport {
   static template(): FieldExport {

libs/common/src/models/export/folder-with-id.export.ts

@@ -1,5 +1,5 @@
-import { Folder as FolderDomain } from "../domain/folder";
-import { FolderView } from "../view/folder.view";
+import { Folder as FolderDomain } from "../../vault/models/domain/folder";
+import { FolderView } from "../../vault/models/view/folder.view";
 
 import { FolderExport } from "./folder.export";
 

libs/common/src/models/export/folder.export.ts

@@ -1,6 +1,6 @@
+import { Folder as FolderDomain } from "../../vault/models/domain/folder";
+import { FolderView } from "../../vault/models/view/folder.view";
 import { EncString } from "../domain/enc-string";
-import { Folder as FolderDomain } from "../domain/folder";
-import { FolderView } from "../view/folder.view";
 
 export class FolderExport {
   static template(): FolderExport {

libs/common/src/models/export/identity.export.ts

@@ -1,6 +1,6 @@
+import { Identity as IdentityDomain } from "../../vault/models/domain/identity";
+import { IdentityView } from "../../vault/models/view/identity.view";
 import { EncString } from "../domain/enc-string";
-import { Identity as IdentityDomain } from "../domain/identity";
-import { IdentityView } from "../view/identity.view";
 
 export class IdentityExport {
   static template(): IdentityExport {

libs/common/src/models/export/login-uri.export.ts

@@ -1,7 +1,7 @@
 import { UriMatchType } from "../../enums/uriMatchType";
+import { LoginUri as LoginUriDomain } from "../../vault/models/domain/login-uri";
+import { LoginUriView } from "../../vault/models/view/login-uri.view";
 import { EncString } from "../domain/enc-string";
-import { LoginUri as LoginUriDomain } from "../domain/login-uri";
-import { LoginUriView } from "../view/login-uri.view";
 
 export class LoginUriExport {
   static template(): LoginUriExport {

libs/common/src/models/export/login.export.ts

@@ -1,6 +1,6 @@
+import { Login as LoginDomain } from "../../vault/models/domain/login";
+import { LoginView } from "../../vault/models/view/login.view";
 import { EncString } from "../domain/enc-string";
-import { Login as LoginDomain } from "../domain/login";
-import { LoginView } from "../view/login.view";
 
 import { LoginUriExport } from "./login-uri.export";
 

libs/common/src/models/export/secure-note.export.ts

@@ -1,6 +1,6 @@
 import { SecureNoteType } from "../../enums/secureNoteType";
-import { SecureNote as SecureNoteDomain } from "../domain/secure-note";
-import { SecureNoteView } from "../view/secure-note.view";
+import { SecureNote as SecureNoteDomain } from "../../vault/models/domain/secure-note";
+import { SecureNoteView } from "../../vault/models/view/secure-note.view";
 
 export class SecureNoteExport {
   static template(): SecureNoteExport {

libs/common/src/models/request/import-ciphers.request.ts

@@ -1,5 +1,6 @@
-import { CipherRequest } from "./cipher.request";
-import { FolderRequest } from "./folder.request";
+import { CipherRequest } from "../../vault/models/request/cipher.request";
+import { FolderRequest } from "../../vault/models/request/folder.request";
+
 import { KvpRequest } from "./kvp.request";
 
 export class ImportCiphersRequest {

libs/common/src/models/request/import-organization-ciphers.request.ts

@@ -1,4 +1,5 @@
-import { CipherRequest } from "./cipher.request";
+import { CipherRequest } from "../../vault/models/request/cipher.request";
+
 import { CollectionRequest } from "./collection.request";
 import { KvpRequest } from "./kvp.request";
 

libs/common/src/models/request/update-key.request.ts

@@ -1,5 +1,6 @@
-import { CipherWithIdRequest } from "./cipher-with-id.request";
-import { FolderWithIdRequest } from "./folder-with-id.request";
+import { CipherWithIdRequest } from "../../vault/models/request/cipher-with-id.request";
+import { FolderWithIdRequest } from "../../vault/models/request/folder-with-id.request";
+
 import { SendWithIdRequest } from "./send-with-id.request";
 
 export class UpdateKeyRequest {

libs/common/src/models/response/emergency-access.response.ts

@@ -1,9 +1,9 @@
 import { EmergencyAccessStatusType } from "../../enums/emergencyAccessStatusType";
 import { EmergencyAccessType } from "../../enums/emergencyAccessType";
 import { KdfType } from "../../enums/kdfType";
+import { CipherResponse } from "../../vault/models/response/cipher.response";
 
 import { BaseResponse } from "./base.response";
-import { CipherResponse } from "./cipher.response";
 
 export class EmergencyAccessGranteeDetailsResponse extends BaseResponse {
   id: string;

libs/common/src/models/response/organization-export.response.ts

@@ -1,5 +1,6 @@
+import { CipherResponse } from "../../vault/models/response/cipher.response";
+
 import { BaseResponse } from "./base.response";
-import { CipherResponse } from "./cipher.response";
 import { CollectionResponse } from "./collection.response";
 
 export class OrganizationExportResponse extends BaseResponse {

libs/common/src/services/api.service.ts

@@ -7,16 +7,7 @@ import { DeviceType } from "../enums/deviceType";
 import { OrganizationConnectionType } from "../enums/organizationConnectionType";
 import { Utils } from "../misc/utils";
 import { SetKeyConnectorKeyRequest } from "../models/request/account/set-key-connector-key.request";
-import { AttachmentRequest } from "../models/request/attachment.request";
 import { BitPayInvoiceRequest } from "../models/request/bit-pay-invoice.request";
-import { CipherBulkDeleteRequest } from "../models/request/cipher-bulk-delete.request";
-import { CipherBulkMoveRequest } from "../models/request/cipher-bulk-move.request";
-import { CipherBulkShareRequest } from "../models/request/cipher-bulk-share.request";
-import { CipherCollectionsRequest } from "../models/request/cipher-collections.request";
-import { CipherCreateRequest } from "../models/request/cipher-create.request";
-import { CipherPartialRequest } from "../models/request/cipher-partial.request";
-import { CipherShareRequest } from "../models/request/cipher-share.request";
-import { CipherRequest } from "../models/request/cipher.request";
 import { CollectionBulkDeleteRequest } from "../models/request/collection-bulk-delete.request";
 import { CollectionRequest } from "../models/request/collection.request";
 import { DeleteRecoverRequest } from "../models/request/delete-recover.request";
@@ -82,14 +73,11 @@ import { UpdateTwoFactorYubioOtpRequest } from "../models/request/update-two-fac
 import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request";
 import { VerifyEmailRequest } from "../models/request/verify-email.request";
 import { ApiKeyResponse } from "../models/response/api-key.response";
-import { AttachmentUploadDataResponse } from "../models/response/attachment-upload-data.response";
-import { AttachmentResponse } from "../models/response/attachment.response";
 import { AuthRequestResponse } from "../models/response/auth-request.response";
 import { RegisterResponse } from "../models/response/authentication/register.response";
 import { BillingHistoryResponse } from "../models/response/billing-history.response";
 import { BillingPaymentResponse } from "../models/response/billing-payment.response";
 import { BreachAccountResponse } from "../models/response/breach-account.response";
-import { CipherResponse } from "../models/response/cipher.response";
 import {
   CollectionAccessDetailsResponse,
   CollectionResponse,
@@ -138,7 +126,6 @@ import { SendFileUploadDataResponse } from "../models/response/send-file-upload-
 import { SendResponse } from "../models/response/send.response";
 import { SsoPreValidateResponse } from "../models/response/sso-pre-validate.response";
 import { SubscriptionResponse } from "../models/response/subscription.response";
-import { SyncResponse } from "../models/response/sync.response";
 import { TaxInfoResponse } from "../models/response/tax-info.response";
 import { TaxRateResponse } from "../models/response/tax-rate.response";
 import { TwoFactorAuthenticatorResponse } from "../models/response/two-factor-authenticator.response";
@@ -153,6 +140,19 @@ import {
 import { TwoFactorYubiKeyResponse } from "../models/response/two-factor-yubi-key.response";
 import { UserKeyResponse } from "../models/response/user-key.response";
 import { SendAccessView } from "../models/view/send-access.view";
+import { AttachmentRequest } from "../vault/models/request/attachment.request";
+import { CipherBulkDeleteRequest } from "../vault/models/request/cipher-bulk-delete.request";
+import { CipherBulkMoveRequest } from "../vault/models/request/cipher-bulk-move.request";
+import { CipherBulkShareRequest } from "../vault/models/request/cipher-bulk-share.request";
+import { CipherCollectionsRequest } from "../vault/models/request/cipher-collections.request";
+import { CipherCreateRequest } from "../vault/models/request/cipher-create.request";
+import { CipherPartialRequest } from "../vault/models/request/cipher-partial.request";
+import { CipherShareRequest } from "../vault/models/request/cipher-share.request";
+import { CipherRequest } from "../vault/models/request/cipher.request";
+import { AttachmentUploadDataResponse } from "../vault/models/response/attachment-upload-data.response";
+import { AttachmentResponse } from "../vault/models/response/attachment.response";
+import { CipherResponse } from "../vault/models/response/cipher.response";
+import { SyncResponse } from "../vault/models/response/sync.response";
 
 /**
  * @deprecated The `ApiService` class is deprecated and calls should be extracted into individual

libs/common/src/services/cryptography/get-class-initializer.ts

@@ -1,8 +1,8 @@
 import { Jsonify } from "type-fest";
 
 import { InitializerMetadata } from "../../interfaces/initializer-metadata.interface";
-import { Cipher } from "../../models/domain/cipher";
-import { CipherView } from "../../models/view/cipher.view";
+import { Cipher } from "../../vault/models/domain/cipher";
+import { CipherView } from "../../vault/models/view/cipher.view";
 
 import { InitializerKey } from "./initializer-key";
 

libs/common/src/services/event/event-collection.service.ts

@@ -1,10 +1,10 @@
-import { CipherService } from "../../abstractions/cipher.service";
 import { EventCollectionService as EventCollectionServiceAbstraction } from "../../abstractions/event/event-collection.service";
 import { EventUploadService } from "../../abstractions/event/event-upload.service";
 import { OrganizationService } from "../../abstractions/organization/organization.service.abstraction";
 import { StateService } from "../../abstractions/state.service";
 import { EventType } from "../../enums/eventType";
 import { EventData } from "../../models/data/event.data";
+import { CipherService } from "../../vault/abstractions/cipher.service";
 
 export class EventCollectionService implements EventCollectionServiceAbstraction {
   constructor(

libs/common/src/services/export.service.ts

@@ -1,32 +1,32 @@
 import * as papa from "papaparse";
 
 import { ApiService } from "../abstractions/api.service";
-import { CipherService } from "../abstractions/cipher.service";
 import { CryptoService } from "../abstractions/crypto.service";
 import { CryptoFunctionService } from "../abstractions/cryptoFunction.service";
 import {
   ExportFormat,
   ExportService as ExportServiceAbstraction,
 } from "../abstractions/export.service";
-import { FolderService } from "../abstractions/folder/folder.service.abstraction";
-import { CipherType } from "../enums/cipherType";
 import { DEFAULT_PBKDF2_ITERATIONS, KdfType } from "../enums/kdfType";
 import { Utils } from "../misc/utils";
-import { CipherData } from "../models/data/cipher.data";
 import { CollectionData } from "../models/data/collection.data";
-import { Cipher } from "../models/domain/cipher";
 import { Collection } from "../models/domain/collection";
-import { Folder } from "../models/domain/folder";
 import { KdfConfig } from "../models/domain/kdf-config";
 import { CipherWithIdExport as CipherExport } from "../models/export/cipher-with-ids.export";
 import { CollectionWithIdExport as CollectionExport } from "../models/export/collection-with-id.export";
 import { EventExport } from "../models/export/event.export";
 import { FolderWithIdExport as FolderExport } from "../models/export/folder-with-id.export";
 import { CollectionDetailsResponse } from "../models/response/collection.response";
-import { CipherView } from "../models/view/cipher.view";
 import { CollectionView } from "../models/view/collection.view";
 import { EventView } from "../models/view/event.view";
-import { FolderView } from "../models/view/folder.view";
+import { CipherService } from "../vault/abstractions/cipher.service";
+import { FolderService } from "../vault/abstractions/folder/folder.service.abstraction";
+import { CipherType } from "../vault/enums/cipher-type";
+import { CipherData } from "../vault/models/data/cipher.data";
+import { Cipher } from "../vault/models/domain/cipher";
+import { Folder } from "../vault/models/domain/folder";
+import { CipherView } from "../vault/models/view/cipher.view";
+import { FolderView } from "../vault/models/view/folder.view";
 
 export class ExportService implements ExportServiceAbstraction {
   constructor(

libs/common/src/services/fileUpload.service.ts

@@ -4,8 +4,8 @@ import { LogService } from "../abstractions/log.service";
 import { FileUploadType } from "../enums/fileUploadType";
 import { EncArrayBuffer } from "../models/domain/enc-array-buffer";
 import { EncString } from "../models/domain/enc-string";
-import { AttachmentUploadDataResponse } from "../models/response/attachment-upload-data.response";
 import { SendFileUploadDataResponse } from "../models/response/send-file-upload-data.response";
+import { AttachmentUploadDataResponse } from "../vault/models/response/attachment-upload-data.response";
 
 import { AzureFileUploadService } from "./azureFileUpload.service";
 import { BitwardenFileUploadService } from "./bitwardenFileUpload.service";

libs/common/src/services/import/import.service.ts

@@ -1,11 +1,8 @@
-import { CipherService } from "../../abstractions/cipher.service";
 import { CollectionService } from "../../abstractions/collection.service";
 import { CryptoService } from "../../abstractions/crypto.service";
-import { FolderService } from "../../abstractions/folder/folder.service.abstraction";
 import { I18nService } from "../../abstractions/i18n.service";
 import { ImportApiServiceAbstraction } from "../../abstractions/import/import-api.service.abstraction";
 import { ImportService as ImportServiceAbstraction } from "../../abstractions/import/import.service.abstraction";
-import { CipherType } from "../../enums/cipherType";
 import {
   featuredImportOptions,
   ImportOption,
@@ -74,14 +71,17 @@ import { YotiCsvImporter } from "../../importers/yoti-csv-importer";
 import { ZohoVaultCsvImporter } from "../../importers/zohovault-csv-importer";
 import { Utils } from "../../misc/utils";
 import { ImportResult } from "../../models/domain/import-result";
-import { CipherRequest } from "../../models/request/cipher.request";
 import { CollectionRequest } from "../../models/request/collection.request";
-import { FolderRequest } from "../../models/request/folder.request";
 import { ImportCiphersRequest } from "../../models/request/import-ciphers.request";
 import { ImportOrganizationCiphersRequest } from "../../models/request/import-organization-ciphers.request";
 import { KvpRequest } from "../../models/request/kvp.request";
 import { ErrorResponse } from "../../models/response/error.response";
-import { CipherView } from "../../models/view/cipher.view";
+import { CipherService } from "../../vault/abstractions/cipher.service";
+import { FolderService } from "../../vault/abstractions/folder/folder.service.abstraction";
+import { CipherType } from "../../vault/enums/cipher-type";
+import { CipherRequest } from "../../vault/models/request/cipher.request";
+import { FolderRequest } from "../../vault/models/request/folder.request";
+import { CipherView } from "../../vault/models/view/cipher.view";
 
 export class ImportService implements ImportServiceAbstraction {
   featuredImportOptions = featuredImportOptions as readonly ImportOption[];

libs/common/src/services/notifications.service.ts

@@ -8,7 +8,6 @@ import { EnvironmentService } from "../abstractions/environment.service";
 import { LogService } from "../abstractions/log.service";
 import { NotificationsService as NotificationsServiceAbstraction } from "../abstractions/notifications.service";
 import { StateService } from "../abstractions/state.service";
-import { SyncService } from "../abstractions/sync/sync.service.abstraction";
 import { AuthenticationStatus } from "../enums/authenticationStatus";
 import { NotificationType } from "../enums/notificationType";
 import {
@@ -17,6 +16,7 @@ import {
   SyncFolderNotification,
   SyncSendNotification,
 } from "../models/response/notification.response";
+import { SyncService } from "../vault/abstractions/sync/sync.service.abstraction";
 
 export class NotificationsService implements NotificationsServiceAbstraction {
   private signalrConnection: signalR.HubConnection;

libs/common/src/services/organization/organization-api.service.ts

@@ -1,6 +1,5 @@
 import { ApiService } from "../../abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "../../abstractions/organization/organization-api.service.abstraction";
-import { SyncService } from "../../abstractions/sync/sync.service.abstraction";
 import { OrganizationApiKeyType } from "../../enums/organizationApiKeyType";
 import { ImportDirectoryRequest } from "../../models/request/import-directory.request";
 import { OrganizationApiKeyRequest } from "../../models/request/organization-api-key.request";
@@ -27,6 +26,7 @@ import { OrganizationResponse } from "../../models/response/organization.respons
 import { OrganizationSsoResponse } from "../../models/response/organization/organization-sso.response";
 import { PaymentResponse } from "../../models/response/payment.response";
 import { TaxInfoResponse } from "../../models/response/tax-info.response";
+import { SyncService } from "../../vault/abstractions/sync/sync.service.abstraction";
 
 export class OrganizationApiService implements OrganizationApiServiceAbstraction {
   constructor(private apiService: ApiService, private syncService: SyncService) {}

libs/common/src/services/search.service.ts

@@ -1,14 +1,14 @@
 import * as lunr from "lunr";
 
-import { CipherService } from "../abstractions/cipher.service";
 import { I18nService } from "../abstractions/i18n.service";
 import { LogService } from "../abstractions/log.service";
 import { SearchService as SearchServiceAbstraction } from "../abstractions/search.service";
-import { CipherType } from "../enums/cipherType";
 import { FieldType } from "../enums/fieldType";
 import { UriMatchType } from "../enums/uriMatchType";
-import { CipherView } from "../models/view/cipher.view";
 import { SendView } from "../models/view/send.view";
+import { CipherService } from "../vault/abstractions/cipher.service";
+import { CipherType } from "../vault/enums/cipher-type";
+import { CipherView } from "../vault/models/view/cipher.view";
 
 export class SearchService implements SearchServiceAbstraction {
   private static registeredPipeline = false;

libs/common/src/services/state.service.ts

@@ -15,12 +15,9 @@ import { ThemeType } from "../enums/themeType";
 import { UriMatchType } from "../enums/uriMatchType";
 import { StateFactory } from "../factories/stateFactory";
 import { Utils } from "../misc/utils";
-import { CipherData } from "../models/data/cipher.data";
 import { CollectionData } from "../models/data/collection.data";
 import { EncryptedOrganizationKeyData } from "../models/data/encrypted-organization-key.data";
 import { EventData } from "../models/data/event.data";
-import { FolderData } from "../models/data/folder.data";
-import { LocalData } from "../models/data/local.data";
 import { OrganizationData } from "../models/data/organization.data";
 import { PolicyData } from "../models/data/policy.data";
 import { ProviderData } from "../models/data/provider.data";
@@ -42,9 +39,12 @@ import { State } from "../models/domain/state";
 import { StorageOptions } from "../models/domain/storage-options";
 import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
 import { WindowState } from "../models/domain/window-state";
-import { CipherView } from "../models/view/cipher.view";
 import { CollectionView } from "../models/view/collection.view";
 import { SendView } from "../models/view/send.view";
+import { CipherData } from "../vault/models/data/cipher.data";
+import { FolderData } from "../vault/models/data/folder.data";
+import { LocalData } from "../vault/models/data/local.data";
+import { CipherView } from "../vault/models/view/cipher.view";
 
 const keys = {
   state: "state",

libs/common/src/services/stateMigration.service.ts

@@ -4,10 +4,8 @@ import { KdfType } from "../enums/kdfType";
 import { StateVersion } from "../enums/stateVersion";
 import { ThemeType } from "../enums/themeType";
 import { StateFactory } from "../factories/stateFactory";
-import { CipherData } from "../models/data/cipher.data";
 import { CollectionData } from "../models/data/collection.data";
 import { EventData } from "../models/data/event.data";
-import { FolderData } from "../models/data/folder.data";
 import { OrganizationData } from "../models/data/organization.data";
 import { PolicyData } from "../models/data/policy.data";
 import { ProviderData } from "../models/data/provider.data";
@@ -23,6 +21,8 @@ import { EnvironmentUrls } from "../models/domain/environment-urls";
 import { GeneratedPasswordHistory } from "../models/domain/generated-password-history";
 import { GlobalState } from "../models/domain/global-state";
 import { StorageOptions } from "../models/domain/storage-options";
+import { CipherData } from "../vault/models/data/cipher.data";
+import { FolderData } from "../vault/models/data/folder.data";
 
 import { TokenService } from "./token.service";
 

libs/common/src/services/vaultTimeout/vaultTimeout.service.ts

@@ -1,10 +1,8 @@
 import { firstValueFrom } from "rxjs";
 
 import { AuthService } from "../../abstractions/auth.service";
-import { CipherService } from "../../abstractions/cipher.service";
 import { CollectionService } from "../../abstractions/collection.service";
 import { CryptoService } from "../../abstractions/crypto.service";
-import { FolderService } from "../../abstractions/folder/folder.service.abstraction";
 import { KeyConnectorService } from "../../abstractions/keyConnector.service";
 import { MessagingService } from "../../abstractions/messaging.service";
 import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
@@ -13,6 +11,8 @@ import { StateService } from "../../abstractions/state.service";
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "../../abstractions/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutSettingsService } from "../../abstractions/vaultTimeout/vaultTimeoutSettings.service";
 import { AuthenticationStatus } from "../../enums/authenticationStatus";
+import { CipherService } from "../../vault/abstractions/cipher.service";
+import { FolderService } from "../../vault/abstractions/folder/folder.service.abstraction";
 
 export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
   private inited = false;

libs/common/src/vault/abstractions/cipher.service.ts

@@ -1,9 +1,9 @@
-import { CipherType } from "../enums/cipherType";
-import { UriMatchType } from "../enums/uriMatchType";
+import { UriMatchType } from "../../enums/uriMatchType";
+import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key";
+import { CipherType } from "../enums/cipher-type";
 import { CipherData } from "../models/data/cipher.data";
 import { Cipher } from "../models/domain/cipher";
 import { Field } from "../models/domain/field";
-import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
 import { CipherView } from "../models/view/cipher.view";
 import { FieldView } from "../models/view/field.view";
 

libs/common/src/vault/abstractions/folder/folder.service.abstraction.ts

@@ -1,8 +1,8 @@
 import { Observable } from "rxjs";
 
+import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key";
 import { FolderData } from "../../models/data/folder.data";
 import { Folder } from "../../models/domain/folder";
-import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key";
 import { FolderView } from "../../models/view/folder.view";
 
 export abstract class FolderService {

libs/common/src/vault/abstractions/sync/sync-notifier.service.abstraction.ts

@@ -1,6 +1,6 @@
 import { Observable } from "rxjs";
 
-import { SyncEventArgs } from "../../types/syncEventArgs";
+import { SyncEventArgs } from "../../types/sync-event-args";
 
 export abstract class SyncNotifierService {
   sync$: Observable<SyncEventArgs>;

libs/common/src/vault/abstractions/sync/sync.service.abstraction.ts

@@ -2,7 +2,7 @@ import {
   SyncCipherNotification,
   SyncFolderNotification,
   SyncSendNotification,
-} from "../../models/response/notification.response";
+} from "../../../models/response/notification.response";
 
 export abstract class SyncService {
   syncInProgress: boolean;

libs/common/src/vault/models/data/card.data.ts

@@ -1,4 +1,4 @@
-import { CardApi } from "../api/card.api";
+import { CardApi } from "../../../models/api/card.api";
 
 export class CardData {
   cardholderName: string;

libs/common/src/vault/models/data/cipher.data.ts

@@ -1,5 +1,5 @@
-import { CipherRepromptType } from "../../enums/cipherRepromptType";
-import { CipherType } from "../../enums/cipherType";
+import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
+import { CipherType } from "../../enums/cipher-type";
 import { CipherResponse } from "../response/cipher.response";
 
 import { AttachmentData } from "./attachment.data";

libs/common/src/vault/models/data/field.data.ts

@@ -1,6 +1,6 @@
-import { FieldType } from "../../enums/fieldType";
-import { LinkedIdType } from "../../enums/linkedIdType";
-import { FieldApi } from "../api/field.api";
+import { FieldType } from "../../../enums/fieldType";
+import { LinkedIdType } from "../../../enums/linkedIdType";
+import { FieldApi } from "../../../models/api/field.api";
 
 export class FieldData {
   type: FieldType;

libs/common/src/vault/models/data/identity.data.ts

@@ -1,4 +1,4 @@
-import { IdentityApi } from "../api/identity.api";
+import { IdentityApi } from "../../../models/api/identity.api";
 
 export class IdentityData {
   title: string;

libs/common/src/vault/models/data/login-uri.data.ts

@@ -1,5 +1,5 @@
-import { UriMatchType } from "../../enums/uriMatchType";
-import { LoginUriApi } from "../api/login-uri.api";
+import { UriMatchType } from "../../../enums/uriMatchType";
+import { LoginUriApi } from "../../../models/api/login-uri.api";
 
 export class LoginUriData {
   uri: string;

libs/common/src/vault/models/data/login.data.ts

@@ -1,4 +1,4 @@
-import { LoginApi } from "../api/login.api";
+import { LoginApi } from "../../../models/api/login.api";
 
 import { LoginUriData } from "./login-uri.data";
 

libs/common/src/vault/models/data/secure-note.data.ts

@@ -1,5 +1,5 @@
-import { SecureNoteType } from "../../enums/secureNoteType";
-import { SecureNoteApi } from "../api/secure-note.api";
+import { SecureNoteType } from "../../../enums/secureNoteType";
+import { SecureNoteApi } from "../../../models/api/secure-note.api";
 
 export class SecureNoteData {
   type: SecureNoteType;

libs/common/src/vault/models/domain/attachment.spec.ts

@@ -1,14 +1,13 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
-import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service";
-import { AttachmentData } from "@bitwarden/common/models/data/attachment.data";
-import { Attachment } from "@bitwarden/common/models/domain/attachment";
-import { EncString } from "@bitwarden/common/models/domain/enc-string";
-import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
-import { ContainerService } from "@bitwarden/common/services/container.service";
-
-import { makeStaticByteArray, mockEnc, mockFromJson } from "../../utils";
+import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec/utils";
+import { CryptoService } from "../../../abstractions/crypto.service";
+import { EncryptService } from "../../../abstractions/encrypt.service";
+import { EncString } from "../../../models/domain/enc-string";
+import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key";
+import { ContainerService } from "../../../services/container.service";
+import { AttachmentData } from "../../models/data/attachment.data";
+import { Attachment } from "../../models/domain/attachment";
 
 describe("Attachment", () => {
   let data: AttachmentData;

libs/common/src/vault/models/domain/attachment.ts

@@ -1,13 +1,12 @@
 import { Jsonify } from "type-fest";
 
-import { Utils } from "../../misc/utils";
+import { Utils } from "../../../misc/utils";
+import Domain from "../../../models/domain/domain-base";
+import { EncString } from "../../../models/domain/enc-string";
+import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key";
 import { AttachmentData } from "../data/attachment.data";
 import { AttachmentView } from "../view/attachment.view";
 
-import Domain from "./domain-base";
-import { EncString } from "./enc-string";
-import { SymmetricCryptoKey } from "./symmetric-crypto-key";
-
 export class Attachment extends Domain {
   id: string;
   url: string;

libs/common/src/vault/models/domain/card.spec.ts

@@ -1,8 +1,7 @@
-import { CardData } from "@bitwarden/common/models/data/card.data";
-import { Card } from "@bitwarden/common/models/domain/card";
-import { EncString } from "@bitwarden/common/models/domain/enc-string";
-
-import { mockEnc, mockFromJson } from "../../utils";
+import { mockEnc, mockFromJson } from "../../../../spec/utils";
+import { EncString } from "../../../models/domain/enc-string";
+import { CardData } from "../../../vault/models/data/card.data";
+import { Card } from "../../models/domain/card";
 
 describe("Card", () => {
   let data: CardData;

libs/common/src/vault/models/domain/card.ts

@@ -1,12 +1,11 @@
 import { Jsonify } from "type-fest";
 
+import Domain from "../../../models/domain/domain-base";
+import { EncString } from "../../../models/domain/enc-string";
+import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key";
 import { CardData } from "../data/card.data";
 import { CardView } from "../view/card.view";
 
-import Domain from "./domain-base";
-import { EncString } from "./enc-string";
-import { SymmetricCryptoKey } from "./symmetric-crypto-key";
-
 export class Card extends Domain {
   cardholderName: EncString;
   brand: EncString;