From 75e1486c182828332d646134564c4627f4af04f0 Mon Sep 17 00:00:00 2001
From: Todd Martin <106564991+trmartin4@users.noreply.github.com>
Date: Mon, 27 Nov 2023 09:24:52 -0500
Subject: [PATCH 01/14] [PM-4919] Add typePasskey phrase to browser (#6967)

---
 apps/browser/src/_locales/en/messages.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 0109c7036f6..b07f9307255 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -2679,6 +2679,9 @@
   "confirmFilePassword": {
     "message": "Confirm file password"
   },
+  "typePasskey": {
+    "message": "Passkey"
+  },
   "passkeyNotCopied": {
     "message": "Passkey will not be copied"
   },

From 301142fbf2f1dce9b9b7b22f582cfbc93b19d0d5 Mon Sep 17 00:00:00 2001
From: SmithThe4th <gsmith@bitwarden.com>
Date: Mon, 27 Nov 2023 11:02:38 -0500
Subject: [PATCH 02/14] [PM-4925] Implemented getPublicKey to follow WSC
 standards (#6934)

* Implemented getPublicKey to follow WSC standards

* Renamed variable
---
 apps/browser/src/vault/fido2/webauthn-utils.ts                | 2 +-
 .../fido2/fido2-authenticator.service.abstraction.ts          | 1 +
 .../abstractions/fido2/fido2-client.service.abstraction.ts    | 1 +
 .../src/vault/services/fido2/fido2-authenticator.service.ts   | 4 +++-
 .../src/vault/services/fido2/fido2-client.service.spec.ts     | 1 +
 libs/common/src/vault/services/fido2/fido2-client.service.ts  | 1 +
 6 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/browser/src/vault/fido2/webauthn-utils.ts b/apps/browser/src/vault/fido2/webauthn-utils.ts
index a26c56ea570..3227e5ef116 100644
--- a/apps/browser/src/vault/fido2/webauthn-utils.ts
+++ b/apps/browser/src/vault/fido2/webauthn-utils.ts
@@ -67,7 +67,7 @@ export class WebauthnUtils {
         },
 
         getPublicKey(): ArrayBuffer {
-          return null;
+          return Fido2Utils.stringToBuffer(result.publicKey);
         },
 
         getPublicKeyAlgorithm(): number {
diff --git a/libs/common/src/vault/abstractions/fido2/fido2-authenticator.service.abstraction.ts b/libs/common/src/vault/abstractions/fido2/fido2-authenticator.service.abstraction.ts
index 671c6cb9fe1..438e13574dc 100644
--- a/libs/common/src/vault/abstractions/fido2/fido2-authenticator.service.abstraction.ts
+++ b/libs/common/src/vault/abstractions/fido2/fido2-authenticator.service.abstraction.ts
@@ -109,6 +109,7 @@ export interface Fido2AuthenticatorMakeCredentialResult {
   credentialId: BufferSource;
   attestationObject: BufferSource;
   authData: BufferSource;
+  publicKey: BufferSource;
   publicKeyAlgorithm: number;
 }
 
diff --git a/libs/common/src/vault/abstractions/fido2/fido2-client.service.abstraction.ts b/libs/common/src/vault/abstractions/fido2/fido2-client.service.abstraction.ts
index 9bb346ccc52..6721e4b314b 100644
--- a/libs/common/src/vault/abstractions/fido2/fido2-client.service.abstraction.ts
+++ b/libs/common/src/vault/abstractions/fido2/fido2-client.service.abstraction.ts
@@ -122,6 +122,7 @@ export interface CreateCredentialResult {
   clientDataJSON: string;
   attestationObject: string;
   authData: string;
+  publicKey: string;
   publicKeyAlgorithm: number;
   transports: string[];
 }
diff --git a/libs/common/src/vault/services/fido2/fido2-authenticator.service.ts b/libs/common/src/vault/services/fido2/fido2-authenticator.service.ts
index 43b1c67f826..1b6d796ba98 100644
--- a/libs/common/src/vault/services/fido2/fido2-authenticator.service.ts
+++ b/libs/common/src/vault/services/fido2/fido2-authenticator.service.ts
@@ -109,6 +109,7 @@ export class Fido2AuthenticatorService implements Fido2AuthenticatorServiceAbstr
       let keyPair: CryptoKeyPair;
       let userVerified = false;
       let credentialId: string;
+      let pubKeyDer: ArrayBuffer;
       const response = await userInterfaceSession.confirmNewCredential({
         credentialName: params.rpEntity.name,
         userName: params.userEntity.displayName,
@@ -126,7 +127,7 @@ export class Fido2AuthenticatorService implements Fido2AuthenticatorServiceAbstr
 
       try {
         keyPair = await createKeyPair();
-
+        pubKeyDer = await crypto.subtle.exportKey("spki", keyPair.publicKey);
         const encrypted = await this.cipherService.get(cipherId);
         cipher = await encrypted.decrypt(
           await this.cipherService.getKeyForCipherKeyDecryption(encrypted)
@@ -174,6 +175,7 @@ export class Fido2AuthenticatorService implements Fido2AuthenticatorServiceAbstr
         credentialId: guidToRawFormat(credentialId),
         attestationObject,
         authData,
+        publicKey: pubKeyDer,
         publicKeyAlgorithm: -7,
       };
     } finally {
diff --git a/libs/common/src/vault/services/fido2/fido2-client.service.spec.ts b/libs/common/src/vault/services/fido2/fido2-client.service.spec.ts
index 753c5800f7c..9987e0066b7 100644
--- a/libs/common/src/vault/services/fido2/fido2-client.service.spec.ts
+++ b/libs/common/src/vault/services/fido2/fido2-client.service.spec.ts
@@ -285,6 +285,7 @@ describe("FidoAuthenticatorService", () => {
         credentialId: guidToRawFormat(Utils.newGuid()),
         attestationObject: randomBytes(128),
         authData: randomBytes(64),
+        publicKey: randomBytes(64),
         publicKeyAlgorithm: -7,
       };
     }
diff --git a/libs/common/src/vault/services/fido2/fido2-client.service.ts b/libs/common/src/vault/services/fido2/fido2-client.service.ts
index e377b47c548..324253c72ee 100644
--- a/libs/common/src/vault/services/fido2/fido2-client.service.ts
+++ b/libs/common/src/vault/services/fido2/fido2-client.service.ts
@@ -199,6 +199,7 @@ export class Fido2ClientService implements Fido2ClientServiceAbstraction {
       attestationObject: Fido2Utils.bufferToString(makeCredentialResult.attestationObject),
       authData: Fido2Utils.bufferToString(makeCredentialResult.authData),
       clientDataJSON: Fido2Utils.bufferToString(clientDataJSONBytes),
+      publicKey: Fido2Utils.bufferToString(makeCredentialResult.publicKey),
       publicKeyAlgorithm: makeCredentialResult.publicKeyAlgorithm,
       transports: params.rp.id === "google.com" ? ["internal", "usb"] : ["internal"],
     };

From 162c669177816643fafafd6e01c29ee90384bf4c Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Mon, 27 Nov 2023 10:28:31 -0600
Subject: [PATCH 03/14] [AC-1721] Disable Collection Management settings on
 self-hosted (#6921)

* feat: disable collection management setting when self-hosted and hide save button, refs AC-1721

* fix: remove debug code, refs AC-1721
---
 .../organizations/settings/account.component.html         | 1 +
 .../organizations/settings/account.component.ts           | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.html b/apps/web/src/app/admin-console/organizations/settings/account.component.html
index bbce9b2e51e..c2462acf9da 100644
--- a/apps/web/src/app/admin-console/organizations/settings/account.component.html
+++ b/apps/web/src/app/admin-console/organizations/settings/account.component.html
@@ -64,6 +64,7 @@
     <input type="checkbox" bitCheckbox formControlName="limitCollectionCreationDeletion" />
   </bit-form-control>
   <button
+    *ngIf="!selfHosted"
     type="submit"
     bitButton
     bitFormButton
diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.ts b/apps/web/src/app/admin-console/organizations/settings/account.component.ts
index 693e718231b..798895259ee 100644
--- a/apps/web/src/app/admin-console/organizations/settings/account.component.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/account.component.ts
@@ -66,7 +66,7 @@ export class AccountComponent {
   });
 
   protected collectionManagementFormGroup = this.formBuilder.group({
-    limitCollectionCreationDeletion: [false],
+    limitCollectionCreationDeletion: this.formBuilder.control({ value: false, disabled: true }),
   });
 
   protected organizationId: string;
@@ -114,6 +114,7 @@ export class AccountComponent {
         // Update disabled states - reactive forms prefers not using disabled attribute
         if (!this.selfHosted) {
           this.formGroup.get("orgName").enable();
+          this.collectionManagementFormGroup.get("limitCollectionCreationDeletion").enable();
         }
 
         if (!this.selfHosted || this.canEditSubscription) {
@@ -171,6 +172,11 @@ export class AccountComponent {
   };
 
   submitCollectionManagement = async () => {
+    // Early exit if self-hosted
+    if (this.selfHosted) {
+      return;
+    }
+
     const request = new OrganizationCollectionManagementUpdateRequest();
     request.limitCreateDeleteOwnerAdmin =
       this.collectionManagementFormGroup.value.limitCollectionCreationDeletion;

From 97dbcbb815665cd64a7a6ea2c3ae7b2e8219a2f2 Mon Sep 17 00:00:00 2001
From: Alex Urbina <42731074+urbinaalex17@users.noreply.github.com>
Date: Mon, 27 Nov 2023 10:49:16 -0600
Subject: [PATCH 04/14] DEVOPS-1581 Update deploy-non-prod-web workflow to
 deploy web  (#6897)

* DEVOPS-1581 ADD: azure-deploy job to non-prod-web workflow

* DEVOPS-1581 REFACTOR: Azure deployment workflow to use
environment-specific artifact

* DEVOPS-1581 REFACTOR: Azure login and retrieve secrets in deploy-non-prod-web.yml

* DEVOPS-1581 REFACTOR:  Storage Account to Web Vault deployment name

* DEVOPS-1581 REFACTOR: Azure credentials for non-prod web in azure-deploy
deployment

* DEVOPS-1581 REFACTOR: deploy-non-prod-web workflow to add EUQA option and make it env dynamic

* DEVOPS-1581 FIX: environment names in deploy script

* DEVOPS-1581 REFACTOR: Environment artifact names

* DEVOPS-1581 REFACTOR: Deployment workflow to remove CloudFlare Pages deployment

* DEVOPS-1581 REFACTOR: Deployment workflow to use Azure instead of Cloudflare

* DEVOPS-1581 REFACTOR:  Deploy script to use azcopy for syncing files to Azure Storage Account

* DEVOPS-1581 REFACTOR: Azure Storage Account sync command

* Revert "DEVOPS-1581 REFACTOR:  Deploy script to use azcopy for syncing files to Azure Storage Account"

This reverts commit 2b7c3ae1a7194b0a946f179e3b09247a84da6574.

* DEVOPS-1581 ADD: USPROD environment configuration

* Revert "DEVOPS-1581 REFACTOR: Deployment workflow to remove CloudFlare Pages deployment"

This reverts commit c650cdadeb772ea39d490198d33528171a484367.

* devops-1581 REFACTOR: Deployment workflow to include cfpages-deploy job
---
 .github/workflows/deploy-non-prod-web.yml | 70 ++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-non-prod-web.yml b/.github/workflows/deploy-non-prod-web.yml
index b1df20b189d..296a77e581d 100644
--- a/.github/workflows/deploy-non-prod-web.yml
+++ b/.github/workflows/deploy-non-prod-web.yml
@@ -11,6 +11,8 @@ on:
         type: choice
         options:
           - QA
+          - EUQA
+          - USPROD
 
   workflow_call:
     inputs:
@@ -29,6 +31,8 @@ jobs:
       environment-name: ${{ steps.config.outputs.environment-name }}
       environment-branch: ${{ steps.config.outputs.environment-branch }}
       environment-artifact: ${{ steps.config.outputs.environment-artifact }}
+      azure-login-creds: ${{ steps.config.outputs.azure-login-creds }}
+      retrieve-secrets-keyvault: ${{ steps.config.outputs.retrieve-secrets-keyvault }}
     steps:
       - name: Configure
         id: config
@@ -39,7 +43,19 @@ jobs:
           echo "environment-url=http://vault.$ENV_NAME_LOWER.bitwarden.pw" >> $GITHUB_OUTPUT
           echo "environment-name=Web Vault - ${{ inputs.environment }}" >> $GITHUB_OUTPUT
           echo "environment-branch=cf-pages-$ENV_NAME_LOWER" >> $GITHUB_OUTPUT
-          echo "environment-artifact=web-*-cloud-${{ inputs.environment }}.zip" >> $GITHUB_OUTPUT
+          if [ ${{ inputs.environment }} == "QA" ]; then
+            echo "azure-login-creds=AZURE_KV_US_QA_SERVICE_PRINCIPAL" >> $GITHUB_OUTPUT
+            echo "retrieve-secrets-keyvault=bw-webvault-rlktusqa-kv" >> $GITHUB_OUTPUT
+            echo "environment-artifact=web-*-cloud-QA.zip" >> $GITHUB_OUTPUT
+          elif [ ${{ inputs.environment }} == "EUQA" ]; then
+            echo "azure-login-creds=AZURE_KV_EU_QA_SERVICE_PRINCIPAL" >> $GITHUB_OUTPUT
+            echo "retrieve-secrets-keyvault=webvaulteu-westeurope-qa" >> $GITHUB_OUTPUT
+            echo "environment-artifact=web-*-cloud-euqa.zip" >> $GITHUB_OUTPUT
+          elif [ ${{ inputs.environment }} == "USPROD" ]; then
+            echo "azure-login-creds=AZURE_KV_US_PROD_SERVICE_PRINCIPAL" >> $GITHUB_OUTPUT
+            echo "retrieve-secrets-keyvault=bw-webvault-klrt-kv" >> $GITHUB_OUTPUT
+            echo "environment-artifact=web-*-cloud-COMMERCIAL.zip" >> $GITHUB_OUTPUT
+          fi
 
   artifact-check:
     name: Check if Web artifact is present
@@ -86,6 +102,7 @@ jobs:
 
   cfpages-deploy:
     name: Deploy Web Vault to ${{ inputs.environment }} CloudFlare Pages branch
+    if : ${{ inputs.environment == 'QA' }}
     needs:
       - setup
       - artifact-check
@@ -171,6 +188,57 @@ jobs:
           state: 'failure'
           deployment-id: ${{ steps.deployment.outputs.deployment_id }}
 
+  azure-deploy:
+    name: Deploy Web Vault to ${{ inputs.environment }} Storage Account
+    needs:
+      - setup
+      - artifact-check
+    runs-on: ubuntu-22.04
+    env:
+      _ENVIRONMENT_ARTIFACT: ${{ needs.setup.outputs.environment-artifact }}
+    steps:
+      - name: Login to Azure
+        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7
+        with:
+          creds: ${{ secrets[needs.setup.outputs.azure-login-creds] }}
+
+      - name: Retrieve Storage Account connection string
+        id: retrieve-secrets
+        uses: bitwarden/gh-actions/get-keyvault-secrets@main
+        with:
+          keyvault: ${{ needs.setup.outputs.retrieve-secrets-keyvault }}
+          secrets: "sa-bitwarden-web-vault-dev-key-temp"
+
+      - name: Download latest cloud asset
+        uses: bitwarden/gh-actions/download-artifacts@main
+        with:
+          workflow: build-web.yml
+          path: apps/web
+          workflow_conclusion: success
+          branch: ${{ github.event.inputs.tag }}
+          artifacts: ${{ env._ENVIRONMENT_ARTIFACT }}
+
+      - name: Unzip build asset
+        working-directory: apps/web
+        run: unzip ${{ env._ENVIRONMENT_ARTIFACT }}
+
+      - name: Empty container in Storage Account
+        run: |
+          az storage blob delete-batch \
+            --source '$web' \
+            --pattern '*' \
+            --connection-string "${{ steps.retrieve-secrets.outputs.sa-bitwarden-web-vault-dev-key-temp }}"
+
+      - name: Deploy to Azure Storage Account
+        working-directory: apps/web
+        run: |
+          az storage blob upload-batch \
+            --source "./build" \
+            --destination '$web' \
+            --connection-string "${{ steps.retrieve-secrets.outputs.sa-bitwarden-web-vault-dev-key-temp }}" \
+            --overwrite \
+            --no-progress
+
   notify:
     name: Notify Slack with result
     runs-on: ubuntu-22.04

From aac4177a6c841bc0c763efad631422b0e69edf99 Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Mon, 27 Nov 2023 12:08:25 -0600
Subject: [PATCH 05/14] [AC-1179][AC-1738] Event log for collection management
 setting (#6699)

* [AC-1117] Add manage permission (#5910)

* Add 'manage' option to collection access permissions

* Add 'manage' to collection permissions

* remove service accidentally committed from another branch

* Update CLI commands

* update message casing to be consistent

* access selector model updates

* [AC-1374] Limit collection create/delete (#5963)

* feat: udate request/response/data/domain models for new column, refs AC-1374

* feat: create collection management ui, refs AC-1374

* fix: remove limitCollectionCdOwnerAdmin boolean from org update request, refs AC-1374

* fix: moved collection management UI, removed comments, refs AC-1374

* fix: observable chaining now properly calls API when local org updated, refs AC-1374

* fix: remove unused form template variables, refs AC-1374

* fix: clean up observable chain, refs AC-1374

* fix: remove parent.parent route, refs AC-1374

* fix: add cd explaination, refs AC-1374

* [AC-1649] Remove organizationId from collection-bulk-delete.request (#6343)

* refactor: remove organizationId from collection-bulk-delete-request, refs AC-1649

* refactor: remove request model from dialog component, refs AC-1649

* [AC-1174] Bulk collection management (#6133)

* [AC-1174] Add bulk edit collection access event type

* [AC-1174] Add bulk edit collection access menu option

* [AC-1174] Add initial bulk collections access dialog

* [AC-1174] Add logic to open bulk edit collections dialog

* [AC-1174] Move AccessItemView helper methods to access selector model to be shared

* [AC-1174] Add access selector to bulk collections dialog

* [AC-1174] Add bulk assign access method to collection-admin service

* [AC-1174] Introduce strongly typed BulkCollectionAccessRequest model

* [AC-1174] Update vault item event type name

* Update DialogService dependency

---------

Co-authored-by: Thomas Rittson <trittson@bitwarden.com>

* Rename LimitCollectionCdOwnerAdmin -> LimitCollectionCreationDeletion (#6409)

* Add manage property to synced Collection data

* Revert "Add manage property to synced Collection data"

Pushed to feature branch instead of a new one

This reverts commit 65cd39589cbeca154e0d469be46c006ba4fab0d7.

* Add manage property to synced Collection data

* Revert "Add manage property to synced Collection data"

This reverts commit f7fa30b79a83a0193398e31bf353b41985b41e23.

* [AC-1680] Add manage property to collection view and response models (#6417)

* Add manage property to synced Collection data

* Update tests

* feat: add LimitCollectionCreationDeletion conditional to canCreateNewCollections logic, refs AC-1659 (#6429)

* [AC-1669] Enforce Can Manage permission on Collection dialog (#6493)

* [AC-1669] Cleanup unhandled promise warnings

* [AC-1669] Force change detection to ensure AccessSelector has the most recent items

* [AC-1669] Initially select acting member when creating a new collection

* [AC-1669] Add validator to ensure manage permission is selected

* [AC-1669] Update error toast logic to support access tab errors

* [AC-1669] Add error icon

* [AC-1713] [Flexible collections] Add feature flags to clients (#6486)

* Add FlexibleCollections and BulkCollectionAccess flags

* Flag Collection Management settings

* Flag bulk collection access dialog

* Flag collection access modal changes

* feat: update event type with new collection management event, refs AC-1179

* [AC-1662] Add LimitCollecitonCreationDeletion conditional to CanDelete logic (#6526)

* feat: implement limitCollectionCreationDeletion into canDelete logic, refs AC-1662

* feat: make canDelete functions backwards compatible with feature flag, refs AC-1662

* feat: update vault-items.component for async getter, refs AC-1662

* feat: update configService injection, refs AC-1662

* feat: add config service to canDelete reference, refs AC-1662

* fix: remove configservice dependency from views, refs AC-1757 (#6686)

* feat: add new event type and update event service, refs AC-1179

* Add missing provider to vault-items.stories (#6690)

* fix: enum typo and name scheme, refs AC-1179

* fix: update message example, refs AC-1179

* fix: modifiedCollectionManagement message example, refs AC-1179

---------

Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com>
Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
Co-authored-by: Shane Melton <smelton@bitwarden.com>
---
 apps/web/src/app/core/event.service.ts   | 15 +++++++++++++++
 apps/web/src/locales/en/messages.json    |  9 +++++++++
 libs/common/src/enums/event-type.enum.ts |  1 +
 3 files changed, 25 insertions(+)

diff --git a/apps/web/src/app/core/event.service.ts b/apps/web/src/app/core/event.service.ts
index de75ddc7b40..852a1f2fcb8 100644
--- a/apps/web/src/app/core/event.service.ts
+++ b/apps/web/src/app/core/event.service.ts
@@ -352,6 +352,14 @@ export class EventService {
       case EventType.Organization_SponsorshipsSynced:
         msg = humanReadableMsg = this.i18nService.t("sponsorshipsSynced");
         break;
+      case EventType.Organization_CollectionManagementUpdated:
+        msg = this.i18nService.t("modifiedCollectionManagement", this.formatOrganizationId(ev));
+        humanReadableMsg = this.i18nService.t(
+          "modifiedCollectionManagement",
+          this.getShortId(ev.organizationId)
+        );
+        break;
+
       // Policies
       case EventType.Policy_Updated: {
         msg = this.i18nService.t("modifiedPolicyId", this.formatPolicyId(ev));
@@ -569,6 +577,13 @@ export class EventService {
     return a.outerHTML;
   }
 
+  private formatOrganizationId(ev: EventResponse) {
+    const shortId = this.getShortId(ev.organizationId);
+    const a = this.makeAnchor(shortId);
+    a.setAttribute("href", "#/organizations/" + ev.organizationId + "/settings/account");
+    return a.outerHTML;
+  }
+
   private formatPolicyId(ev: EventResponse) {
     const shortId = this.getShortId(ev.policyId);
     const a = this.makeAnchor(shortId);
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 891551b590e..604aedd38fa 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -7404,6 +7404,15 @@
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
   },
+  "modifiedCollectionManagement": {
+    "message": "Modified collection management setting $ID$.",
+    "placeholders": {
+      "id": {
+        "content": "$1",
+        "example": "Unique ID"
+      }
+    }
+  },  
   "seeDetailedInstructions": {
     "message": "See detailed instructions on our help site at",
     "description": "This is followed a by a hyperlink to the help website."
diff --git a/libs/common/src/enums/event-type.enum.ts b/libs/common/src/enums/event-type.enum.ts
index 3232d885dca..8b541ec3cb0 100644
--- a/libs/common/src/enums/event-type.enum.ts
+++ b/libs/common/src/enums/event-type.enum.ts
@@ -64,6 +64,7 @@ export enum EventType {
   Organization_EnabledKeyConnector = 1606,
   Organization_DisabledKeyConnector = 1607,
   Organization_SponsorshipsSynced = 1608,
+  Organization_CollectionManagementUpdated = 1609,
 
   Policy_Updated = 1700,
 

From 687ec0c4c011892410fca9e69f2baef827fb72c4 Mon Sep 17 00:00:00 2001
From: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com>
Date: Mon, 27 Nov 2023 13:33:15 -0500
Subject: [PATCH 06/14] PM-5001 - WebAuthn-Login.strategy - set user key should
 set the master key encrypted user key if it exists so that the passkey authN
 + MP decryption flow can work. (#6978)

---
 .../auth/login-strategies/webauthn-login.strategy.spec.ts  | 6 +++++-
 .../src/auth/login-strategies/webauthn-login.strategy.ts   | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/libs/common/src/auth/login-strategies/webauthn-login.strategy.spec.ts b/libs/common/src/auth/login-strategies/webauthn-login.strategy.spec.ts
index 83de3b5d6a3..5f7c8de0254 100644
--- a/libs/common/src/auth/login-strategies/webauthn-login.strategy.spec.ts
+++ b/libs/common/src/auth/login-strategies/webauthn-login.strategy.spec.ts
@@ -179,7 +179,11 @@ describe("WebAuthnLoginStrategy", () => {
     // Act
     await webAuthnLoginStrategy.logIn(webAuthnCredentials);
 
-    // // Assert
+    // Assert
+    // Master key encrypted user key should be set
+    expect(cryptoService.setMasterKeyEncryptedUserKey).toHaveBeenCalledTimes(1);
+    expect(cryptoService.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(idTokenResponse.key);
+
     expect(cryptoService.decryptToBytes).toHaveBeenCalledTimes(1);
     expect(cryptoService.decryptToBytes).toHaveBeenCalledWith(
       idTokenResponse.userDecryptionOptions.webAuthnPrfOption.encryptedPrivateKey,
diff --git a/libs/common/src/auth/login-strategies/webauthn-login.strategy.ts b/libs/common/src/auth/login-strategies/webauthn-login.strategy.ts
index 8d47be0197c..3c8a3cf73cb 100644
--- a/libs/common/src/auth/login-strategies/webauthn-login.strategy.ts
+++ b/libs/common/src/auth/login-strategies/webauthn-login.strategy.ts
@@ -15,6 +15,13 @@ export class WebAuthnLoginStrategy extends LoginStrategy {
   }
 
   protected override async setUserKey(idTokenResponse: IdentityTokenResponse) {
+    const masterKeyEncryptedUserKey = idTokenResponse.key;
+
+    if (masterKeyEncryptedUserKey) {
+      // set the master key encrypted user key if it exists
+      await this.cryptoService.setMasterKeyEncryptedUserKey(masterKeyEncryptedUserKey);
+    }
+
     const userDecryptionOptions = idTokenResponse?.userDecryptionOptions;
 
     if (userDecryptionOptions?.webAuthnPrfOption) {

From 9017c0ed1617dcc735ad4b90758cad681203b273 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 20:09:04 +0100
Subject: [PATCH 07/14] [deps] Tools: Update electron-log to v5.0.1 (#6982)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 9 ++++-----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f2769ca55f3..d9721a22934 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -127,7 +127,7 @@
         "del": "6.1.1",
         "electron": "25.9.1",
         "electron-builder": "23.6.0",
-        "electron-log": "5.0.0",
+        "electron-log": "5.0.1",
         "electron-reload": "2.0.0-alpha.1",
         "electron-store": "8.1.0",
         "electron-updater": "5.3.0",
@@ -20218,12 +20218,11 @@
       }
     },
     "node_modules/electron-log": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.0.0.tgz",
-      "integrity": "sha512-vB3akupmQvA8jAyNL9rULZtf6WoP8vsabjXsRtiqXS6/D37SwN/4LEyj4JD+9Bv6xoTcx/LrVnsIKEEWdq5ClQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.0.1.tgz",
+      "integrity": "sha512-x4wnwHg00h/onWQgjmvcdLV7Mrd9TZjxNs8LmXVpqvANDf4FsSs5wLlzOykWLcaFzR3+5hdVEQ8ctmrUxgHlPA==",
       "dev": true,
       "engines": {
-        "electron": ">= 13",
         "node": ">= 14"
       }
     },
diff --git a/package.json b/package.json
index 9ee884b31d2..f8e96b28d46 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "del": "6.1.1",
     "electron": "25.9.1",
     "electron-builder": "23.6.0",
-    "electron-log": "5.0.0",
+    "electron-log": "5.0.1",
     "electron-reload": "2.0.0-alpha.1",
     "electron-store": "8.1.0",
     "electron-updater": "5.3.0",

From f82f9ba0d09ffd95218b3a1f3b39a5b477d44c78 Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Mon, 27 Nov 2023 11:44:15 -0800
Subject: [PATCH 08/14] [AC-1122] Add new admin access to all collections and
 items settings  (#6703)

* [AC-1117] Add manage permission (#5910)

* Add 'manage' option to collection access permissions

* Add 'manage' to collection permissions

* remove service accidentally committed from another branch

* Update CLI commands

* update message casing to be consistent

* access selector model updates

* [AC-1374] Limit collection create/delete (#5963)

* feat: udate request/response/data/domain models for new column, refs AC-1374

* feat: create collection management ui, refs AC-1374

* fix: remove limitCollectionCdOwnerAdmin boolean from org update request, refs AC-1374

* fix: moved collection management UI, removed comments, refs AC-1374

* fix: observable chaining now properly calls API when local org updated, refs AC-1374

* fix: remove unused form template variables, refs AC-1374

* fix: clean up observable chain, refs AC-1374

* fix: remove parent.parent route, refs AC-1374

* fix: add cd explaination, refs AC-1374

* [AC-1649] Remove organizationId from collection-bulk-delete.request (#6343)

* refactor: remove organizationId from collection-bulk-delete-request, refs AC-1649

* refactor: remove request model from dialog component, refs AC-1649

* [AC-1174] Bulk collection management (#6133)

* [AC-1174] Add bulk edit collection access event type

* [AC-1174] Add bulk edit collection access menu option

* [AC-1174] Add initial bulk collections access dialog

* [AC-1174] Add logic to open bulk edit collections dialog

* [AC-1174] Move AccessItemView helper methods to access selector model to be shared

* [AC-1174] Add access selector to bulk collections dialog

* [AC-1174] Add bulk assign access method to collection-admin service

* [AC-1174] Introduce strongly typed BulkCollectionAccessRequest model

* [AC-1174] Update vault item event type name

* Update DialogService dependency

---------

Co-authored-by: Thomas Rittson <trittson@bitwarden.com>

* Rename LimitCollectionCdOwnerAdmin -> LimitCollectionCreationDeletion (#6409)

* Add manage property to synced Collection data

* Revert "Add manage property to synced Collection data"

Pushed to feature branch instead of a new one

This reverts commit 65cd39589cbeca154e0d469be46c006ba4fab0d7.

* Add manage property to synced Collection data

* Revert "Add manage property to synced Collection data"

This reverts commit f7fa30b79a83a0193398e31bf353b41985b41e23.

* [AC-1680] Add manage property to collection view and response models (#6417)

* Add manage property to synced Collection data

* Update tests

* feat: add LimitCollectionCreationDeletion conditional to canCreateNewCollections logic, refs AC-1659 (#6429)

* [AC-1669] Enforce Can Manage permission on Collection dialog (#6493)

* [AC-1669] Cleanup unhandled promise warnings

* [AC-1669] Force change detection to ensure AccessSelector has the most recent items

* [AC-1669] Initially select acting member when creating a new collection

* [AC-1669] Add validator to ensure manage permission is selected

* [AC-1669] Update error toast logic to support access tab errors

* [AC-1669] Add error icon

* [AC-1713] [Flexible collections] Add feature flags to clients (#6486)

* Add FlexibleCollections and BulkCollectionAccess flags

* Flag Collection Management settings

* Flag bulk collection access dialog

* Flag collection access modal changes

* [AC-1662] Add LimitCollecitonCreationDeletion conditional to CanDelete logic (#6526)

* feat: implement limitCollectionCreationDeletion into canDelete logic, refs AC-1662

* feat: make canDelete functions backwards compatible with feature flag, refs AC-1662

* feat: update vault-items.component for async getter, refs AC-1662

* feat: update configService injection, refs AC-1662

* feat: add config service to canDelete reference, refs AC-1662

* fix: remove configservice dependency from views, refs AC-1757 (#6686)

* Add missing provider to vault-items.stories (#6690)

* [AC-1730] Add new AllowAdminAccessToAllCollectionItems setting to org response models

* [AC-1730] Add new AllowAdminAccessToAllCollectionItems setting to org request model

* [AC-1730] Add new collection setting to UI and include it when submitting

* [AC-1122] Add V1 feature flag

* [AC-1122] Hide new setting behind V1 feature flag

* [AC-1122] Add support for disabled form control

---------

Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com>
Co-authored-by: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Co-authored-by: Vincent Salucci <vincesalucci21@gmail.com>
Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
---
 .../settings/account.component.html              |  6 +++++-
 .../organizations/settings/account.component.ts  | 16 ++++++++++++++--
 apps/web/src/locales/en/messages.json            |  3 +++
 ...ation-collection-management-update.request.ts |  1 +
 .../models/response/organization.response.ts     |  4 ++++
 .../response/profile-organization.response.ts    |  4 ++++
 libs/common/src/enums/feature-flag.enum.ts       |  1 +
 7 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.html b/apps/web/src/app/admin-console/organizations/settings/account.component.html
index c2462acf9da..300d8003a13 100644
--- a/apps/web/src/app/admin-console/organizations/settings/account.component.html
+++ b/apps/web/src/app/admin-console/organizations/settings/account.component.html
@@ -53,12 +53,16 @@
   </button>
 </ng-container>
 <form
-  *ngIf="org && !loading && (showCollectionManagementSettings$ | async)"
+  *ngIf="org && !loading && (flexibleCollectionsEnabled$ | async)"
   [bitSubmit]="submitCollectionManagement"
   [formGroup]="collectionManagementFormGroup"
 >
   <h1 bitTypography="h1" class="tw-mt-16 tw-pb-2.5">{{ "collectionManagement" | i18n }}</h1>
   <p>{{ "collectionManagementDesc" | i18n }}</p>
+  <bit-form-control *ngIf="flexibleCollectionsV1Enabled$ | async">
+    <bit-label>{{ "allowAdminAccessToAllCollectionItemsDesc" | i18n }}</bit-label>
+    <input type="checkbox" bitCheckbox formControlName="allowAdminAccessToAllCollectionItems" />
+  </bit-form-control>
   <bit-form-control>
     <bit-label>{{ "limitCollectionCreationDeletionDesc" | i18n }}</bit-label>
     <input type="checkbox" bitCheckbox formControlName="limitCollectionCreationDeletion" />
diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.ts b/apps/web/src/app/admin-console/organizations/settings/account.component.ts
index 798895259ee..3bd76aa8128 100644
--- a/apps/web/src/app/admin-console/organizations/settings/account.component.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/account.component.ts
@@ -1,7 +1,7 @@
 import { Component, ViewChild, ViewContainerRef } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
-import { combineLatest, lastValueFrom, Subject, switchMap, takeUntil, from, of } from "rxjs";
+import { combineLatest, from, lastValueFrom, of, Subject, switchMap, takeUntil } from "rxjs";
 
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
@@ -41,10 +41,14 @@ export class AccountComponent {
   canUseApi = false;
   org: OrganizationResponse;
   taxFormPromise: Promise<unknown>;
-  showCollectionManagementSettings$ = this.configService.getFeatureFlag$(
+  flexibleCollectionsEnabled$ = this.configService.getFeatureFlag$(
     FeatureFlag.FlexibleCollections,
     false
   );
+  flexibleCollectionsV1Enabled$ = this.configService.getFeatureFlag$(
+    FeatureFlag.FlexibleCollectionsV1,
+    false
+  );
 
   // FormGroup validators taken from server Organization domain object
   protected formGroup = this.formBuilder.group({
@@ -67,6 +71,10 @@ export class AccountComponent {
 
   protected collectionManagementFormGroup = this.formBuilder.group({
     limitCollectionCreationDeletion: this.formBuilder.control({ value: false, disabled: true }),
+    allowAdminAccessToAllCollectionItems: this.formBuilder.control({
+      value: false,
+      disabled: true,
+    }),
   });
 
   protected organizationId: string;
@@ -115,6 +123,7 @@ export class AccountComponent {
         if (!this.selfHosted) {
           this.formGroup.get("orgName").enable();
           this.collectionManagementFormGroup.get("limitCollectionCreationDeletion").enable();
+          this.collectionManagementFormGroup.get("allowAdminAccessToAllCollectionItems").enable();
         }
 
         if (!this.selfHosted || this.canEditSubscription) {
@@ -136,6 +145,7 @@ export class AccountComponent {
         });
         this.collectionManagementFormGroup.patchValue({
           limitCollectionCreationDeletion: this.org.limitCollectionCreationDeletion,
+          allowAdminAccessToAllCollectionItems: this.org.allowAdminAccessToAllCollectionItems,
         });
 
         this.loading = false;
@@ -180,6 +190,8 @@ export class AccountComponent {
     const request = new OrganizationCollectionManagementUpdateRequest();
     request.limitCreateDeleteOwnerAdmin =
       this.collectionManagementFormGroup.value.limitCollectionCreationDeletion;
+    request.allowAdminAccessToAllCollectionItems =
+      this.collectionManagementFormGroup.value.allowAdminAccessToAllCollectionItems;
 
     await this.organizationApiService.updateCollectionManagement(this.organizationId, request);
 
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 604aedd38fa..5fd31e6cfa6 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -7322,6 +7322,9 @@
   "limitCollectionCreationDeletionDesc": {
     "message": "Limit collection creation and deletion to owners and admins"
   },
+  "allowAdminAccessToAllCollectionItemsDesc": {
+    "message": "Owners and admins can manage all collections and items"
+  },
   "collectionManagementUpdated": {
     "message": "Collection management behavior saved"
   },
diff --git a/libs/common/src/admin-console/models/request/organization-collection-management-update.request.ts b/libs/common/src/admin-console/models/request/organization-collection-management-update.request.ts
index 1c6ed27f19c..26275650b0c 100644
--- a/libs/common/src/admin-console/models/request/organization-collection-management-update.request.ts
+++ b/libs/common/src/admin-console/models/request/organization-collection-management-update.request.ts
@@ -1,3 +1,4 @@
 export class OrganizationCollectionManagementUpdateRequest {
   limitCreateDeleteOwnerAdmin: boolean;
+  allowAdminAccessToAllCollectionItems: boolean;
 }
diff --git a/libs/common/src/admin-console/models/response/organization.response.ts b/libs/common/src/admin-console/models/response/organization.response.ts
index 74b29a79486..bdcaf79707b 100644
--- a/libs/common/src/admin-console/models/response/organization.response.ts
+++ b/libs/common/src/admin-console/models/response/organization.response.ts
@@ -33,6 +33,7 @@ export class OrganizationResponse extends BaseResponse {
   maxAutoscaleSmSeats?: number;
   maxAutoscaleSmServiceAccounts?: number;
   limitCollectionCreationDeletion: boolean;
+  allowAdminAccessToAllCollectionItems: boolean;
 
   constructor(response: any) {
     super(response);
@@ -71,5 +72,8 @@ export class OrganizationResponse extends BaseResponse {
     this.limitCollectionCreationDeletion = this.getResponseProperty(
       "LimitCollectionCreationDeletion"
     );
+    this.allowAdminAccessToAllCollectionItems = this.getResponseProperty(
+      "AllowAdminAccessToAllCollectionItems"
+    );
   }
 }
diff --git a/libs/common/src/admin-console/models/response/profile-organization.response.ts b/libs/common/src/admin-console/models/response/profile-organization.response.ts
index a401662cd52..83187082e5a 100644
--- a/libs/common/src/admin-console/models/response/profile-organization.response.ts
+++ b/libs/common/src/admin-console/models/response/profile-organization.response.ts
@@ -49,6 +49,7 @@ export class ProfileOrganizationResponse extends BaseResponse {
   familySponsorshipToDelete?: boolean;
   accessSecretsManager: boolean;
   limitCollectionCreationDeletion: boolean;
+  allowAdminAccessToAllCollectionItems: boolean;
 
   constructor(response: any) {
     super(response);
@@ -109,5 +110,8 @@ export class ProfileOrganizationResponse extends BaseResponse {
     this.limitCollectionCreationDeletion = this.getResponseProperty(
       "LimitCollectionCreationDeletion"
     );
+    this.allowAdminAccessToAllCollectionItems = this.getResponseProperty(
+      "AllowAdminAccessToAllCollectionItems"
+    );
   }
 }
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index d51b4561fd7..95dbf5d2db0 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -8,6 +8,7 @@ export enum FeatureFlag {
   BrowserFilelessImport = "browser-fileless-import",
   ItemShare = "item-share",
   FlexibleCollections = "flexible-collections",
+  FlexibleCollectionsV1 = "flexible-collections-v-1", // v-1 is intentional
   BulkCollectionAccess = "bulk-collection-access",
 }
 

From 31ca3ea7b01fcec4bff2793d31e8fdbe8a21087e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 21:55:37 +0100
Subject: [PATCH 09/14] [deps] Tools: Update @types/papaparse to v5.3.14
 (#6988)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d9721a22934..e2a30702a37 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -107,7 +107,7 @@
         "@types/node-fetch": "2.6.4",
         "@types/node-forge": "1.3.4",
         "@types/node-ipc": "9.2.0",
-        "@types/papaparse": "5.3.13",
+        "@types/papaparse": "5.3.14",
         "@types/proper-lockfile": "4.1.2",
         "@types/react": "16.14.45",
         "@types/retry": "0.12.2",
@@ -14244,9 +14244,9 @@
       "dev": true
     },
     "node_modules/@types/papaparse": {
-      "version": "5.3.13",
-      "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-5.3.13.tgz",
-      "integrity": "sha512-tYSlZI3tIdBHXea8fZHcmwbsd1mSUikdMUyqpqj0Zzfu2GTGUSHEKmcnBg699WJ8UnxG31rXD4b1mLGPOAxS2w==",
+      "version": "5.3.14",
+      "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-5.3.14.tgz",
+      "integrity": "sha512-LxJ4iEFcpqc6METwp9f6BV6VVc43m6MfH0VqFosHvrUgfXiFe6ww7R3itkOQ+TCK6Y+Iv/+RnnvtRZnkc5Kc9g==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
diff --git a/package.json b/package.json
index f8e96b28d46..337a5e9c465 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "@types/node-fetch": "2.6.4",
     "@types/node-forge": "1.3.4",
     "@types/node-ipc": "9.2.0",
-    "@types/papaparse": "5.3.13",
+    "@types/papaparse": "5.3.14",
     "@types/proper-lockfile": "4.1.2",
     "@types/react": "16.14.45",
     "@types/retry": "0.12.2",

From a5e3432f853550739ac2595fdbd1905d1b361ddc Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Mon, 27 Nov 2023 21:59:44 +0100
Subject: [PATCH 10/14] Assign ownership to many libs files (#6928)

Assign ownership to many of the remaining libs/common files.

Criteria for ownership:
* Files used by a single team, is now owned by that team.
* Files related to a domain owned by a team is now owned by that team.
* Where ownership is unclear the "lowest level" service takes ownership.
---
 .github/whitelist-capital-letters.txt            |  9 ---------
 .../popup/login-via-auth-request.component.ts    |  2 +-
 .../abstractions/overlay.background.ts           |  2 +-
 .../background/notification.background.ts        |  4 ++--
 .../background/overlay.background.spec.ts        |  4 ++--
 .../autofill/background/overlay.background.ts    |  4 ++--
 .../autofill-service.factory.ts                  |  8 ++++----
 .../browser/cipher-context-menu-handler.spec.ts  |  2 +-
 .../browser/cipher-context-menu-handler.ts       |  2 +-
 .../browser/context-menu-clicked-handler.spec.ts |  4 ++--
 .../browser/context-menu-clicked-handler.ts      |  6 +++---
 .../browser/main-context-menu-handler.spec.ts    |  2 +-
 .../browser/main-context-menu-handler.ts         |  2 +-
 apps/browser/src/autofill/jest/autofill-mocks.ts |  3 +--
 .../services/abstractions/autofill.service.ts    |  3 +--
 .../autofill/services/autofill.service.spec.ts   | 14 +++++++-------
 .../src/autofill/services/autofill.service.ts    |  6 +++---
 apps/browser/src/autofill/types/index.ts         |  2 +-
 apps/browser/src/background/main.background.ts   |  4 ++--
 .../background/models/addLoginQueueMessage.ts    |  2 +-
 .../browser/src/background/runtime.background.ts |  2 +-
 .../src/background/webRequest.background.ts      |  2 +-
 .../src/models/browserGroupingsComponentState.ts |  2 +-
 .../service-factories/log-service.factory.ts     |  2 +-
 .../platform/services/browser-crypto.service.ts  |  2 +-
 apps/browser/src/popup/app-routing.module.ts     |  2 +-
 apps/browser/src/popup/services/init.service.ts  |  2 +-
 .../src/popup/services/services.module.ts        |  8 ++++----
 .../src/popup/settings/autofill.component.ts     |  2 +-
 .../src/popup/settings/options.component.ts      |  7 ++++---
 .../service_factories}/totp-service.factory.ts   |  4 ++--
 .../popup/components/action-buttons.component.ts |  4 ++--
 .../popup/components/fido2/fido2.component.ts    |  3 +--
 .../popup/components/vault/add-edit.component.ts |  2 +-
 .../components/vault/current-tab.component.ts    |  2 +-
 .../components/vault/vault-filter.component.ts   |  4 ++--
 .../components/vault/vault-items.component.ts    |  4 ++--
 .../popup/components/vault/view.component.ts     |  4 ++--
 .../popup/utils/vault-popout-window.spec.ts      |  2 +-
 .../src/vault/popup/utils/vault-popout-window.ts |  2 +-
 apps/cli/src/auth/commands/login.command.ts      |  2 +-
 apps/cli/src/auth/commands/unlock.command.ts     |  2 +-
 apps/cli/src/bw.ts                               |  5 +++--
 apps/cli/src/commands/get.command.ts             |  4 ++--
 .../src/platform/services/console-log.service.ts |  2 +-
 .../platform/services/lowdb-storage.service.ts   |  2 +-
 .../src/tools/send/commands/create.command.ts    |  2 +-
 .../src/tools/send/commands/receive.command.ts   |  2 +-
 apps/cli/src/utils.ts                            |  2 +-
 apps/cli/src/vault/models/cipher.response.ts     |  2 +-
 .../src/app/accounts/settings.component.ts       |  5 +++--
 apps/desktop/src/app/app-routing.module.ts       |  2 +-
 apps/desktop/src/app/app.component.ts            |  2 +-
 .../src/app/services/desktop-theming.service.ts  |  4 ++--
 apps/desktop/src/app/services/init.service.ts    |  2 +-
 apps/desktop/src/app/services/services.module.ts |  2 +-
 .../desktop/src/auth/delete-account.component.ts |  2 +-
 .../login/login-via-auth-request.component.ts    |  2 +-
 apps/desktop/src/platform/preload.ts             |  3 ++-
 .../platform/services/electron-crypto.service.ts |  2 +-
 .../platform/services/electron-log.service.ts    |  2 +-
 .../services/electron-storage.service.ts         |  2 +-
 .../services/electron-main-messaging.service.ts  |  2 +-
 .../encrypted-message-handler.service.ts         |  2 +-
 .../src/services/native-messaging.service.ts     |  2 +-
 .../src/vault/app/vault/vault.component.ts       |  4 ++--
 .../src/vault/app/vault/view.component.ts        |  2 +-
 apps/desktop/tsconfig.json                       |  1 +
 .../delete-organization-dialog.component.ts      |  4 ++--
 .../enroll-master-password-reset.component.ts    |  2 +-
 .../providers/providers.component.ts             |  2 +-
 .../settings/sponsored-families.component.ts     |  2 +-
 .../webauthn-login-admin.service.ts              |  2 +-
 .../emergency-access/models/emergency-access.ts  |  2 +-
 .../response/emergency-access.response.ts        |  2 +-
 .../services/emergency-access.service.spec.ts    |  2 +-
 .../login/login-via-auth-request.component.ts    |  2 +-
 .../migrate-legacy-encryption.service.spec.ts    |  2 +-
 .../settings/deauthorize-sessions.component.ts   |  2 +-
 .../emergency-access-takeover.component.ts       |  2 +-
 .../view/emergency-add-edit-cipher.component.ts  |  2 +-
 .../auth/settings/two-factor-verify.component.ts |  2 +-
 .../create-credential-dialog.component.ts        |  2 +-
 .../delete-credential-dialog.component.ts        |  2 +-
 .../billing-sync-api-key.component.ts            |  2 +-
 .../src/app/billing/shared/payment.component.ts  |  2 +-
 apps/web/src/app/core/html-storage.service.ts    |  2 +-
 apps/web/src/app/core/init.service.ts            |  2 +-
 apps/web/src/app/core/state/global-state.ts      |  2 +-
 apps/web/src/app/layouts/navbar.component.ts     |  2 +-
 apps/web/src/app/oss-routing.module.ts           |  2 +-
 .../pages/exposed-passwords-report.component.ts  |  2 +-
 .../inactive-two-factor-report.component.ts      |  2 +-
 .../pages/reused-passwords-report.component.ts   |  2 +-
 .../pages/unsecured-websites-report.component.ts |  2 +-
 .../pages/weak-passwords-report.component.ts     |  2 +-
 apps/web/src/app/settings/api-key.component.ts   |  2 +-
 .../change-kdf-confirmation.component.ts         |  2 +-
 .../settings/change-kdf/change-kdf.component.ts  |  4 ++--
 .../src/app/settings/delete-account.component.ts |  2 +-
 .../src/app/settings/preferences.component.ts    |  4 ++--
 .../src/app/settings/purge-vault.component.ts    |  2 +-
 apps/web/src/app/tools/send/access.component.ts  |  2 +-
 .../app/tools/vault-export/export.component.ts   |  2 +-
 .../vault-items/vault-cipher-row.component.ts    |  2 +-
 .../vault-items/vault-items.stories.ts           |  2 +-
 .../vault/individual-vault/add-edit.component.ts |  4 ++--
 .../components/vault-filter.component.ts         |  4 ++--
 .../abstractions/vault-filter.service.ts         |  2 +-
 .../routed-vault-filter-bridge.service.ts        |  4 ++--
 .../services/vault-filter.service.ts             |  6 +++---
 .../components/vault-filter-section.component.ts |  2 +-
 .../shared/models/filter-function.spec.ts        |  2 +-
 .../shared/models/filter-function.ts             |  2 +-
 .../models/routed-vault-filter-bridge.model.ts   |  4 ++--
 .../shared/models/vault-filter-section.type.ts   |  2 +-
 .../shared/models/vault-filter.model.spec.ts     |  4 ++--
 .../shared/models/vault-filter.model.ts          |  4 ++--
 .../shared/models/vault-filter.type.ts           |  6 +++---
 .../vault-header/vault-header.component.ts       |  2 +-
 .../vault/individual-vault/vault.component.ts    |  9 +++++----
 .../app/vault/org-vault/add-edit.component.ts    |  2 +-
 .../vault-filter/vault-filter.component.ts       |  2 +-
 .../vault-filter/vault-filter.service.ts         |  2 +-
 .../vault-header/vault-header.component.ts       |  2 +-
 .../src/app/vault/org-vault/vault.component.ts   |  6 +++---
 apps/web/src/app/vault/utils/collection-utils.ts |  4 ++--
 .../organizations-routing.module.ts              |  2 +-
 .../clients/add-organization.component.ts        |  2 +-
 .../guards/provider-permissions.guard.spec.ts    |  2 +-
 .../guards/provider-permissions.guard.ts         |  2 +-
 .../providers/manage/manage.component.ts         |  2 +-
 .../providers/providers-layout.component.ts      |  2 +-
 .../providers/providers-routing.module.ts        |  2 +-
 .../not-allowed-value-async.validator.ts}        |  0
 .../auth/components/change-password.component.ts |  2 +-
 .../src/auth/components/lock.component.ts        |  2 +-
 .../login-via-auth-request.component.ts          |  2 +-
 .../src/auth/components/register.component.ts    |  4 ++--
 .../auth/components/set-password.component.ts    |  6 +++++-
 .../src/auth/components/set-pin.component.ts     |  2 +-
 .../auth/components/update-password.component.ts |  2 +-
 .../components/update-temp-password.component.ts |  2 +-
 .../user-verification-prompt.component.ts        |  2 +-
 .../components/user-verification.component.ts    |  2 +-
 .../validators/inputs-field-match.validator.ts}  |  2 +-
 .../guard/feature-flag.guard.spec.ts             |  0
 .../{ => platform}/guard/feature-flag.guard.ts   |  0
 .../services/theming/theme-builder.ts}           |  2 +-
 .../src/{ => platform}/services/theming/theme.ts |  2 +-
 .../theming/theming.service.abstraction.ts       |  2 +-
 .../services/theming/theming.service.ts          |  6 +++---
 .../src/services/jslib-services.module.ts        | 12 ++++++------
 .../tools/export/components/export.component.ts  |  3 ++-
 .../generator/components/generator.component.ts  |  2 +-
 .../add-edit-custom-fields.component.ts          |  4 ++--
 .../src/vault/components/add-edit.component.ts   |  4 ++--
 .../components/view-custom-fields.component.ts   |  3 ++-
 .../src/vault/components/view.component.ts       |  6 +++---
 .../components/collection-filter.component.ts    |  2 +-
 .../components/folder-filter.component.ts        |  2 +-
 .../components/organization-filter.component.ts  |  2 +-
 .../components/type-filter.component.ts          |  4 ++--
 .../components/vault-filter.component.ts         |  2 +-
 .../models/dynamic-tree-node.model.ts            |  2 +-
 .../models/top-level-tree-node.model.ts          |  2 +-
 .../models/vault-filter.model.spec.ts            |  2 +-
 .../vault-filter/models/vault-filter.model.ts    |  2 +-
 .../services/vault-filter.service.ts             |  4 ++--
 .../responses/organization-user.response.ts      |  2 +-
 .../abstractions/provider.service.ts             |  2 +-
 libs/common/src/admin-console/enums/index.ts     |  1 +
 .../enums/provider-type.enum.ts                  |  0
 .../models/data/organization.data.ts             |  4 ++--
 .../admin-console/models/domain/organization.ts  |  4 ++--
 .../models/domain/provider.ts                    |  4 ++--
 .../response/profile-organization.response.ts    |  4 ++--
 .../admin-console/services/provider.service.ts   |  2 +-
 .../src/auth/abstractions/account-api.service.ts |  2 +-
 .../abstractions/anonymous-hub.service.ts}       |  0
 .../user-verification.service.abstraction.ts     |  2 +-
 libs/common/src/auth/captcha-iframe.ts           |  3 ++-
 .../iframe-component.ts}                         |  0
 .../password-login.strategy.spec.ts              |  2 +-
 .../login-strategies/password-login.strategy.ts  |  2 +-
 .../request/set-key-connector-key.request.ts     |  2 +-
 .../auth/models/request/set-password.request.ts  |  2 +-
 .../models/response/identity-token.response.ts   |  2 +-
 .../auth/models/response/prelogin.response.ts    |  2 +-
 .../src/auth/services/account-api.service.ts     |  2 +-
 .../services/anonymous-hub.service.ts}           | 11 +++++------
 libs/common/src/auth/services/auth.service.ts    |  2 +-
 .../services/device-trust-crypto.service.spec.ts |  2 +-
 .../user-verification.service.ts                 |  2 +-
 libs/common/src/{ => auth}/types/verification.ts |  2 +-
 libs/common/src/enums/index.ts                   | 15 ---------------
 libs/common/src/models/export/field.export.ts    |  2 +-
 .../common/src/models/export/login-uri.export.ts |  2 +-
 .../src/models/export/secure-note.export.ts      |  2 +-
 libs/common/src/models/request/kdf.request.ts    |  2 +-
 .../src/models/request/register.request.ts       |  2 +-
 .../src/platform/abstractions/crypto.service.ts  |  2 +-
 .../file-upload/file-upload.service.ts           |  2 +-
 .../src/platform/abstractions/log.service.ts     |  2 +-
 .../src/platform/abstractions/state.service.ts   |  3 ++-
 .../{ => platform}/enums/encryption-type.enum.ts |  0
 .../enums/file-upload-type.enum.ts               |  0
 .../{ => platform}/enums/hash-purpose.enum.ts    |  0
 .../enums/html-storage-location.enum.ts          |  0
 libs/common/src/platform/enums/index.ts          |  9 +++++++++
 .../src/{ => platform}/enums/kdf-type.enum.ts    |  3 +--
 .../enums/key-suffix-options.enum.ts             |  0
 .../{ => platform}/enums/log-level-type.enum.ts  |  0
 .../enums/storage-location.enum.ts               |  0
 .../src/{ => platform}/enums/theme-type.enum.ts  |  0
 libs/common/src/platform/interfaces/encrypted.ts |  2 +-
 .../common/src/platform/models/domain/account.ts |  3 ++-
 .../models/domain/enc-array-buffer.spec.ts       |  2 +-
 .../platform/models/domain/enc-array-buffer.ts   |  2 +-
 .../platform/models/domain/enc-string.spec.ts    |  2 +-
 .../src/platform/models/domain/enc-string.ts     |  4 ++--
 .../src/platform/models/domain/global-state.ts   |  2 +-
 .../platform/models/domain/storage-options.ts    |  2 +-
 .../models/domain/symmetric-crypto-key.spec.ts   |  2 +-
 .../models/domain/symmetric-crypto-key.ts        |  2 +-
 .../src/platform/services/app-id.service.ts      |  2 +-
 .../src/platform/services/console-log.service.ts |  2 +-
 .../src/platform/services/crypto.service.ts      | 16 ++++++++--------
 .../encrypt.service.implementation.ts            |  2 +-
 .../platform/services/encrypt.service.spec.ts    |  2 +-
 .../services/file-upload/file-upload.service.ts  |  2 +-
 .../src/platform/services/state.service.ts       |  9 ++-------
 libs/common/src/services/search.service.ts       |  2 +-
 .../enums/encrypted-export-type.enum.ts          |  0
 .../models/domain/email-forwarder-options.ts     |  0
 .../response/send-file-upload-data.response.ts   |  2 +-
 libs/common/src/tools/send/send-kdf.ts           |  1 +
 .../src/tools/send/services/send.service.ts      |  2 +-
 .../src/vault/abstractions/cipher.service.ts     |  2 +-
 .../src/vault/abstractions/collection.service.ts |  2 +-
 .../src/{ => vault}/abstractions/totp.service.ts |  0
 .../src/{ => vault}/enums/field-type.enum.ts     |  0
 libs/common/src/vault/enums/index.ts             |  6 ++++++
 .../src/{ => vault}/enums/linked-id-type.enum.ts |  0
 .../{ => vault}/enums/secure-note-type.enum.ts   |  0
 .../src/{ => vault}/enums/uri-match-type.enum.ts |  0
 .../linked-field-option.decorator.ts}            |  4 ++--
 .../src/{ => vault}/models/api/card.api.ts       |  2 +-
 .../{ => models}/api/fido2-credential.api.ts     |  2 +-
 .../src/{ => vault}/models/api/field.api.ts      |  2 +-
 .../src/{ => vault}/models/api/identity.api.ts   |  2 +-
 .../src/{ => vault}/models/api/login-uri.api.ts  |  2 +-
 .../src/{ => vault}/models/api/login.api.ts      |  4 ++--
 .../{ => vault}/models/api/secure-note.api.ts    |  2 +-
 libs/common/src/vault/models/data/card.data.ts   |  2 +-
 .../vault/models/data/fido2-credential.data.ts   |  2 +-
 libs/common/src/vault/models/data/field.data.ts  |  4 ++--
 .../src/vault/models/data/identity.data.ts       |  2 +-
 .../src/vault/models/data/login-uri.data.ts      |  4 ++--
 libs/common/src/vault/models/data/login.data.ts  |  2 +-
 .../src/vault/models/data/secure-note.data.ts    |  4 ++--
 .../src/vault/models/domain/cipher.spec.ts       |  2 +-
 .../vault/models/domain/fido2-credential.spec.ts |  2 +-
 .../common/src/vault/models/domain/field.spec.ts |  2 +-
 libs/common/src/vault/models/domain/field.ts     |  2 +-
 .../src/vault/models/domain/login-uri.spec.ts    |  2 +-
 libs/common/src/vault/models/domain/login-uri.ts |  2 +-
 .../common/src/vault/models/domain/login.spec.ts |  4 ++--
 .../src/vault/models/domain/secure-note.spec.ts  |  2 +-
 .../src/vault/models/domain/secure-note.ts       |  2 +-
 .../src/{ => vault}/models/domain/tree-node.ts   |  0
 .../src/vault/models/request/cipher.request.ts   | 14 +++++++-------
 .../response/attachment-upload-data.response.ts  |  2 +-
 .../src/vault/models/response/cipher.response.ts | 10 +++++-----
 libs/common/src/vault/models/view/card.view.ts   |  4 ++--
 libs/common/src/vault/models/view/cipher.view.ts |  2 +-
 .../src/vault/models/view/collection.view.ts     |  2 +-
 libs/common/src/vault/models/view/field.view.ts  |  2 +-
 libs/common/src/vault/models/view/folder.view.ts |  2 +-
 .../src/vault/models/view/identity.view.ts       |  4 ++--
 libs/common/src/vault/models/view/item.view.ts   |  2 +-
 .../src/vault/models/view/login-uri-view.spec.ts |  2 +-
 .../src/vault/models/view/login-uri.view.ts      |  2 +-
 libs/common/src/vault/models/view/login.view.ts  |  4 ++--
 .../src/vault/models/view/secure-note.view.ts    |  2 +-
 .../service-utils.spec.ts}                       |  5 ++---
 .../serviceUtils.ts => vault/service-utils.ts}   |  2 +-
 .../src/vault/services/cipher.service.spec.ts    |  2 +-
 libs/common/src/vault/services/cipher.service.ts |  2 +-
 .../src/vault/services/collection.service.ts     |  4 ++--
 .../src/{ => vault}/services/totp.service.ts     |  6 +++---
 .../services/vault-export.service.spec.ts        |  4 ++--
 .../services/vault-export.service.ts             |  4 ++--
 libs/importer/spec/base-importer.spec.ts         |  2 +-
 ...bitwarden-password-protected-importer.spec.ts |  2 +-
 libs/importer/spec/dashlane-csv-importer.spec.ts |  2 +-
 libs/importer/spec/enpass-json-importer.spec.ts  |  2 +-
 libs/importer/spec/lastpass-csv-importer.spec.ts |  3 +--
 libs/importer/spec/myki-csv-importer.spec.ts     |  2 +-
 libs/importer/spec/nordpass-csv-importer.spec.ts |  3 +--
 .../spec/onepassword-1pif-importer.spec.ts       |  2 +-
 .../spec/onepassword-1pux-importer.spec.ts       |  3 +--
 .../spec/onepassword-mac-csv-importer.spec.ts    |  2 +-
 .../spec/onepassword-win-csv-importer.spec.ts    |  3 +--
 .../spec/protonpass-json-importer.spec.ts        |  3 +--
 libs/importer/spec/psono-json-importer.spec.ts   |  3 +--
 .../dialog/import-success-dialog.component.ts    |  2 +-
 .../src/importers/avast/avast-json-importer.ts   |  3 +--
 libs/importer/src/importers/base-importer.ts     |  3 +--
 .../bitwarden/bitwarden-csv-importer.ts          |  3 +--
 .../bitwarden-password-protected-importer.ts     |  2 +-
 .../importers/dashlane/dashlane-csv-importer.ts  |  3 +--
 .../importers/dashlane/dashlane-json-importer.ts |  3 +--
 .../src/importers/encryptr-csv-importer.ts       |  2 +-
 .../src/importers/enpass/enpass-csv-importer.ts  |  3 +--
 .../src/importers/enpass/enpass-json-importer.ts |  3 +--
 .../fsecure/fsecure-fsk-importer.spec.ts         |  2 +-
 .../importers/fsecure/fsecure-fsk-importer.ts    |  2 +-
 .../src/importers/keepass2-xml-importer.ts       |  2 +-
 .../src/importers/lastpass-csv-importer.ts       |  3 +--
 .../src/importers/msecure-csv-importer.ts        |  3 +--
 libs/importer/src/importers/myki-csv-importer.ts |  3 +--
 .../src/importers/nordpass-csv-importer.ts       |  3 +--
 .../onepassword/onepassword-1pif-importer.ts     |  3 +--
 .../onepassword/onepassword-1pux-importer.ts     |  3 +--
 .../onepassword/onepassword-csv-importer.ts      |  3 +--
 .../onepassword/onepassword-mac-csv-importer.ts  |  2 +-
 .../onepassword/onepassword-win-csv-importer.ts  |  2 +-
 .../src/importers/passwordboss-json-importer.ts  |  2 +-
 .../protonpass/protonpass-json-importer.ts       |  3 +--
 .../src/importers/psono/psono-json-importer.ts   |  3 +--
 .../src/importers/remembear-csv-importer.ts      |  2 +-
 .../src/importers/safeincloud-xml-importer.ts    |  3 +--
 .../src/importers/truekey-csv-importer.ts        |  3 +--
 libs/importer/src/services/import.service.ts     |  2 +-
 .../misc/nodeUtils.ts => node/src/node-utils.ts} |  0
 336 files changed, 446 insertions(+), 473 deletions(-)
 rename apps/browser/src/{auth/background/service-factories => vault/background/service_factories}/totp-service.factory.ts (89%)
 rename libs/angular/src/{validators/notAllowedValueAsync.validator.ts => admin-console/validators/not-allowed-value-async.validator.ts} (100%)
 rename libs/angular/src/{validators/inputsFieldMatch.validator.ts => auth/validators/inputs-field-match.validator.ts} (94%)
 rename libs/angular/src/{ => platform}/guard/feature-flag.guard.spec.ts (100%)
 rename libs/angular/src/{ => platform}/guard/feature-flag.guard.ts (100%)
 rename libs/angular/src/{services/theming/themeBuilder.ts => platform/services/theming/theme-builder.ts} (90%)
 rename libs/angular/src/{ => platform}/services/theming/theme.ts (58%)
 rename libs/angular/src/{ => platform}/services/theming/theming.service.abstraction.ts (83%)
 rename libs/angular/src/{ => platform}/services/theming/theming.service.ts (93%)
 rename libs/common/src/{ => admin-console}/enums/provider-type.enum.ts (100%)
 rename libs/common/src/{ => admin-console}/models/domain/provider.ts (90%)
 rename libs/common/src/{abstractions/anonymousHub.service.ts => auth/abstractions/anonymous-hub.service.ts} (100%)
 rename libs/common/src/{misc/iframe_component.ts => auth/iframe-component.ts} (100%)
 rename libs/common/src/{services/anonymousHub.service.ts => auth/services/anonymous-hub.service.ts} (83%)
 rename libs/common/src/{ => auth}/types/verification.ts (53%)
 rename libs/common/src/{ => platform}/enums/encryption-type.enum.ts (100%)
 rename libs/common/src/{ => platform}/enums/file-upload-type.enum.ts (100%)
 rename libs/common/src/{ => platform}/enums/hash-purpose.enum.ts (100%)
 rename libs/common/src/{ => platform}/enums/html-storage-location.enum.ts (100%)
 create mode 100644 libs/common/src/platform/enums/index.ts
 rename libs/common/src/{ => platform}/enums/kdf-type.enum.ts (78%)
 rename libs/common/src/{ => platform}/enums/key-suffix-options.enum.ts (100%)
 rename libs/common/src/{ => platform}/enums/log-level-type.enum.ts (100%)
 rename libs/common/src/{ => platform}/enums/storage-location.enum.ts (100%)
 rename libs/common/src/{ => platform}/enums/theme-type.enum.ts (100%)
 rename libs/common/src/{ => tools}/enums/encrypted-export-type.enum.ts (100%)
 rename libs/common/src/{ => tools}/models/domain/email-forwarder-options.ts (100%)
 create mode 100644 libs/common/src/tools/send/send-kdf.ts
 rename libs/common/src/{ => vault}/abstractions/totp.service.ts (100%)
 rename libs/common/src/{ => vault}/enums/field-type.enum.ts (100%)
 create mode 100644 libs/common/src/vault/enums/index.ts
 rename libs/common/src/{ => vault}/enums/linked-id-type.enum.ts (100%)
 rename libs/common/src/{ => vault}/enums/secure-note-type.enum.ts (100%)
 rename libs/common/src/{ => vault}/enums/uri-match-type.enum.ts (100%)
 rename libs/common/src/{misc/linkedFieldOption.decorator.ts => vault/linked-field-option.decorator.ts} (90%)
 rename libs/common/src/{ => vault}/models/api/card.api.ts (89%)
 rename libs/common/src/vault/{ => models}/api/fido2-credential.api.ts (94%)
 rename libs/common/src/{ => vault}/models/api/field.api.ts (87%)
 rename libs/common/src/{ => vault}/models/api/identity.api.ts (95%)
 rename libs/common/src/{ => vault}/models/api/login-uri.api.ts (84%)
 rename libs/common/src/{ => vault}/models/api/login.api.ts (89%)
 rename libs/common/src/{ => vault}/models/api/secure-note.api.ts (79%)
 rename libs/common/src/{ => vault}/models/domain/tree-node.ts (100%)
 rename libs/common/src/{misc/serviceUtils.spec.ts => vault/service-utils.spec.ts} (95%)
 rename libs/common/src/{misc/serviceUtils.ts => vault/service-utils.ts} (98%)
 rename libs/common/src/{ => vault}/services/totp.service.ts (95%)
 rename libs/{common/src/misc/nodeUtils.ts => node/src/node-utils.ts} (100%)

diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt
index c02b437e520..dcabbd22263 100644
--- a/.github/whitelist-capital-letters.txt
+++ b/.github/whitelist-capital-letters.txt
@@ -15,15 +15,6 @@
 ./libs/angular/src/scss/webfonts/Open_Sans-normal-600.woff
 ./libs/angular/src/scss/webfonts/Open_Sans-normal-800.woff
 ./libs/angular/src/scss/webfonts/Open_Sans-normal-400.woff
-./libs/angular/src/validators/inputsFieldMatch.validator.ts
-./libs/angular/src/validators/notAllowedValueAsync.validator.ts
-./libs/angular/src/services/theming/themeBuilder.ts
-./libs/common/src/misc/nodeUtils.ts
-./libs/common/src/misc/linkedFieldOption.decorator.ts
-./libs/common/src/misc/serviceUtils.ts
-./libs/common/src/misc/serviceUtils.spec.ts
-./libs/common/src/abstractions/anonymousHub.service.ts
-./libs/common/src/services/anonymousHub.service.ts
 ./libs/auth/README.md
 ./libs/tools/README.md
 ./libs/vault/README.md
diff --git a/apps/browser/src/auth/popup/login-via-auth-request.component.ts b/apps/browser/src/auth/popup/login-via-auth-request.component.ts
index 82451cd1c13..b041f3fdd62 100644
--- a/apps/browser/src/auth/popup/login-via-auth-request.component.ts
+++ b/apps/browser/src/auth/popup/login-via-auth-request.component.ts
@@ -3,8 +3,8 @@ import { Component, OnDestroy, OnInit } from "@angular/core";
 import { Router } from "@angular/router";
 
 import { LoginViaAuthRequestComponent as BaseLoginWithDeviceComponent } from "@bitwarden/angular/auth/components/login-via-auth-request.component";
-import { AnonymousHubService } from "@bitwarden/common/abstractions/anonymousHub.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AnonymousHubService } from "@bitwarden/common/auth/abstractions/anonymous-hub.service";
 import { AuthRequestCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth-request-crypto.service.abstraction";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction";
diff --git a/apps/browser/src/autofill/background/abstractions/overlay.background.ts b/apps/browser/src/autofill/background/abstractions/overlay.background.ts
index 2e5eb1bfa63..58aaa425ac3 100644
--- a/apps/browser/src/autofill/background/abstractions/overlay.background.ts
+++ b/apps/browser/src/autofill/background/abstractions/overlay.background.ts
@@ -1,5 +1,5 @@
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 
 import AutofillPageDetails from "../../models/autofill-page-details";
 
diff --git a/apps/browser/src/autofill/background/notification.background.ts b/apps/browser/src/autofill/background/notification.background.ts
index c60bc666d38..b4768e10e78 100644
--- a/apps/browser/src/autofill/background/notification.background.ts
+++ b/apps/browser/src/autofill/background/notification.background.ts
@@ -4,12 +4,12 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-import { ThemeType } from "@bitwarden/common/enums";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+import { ThemeType } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 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 { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import { openUnlockPopout } from "../../auth/popup/utils/auth-popout-window";
diff --git a/apps/browser/src/autofill/background/overlay.background.spec.ts b/apps/browser/src/autofill/background/overlay.background.spec.ts
index 6f103b9c65a..bc9c2374d56 100644
--- a/apps/browser/src/autofill/background/overlay.background.spec.ts
+++ b/apps/browser/src/autofill/background/overlay.background.spec.ts
@@ -2,12 +2,12 @@ import { mock, mockReset } from "jest-mock-extended";
 
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { AuthService } from "@bitwarden/common/auth/services/auth.service";
-import { ThemeType } from "@bitwarden/common/enums";
+import { ThemeType } from "@bitwarden/common/platform/enums";
 import { EnvironmentService } from "@bitwarden/common/platform/services/environment.service";
 import { I18nService } from "@bitwarden/common/platform/services/i18n.service";
 import { SettingsService } from "@bitwarden/common/services/settings.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
 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 { CipherService } from "@bitwarden/common/vault/services/cipher.service";
 
diff --git a/apps/browser/src/autofill/background/overlay.background.ts b/apps/browser/src/autofill/background/overlay.background.ts
index b80974eda2e..38554ee8aca 100644
--- a/apps/browser/src/autofill/background/overlay.background.ts
+++ b/apps/browser/src/autofill/background/overlay.background.ts
@@ -1,13 +1,13 @@
 import { SettingsService } from "@bitwarden/common/abstractions/settings.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-import { ThemeType } from "@bitwarden/common/enums";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { ThemeType } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { buildCipherIcon } from "@bitwarden/common/vault/icon/build-cipher-icon";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
diff --git a/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts b/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts
index efa5bdcffbb..4050d000817 100644
--- a/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts
+++ b/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts
@@ -1,7 +1,3 @@
-import {
-  TotpServiceInitOptions,
-  totpServiceFactory,
-} from "../../../auth/background/service-factories/totp-service.factory";
 import {
   UserVerificationServiceInitOptions,
   userVerificationServiceFactory,
@@ -31,6 +27,10 @@ import {
   cipherServiceFactory,
   CipherServiceInitOptions,
 } from "../../../vault/background/service_factories/cipher-service.factory";
+import {
+  TotpServiceInitOptions,
+  totpServiceFactory,
+} from "../../../vault/background/service_factories/totp-service.factory";
 import { AutofillService as AbstractAutoFillService } from "../../services/abstractions/autofill.service";
 import AutofillService from "../../services/autofill.service";
 
diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts
index 4532718809e..70820f23ce4 100644
--- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts
+++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts
@@ -3,8 +3,8 @@ import { mock, MockProxy } from "jest-mock-extended";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
 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";
diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
index f46442c4192..ae2f22e244c 100644
--- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
+++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
@@ -4,7 +4,7 @@ import { StateFactory } from "@bitwarden/common/platform/factories/state-factory
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import {
diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts
index f1b2fe3339e..ae5436f71a2 100644
--- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts
+++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts
@@ -1,13 +1,13 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
 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";
 
diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
index a2e139fbee8..19643eb5e5f 100644
--- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
+++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
@@ -1,5 +1,4 @@
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
@@ -8,15 +7,15 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
 import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
 import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
 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 "../../auth/background/service-factories/auth-service.factory";
-import { totpServiceFactory } from "../../auth/background/service-factories/totp-service.factory";
 import { userVerificationServiceFactory } from "../../auth/background/service-factories/user-verification-service.factory";
 import { openUnlockPopout } from "../../auth/popup/utils/auth-popout-window";
 import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem";
@@ -30,6 +29,7 @@ import {
   cipherServiceFactory,
   CipherServiceInitOptions,
 } from "../../vault/background/service_factories/cipher-service.factory";
+import { totpServiceFactory } from "../../vault/background/service_factories/totp-service.factory";
 import {
   openAddEditVaultItemPopout,
   openVaultItemPasswordRepromptPopout,
diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
index 95916d2e6f1..aa5f43fbc94 100644
--- a/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
+++ b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
@@ -2,7 +2,7 @@ import { mock, MockProxy } from "jest-mock-extended";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
index 20e176cf5c4..1e90e90d0d1 100644
--- a/apps/browser/src/autofill/browser/main-context-menu-handler.ts
+++ b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
@@ -3,7 +3,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import { Account } from "../../models/account";
diff --git a/apps/browser/src/autofill/jest/autofill-mocks.ts b/apps/browser/src/autofill/jest/autofill-mocks.ts
index aec61f9df56..6d8c727dd51 100644
--- a/apps/browser/src/autofill/jest/autofill-mocks.ts
+++ b/apps/browser/src/autofill/jest/autofill-mocks.ts
@@ -1,9 +1,8 @@
 import { mock } from "jest-mock-extended";
 
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-import { UriMatchType } from "@bitwarden/common/enums";
+import { UriMatchType, CipherType } from "@bitwarden/common/vault/enums";
 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 { OverlayCipherData } from "../background/abstractions/overlay.background";
diff --git a/apps/browser/src/autofill/services/abstractions/autofill.service.ts b/apps/browser/src/autofill/services/abstractions/autofill.service.ts
index 04beb2e4c48..3e8472f2c1a 100644
--- a/apps/browser/src/autofill/services/abstractions/autofill.service.ts
+++ b/apps/browser/src/autofill/services/abstractions/autofill.service.ts
@@ -1,5 +1,4 @@
-import { UriMatchType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { UriMatchType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import AutofillField from "../../models/autofill-field";
diff --git a/apps/browser/src/autofill/services/autofill.service.spec.ts b/apps/browser/src/autofill/services/autofill.service.spec.ts
index f923f3f1f86..c4bea144d2b 100644
--- a/apps/browser/src/autofill/services/autofill.service.spec.ts
+++ b/apps/browser/src/autofill/services/autofill.service.spec.ts
@@ -1,19 +1,18 @@
 import { mock, mockReset } from "jest-mock-extended";
 
 import { UserVerificationService } from "@bitwarden/common/auth/services/user-verification/user-verification.service";
+import { EventType } from "@bitwarden/common/enums";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
+import { SettingsService } from "@bitwarden/common/services/settings.service";
 import {
-  EventType,
   FieldType,
   LinkedIdType,
   LoginLinkedId,
   UriMatchType,
-} from "@bitwarden/common/enums";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
-import { SettingsService } from "@bitwarden/common/services/settings.service";
-import { TotpService } from "@bitwarden/common/services/totp.service";
+  CipherType,
+} from "@bitwarden/common/vault/enums";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
@@ -21,6 +20,7 @@ import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
 import { CipherService } from "@bitwarden/common/vault/services/cipher.service";
+import { TotpService } from "@bitwarden/common/vault/services/totp.service";
 
 import { BrowserApi } from "../../platform/browser/browser-api";
 import { BrowserStateService } from "../../platform/services/browser-state.service";
diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts
index ebd67abe439..b2672e86762 100644
--- a/apps/browser/src/autofill/services/autofill.service.ts
+++ b/apps/browser/src/autofill/services/autofill.service.ts
@@ -1,12 +1,12 @@
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { SettingsService } from "@bitwarden/common/abstractions/settings.service";
-import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
-import { EventType, FieldType, UriMatchType } from "@bitwarden/common/enums";
+import { EventType } from "@bitwarden/common/enums";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
+import { FieldType, UriMatchType, CipherType } from "@bitwarden/common/vault/enums";
 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";
 
diff --git a/apps/browser/src/autofill/types/index.ts b/apps/browser/src/autofill/types/index.ts
index 880ce3ca1e5..b3b803b7ab4 100644
--- a/apps/browser/src/autofill/types/index.ts
+++ b/apps/browser/src/autofill/types/index.ts
@@ -1,7 +1,7 @@
 import { Region } from "@bitwarden/common/platform/abstractions/environment.service";
 import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
 import { VaultTimeoutAction } from "@bitwarden/common/src/enums/vault-timeout-action.enum";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 
 export type UserSettings = {
   avatarColor: string | null;
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index c04bef0fd80..bb61bb64658 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -6,7 +6,6 @@ import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/
 import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
 import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service";
 import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common/abstractions/settings.service";
-import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/abstractions/totp.service";
 import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service";
 import { InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
@@ -72,7 +71,6 @@ import { EventCollectionService } from "@bitwarden/common/services/event/event-c
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
 import { NotificationsService } from "@bitwarden/common/services/notifications.service";
 import { SearchService } from "@bitwarden/common/services/search.service";
-import { TotpService } from "@bitwarden/common/services/totp.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vault-timeout/vault-timeout-settings.service";
 import {
   PasswordGenerationService,
@@ -99,6 +97,7 @@ import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/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 { TotpService as TotpServiceAbstraction } from "@bitwarden/common/vault/abstractions/totp.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CipherService } from "@bitwarden/common/vault/services/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/services/collection.service";
@@ -108,6 +107,7 @@ import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-u
 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 { TotpService } from "@bitwarden/common/vault/services/totp.service";
 import {
   VaultExportService,
   VaultExportServiceAbstraction,
diff --git a/apps/browser/src/background/models/addLoginQueueMessage.ts b/apps/browser/src/background/models/addLoginQueueMessage.ts
index d5db5db135b..1f727f40a5c 100644
--- a/apps/browser/src/background/models/addLoginQueueMessage.ts
+++ b/apps/browser/src/background/models/addLoginQueueMessage.ts
@@ -1,5 +1,5 @@
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 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";
diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts
index 4099b161cc5..a5c101fa969 100644
--- a/apps/browser/src/background/runtime.background.ts
+++ b/apps/browser/src/background/runtime.background.ts
@@ -6,7 +6,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { SystemService } from "@bitwarden/common/platform/abstractions/system.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 
 import {
   closeUnlockPopout,
diff --git a/apps/browser/src/background/webRequest.background.ts b/apps/browser/src/background/webRequest.background.ts
index 6dd50c23e26..a4ad0d37dc0 100644
--- a/apps/browser/src/background/webRequest.background.ts
+++ b/apps/browser/src/background/webRequest.background.ts
@@ -1,8 +1,8 @@
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-import { UriMatchType } from "@bitwarden/common/enums";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { UriMatchType } from "@bitwarden/common/vault/enums";
 
 import { BrowserApi } from "../platform/browser/browser-api";
 
diff --git a/apps/browser/src/models/browserGroupingsComponentState.ts b/apps/browser/src/models/browserGroupingsComponentState.ts
index 57e80216c23..73cc2a3231b 100644
--- a/apps/browser/src/models/browserGroupingsComponentState.ts
+++ b/apps/browser/src/models/browserGroupingsComponentState.ts
@@ -1,6 +1,6 @@
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { DeepJsonify } from "@bitwarden/common/types/deep-jsonify";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
diff --git a/apps/browser/src/platform/background/service-factories/log-service.factory.ts b/apps/browser/src/platform/background/service-factories/log-service.factory.ts
index 69e49fabb70..4dd5f7dd782 100644
--- a/apps/browser/src/platform/background/service-factories/log-service.factory.ts
+++ b/apps/browser/src/platform/background/service-factories/log-service.factory.ts
@@ -1,5 +1,5 @@
-import { LogLevelType } from "@bitwarden/common/enums";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { LogLevelType } from "@bitwarden/common/platform/enums/log-level-type.enum";
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
 
 import { FactoryOptions, CachedServices, factory } from "./factory-options";
diff --git a/apps/browser/src/platform/services/browser-crypto.service.ts b/apps/browser/src/platform/services/browser-crypto.service.ts
index a6dce0f39e9..0166fd439b0 100644
--- a/apps/browser/src/platform/services/browser-crypto.service.ts
+++ b/apps/browser/src/platform/services/browser-crypto.service.ts
@@ -1,4 +1,4 @@
-import { KeySuffixOptions } from "@bitwarden/common/enums";
+import { KeySuffixOptions } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import {
   SymmetricCryptoKey,
diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index 54e600a574d..33ac4558eca 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -8,7 +8,7 @@ import {
   tdeDecryptionRequiredGuard,
   UnauthGuard,
 } from "@bitwarden/angular/auth/guards";
-import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard";
+import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
 import { fido2AuthGuard } from "../auth/guards/fido2-auth.guard";
diff --git a/apps/browser/src/popup/services/init.service.ts b/apps/browser/src/popup/services/init.service.ts
index 5dd76ebe183..78fbdfaa9f1 100644
--- a/apps/browser/src/popup/services/init.service.ts
+++ b/apps/browser/src/popup/services/init.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from "@angular/core";
 
-import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction";
+import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService as LogServiceAbstraction } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts
index 0059bcaa8ed..2cd0166f946 100644
--- a/apps/browser/src/popup/services/services.module.ts
+++ b/apps/browser/src/popup/services/services.module.ts
@@ -1,15 +1,15 @@
 import { APP_INITIALIZER, LOCALE_ID, NgModule } from "@angular/core";
 
 import { UnauthGuard as BaseUnauthGuardService } from "@bitwarden/angular/auth/guards";
+import { ThemingService } from "@bitwarden/angular/platform/services/theming/theming.service";
+import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction";
 import {
   MEMORY_STORAGE,
+  SECURE_STORAGE,
   OBSERVABLE_DISK_STORAGE,
   OBSERVABLE_MEMORY_STORAGE,
-  SECURE_STORAGE,
 } from "@bitwarden/angular/services/injection-tokens";
 import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services.module";
-import { ThemingService } from "@bitwarden/angular/services/theming/theming.service";
-import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
@@ -17,7 +17,6 @@ import { EventUploadService } from "@bitwarden/common/abstractions/event/event-u
 import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service";
 import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service";
 import { SettingsService } from "@bitwarden/common/abstractions/settings.service";
-import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -87,6 +86,7 @@ import {
   InternalFolderService,
 } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
 import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
 import { DialogService } from "@bitwarden/components";
 import { VaultExportServiceAbstraction } from "@bitwarden/exporter/vault-export";
diff --git a/apps/browser/src/popup/settings/autofill.component.ts b/apps/browser/src/popup/settings/autofill.component.ts
index 17cbf60502f..fb544d7526a 100644
--- a/apps/browser/src/popup/settings/autofill.component.ts
+++ b/apps/browser/src/popup/settings/autofill.component.ts
@@ -1,12 +1,12 @@
 import { Component, OnInit } from "@angular/core";
 
 import { SettingsService } from "@bitwarden/common/abstractions/settings.service";
-import { UriMatchType } from "@bitwarden/common/enums";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { UriMatchType } from "@bitwarden/common/vault/enums";
 import { DialogService } from "@bitwarden/components";
 
 import { AutofillOverlayVisibility } from "../../autofill/utils/autofill-overlay.enum";
diff --git a/apps/browser/src/popup/settings/options.component.ts b/apps/browser/src/popup/settings/options.component.ts
index 159bd100e81..4f943a857be 100644
--- a/apps/browser/src/popup/settings/options.component.ts
+++ b/apps/browser/src/popup/settings/options.component.ts
@@ -1,12 +1,13 @@
 import { Component, OnInit } from "@angular/core";
 
-import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction";
+import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction";
 import { SettingsService } from "@bitwarden/common/abstractions/settings.service";
-import { TotpService } from "@bitwarden/common/abstractions/totp.service";
-import { ThemeType, UriMatchType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { ThemeType } from "@bitwarden/common/platform/enums";
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
+import { UriMatchType } from "@bitwarden/common/vault/enums";
 
 import { flagEnabled } from "../../platform/flags";
 
diff --git a/apps/browser/src/auth/background/service-factories/totp-service.factory.ts b/apps/browser/src/vault/background/service_factories/totp-service.factory.ts
similarity index 89%
rename from apps/browser/src/auth/background/service-factories/totp-service.factory.ts
rename to apps/browser/src/vault/background/service_factories/totp-service.factory.ts
index 48331576cd3..21e042370b7 100644
--- a/apps/browser/src/auth/background/service-factories/totp-service.factory.ts
+++ b/apps/browser/src/vault/background/service_factories/totp-service.factory.ts
@@ -1,5 +1,5 @@
-import { TotpService as AbstractTotpService } from "@bitwarden/common/abstractions/totp.service";
-import { TotpService } from "@bitwarden/common/services/totp.service";
+import { TotpService as AbstractTotpService } from "@bitwarden/common/vault/abstractions/totp.service";
+import { TotpService } from "@bitwarden/common/vault/services/totp.service";
 
 import {
   CryptoFunctionServiceInitOptions,
diff --git a/apps/browser/src/vault/popup/components/action-buttons.component.ts b/apps/browser/src/vault/popup/components/action-buttons.component.ts
index ff8b7cab0d1..e9ed209bb27 100644
--- a/apps/browser/src/vault/popup/components/action-buttons.component.ts
+++ b/apps/browser/src/vault/popup/components/action-buttons.component.ts
@@ -1,13 +1,13 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
 
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { EventType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
 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 { PasswordRepromptService } from "@bitwarden/vault";
 
diff --git a/apps/browser/src/vault/popup/components/fido2/fido2.component.ts b/apps/browser/src/vault/popup/components/fido2/fido2.component.ts
index c0862ab5081..e0a81d760e3 100644
--- a/apps/browser/src/vault/popup/components/fido2/fido2.component.ts
+++ b/apps/browser/src/vault/popup/components/fido2/fido2.component.ts
@@ -14,13 +14,12 @@ import {
 
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { SettingsService } from "@bitwarden/common/abstractions/settings.service";
-import { SecureNoteType } from "@bitwarden/common/enums";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
diff --git a/apps/browser/src/vault/popup/components/vault/add-edit.component.ts b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts
index 519a8a680e4..f7daa8e40ac 100644
--- a/apps/browser/src/vault/popup/components/vault/add-edit.component.ts
+++ b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts
@@ -18,7 +18,7 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { DialogService } from "@bitwarden/components";
 import { PasswordRepromptService } from "@bitwarden/vault";
diff --git a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
index f64f26d0bd3..86c6551fb4f 100644
--- a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
+++ b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
@@ -12,8 +12,8 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 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";
 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 { PasswordRepromptService } from "@bitwarden/vault";
 
diff --git a/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts b/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts
index f6d0ae96fd7..c2bfb262fd4 100644
--- a/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts
+++ b/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts
@@ -6,13 +6,13 @@ import { first } from "rxjs/operators";
 
 import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 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 { CipherType } from "@bitwarden/common/vault/enums";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
diff --git a/apps/browser/src/vault/popup/components/vault/vault-items.component.ts b/apps/browser/src/vault/popup/components/vault/vault-items.component.ts
index 32e7a9eacda..70d9d079c6e 100644
--- a/apps/browser/src/vault/popup/components/vault/vault-items.component.ts
+++ b/apps/browser/src/vault/popup/components/vault/vault-items.component.ts
@@ -7,13 +7,13 @@ import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angul
 import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
diff --git a/apps/browser/src/vault/popup/components/vault/view.component.ts b/apps/browser/src/vault/popup/components/vault/view.component.ts
index f65659d9e6b..2fef48b9bbd 100644
--- a/apps/browser/src/vault/popup/components/vault/view.component.ts
+++ b/apps/browser/src/vault/popup/components/vault/view.component.ts
@@ -8,7 +8,6 @@ import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/vault/com
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
@@ -20,7 +19,8 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { StateService } from "@bitwarden/common/platform/abstractions/state.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 { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { DialogService } from "@bitwarden/components";
diff --git a/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts b/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts
index 76f0cce4b85..d4a8b87c529 100644
--- a/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts
+++ b/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts
@@ -1,6 +1,6 @@
 import { mock } from "jest-mock-extended";
 
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 
 import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
 
diff --git a/apps/browser/src/vault/popup/utils/vault-popout-window.ts b/apps/browser/src/vault/popup/utils/vault-popout-window.ts
index 008daeec426..9812bc550e4 100644
--- a/apps/browser/src/vault/popup/utils/vault-popout-window.ts
+++ b/apps/browser/src/vault/popup/utils/vault-popout-window.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 
 import { BrowserApi } from "../../../platform/browser/browser-api";
 import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
diff --git a/apps/cli/src/auth/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts
index a10b3f05db8..4ce81dbd4cd 100644
--- a/apps/cli/src/auth/commands/login.command.ts
+++ b/apps/cli/src/auth/commands/login.command.ts
@@ -24,7 +24,6 @@ import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/ide
 import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request";
 import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request";
 import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request";
-import { NodeUtils } from "@bitwarden/common/misc/nodeUtils";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
@@ -37,6 +36,7 @@ import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/sym
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { NodeUtils } from "@bitwarden/node/node-utils";
 
 import { Response } from "../../models/response";
 import { MessageResponse } from "../../models/response/message.response";
diff --git a/apps/cli/src/auth/commands/unlock.command.ts b/apps/cli/src/auth/commands/unlock.command.ts
index 9901fe29300..edd1dea043f 100644
--- a/apps/cli/src/auth/commands/unlock.command.ts
+++ b/apps/cli/src/auth/commands/unlock.command.ts
@@ -2,11 +2,11 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
 import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request";
-import { HashPurpose } from "@bitwarden/common/enums";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { HashPurpose } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts
index 640b6a194bb..ceed0f28659 100644
--- a/apps/cli/src/bw.ts
+++ b/apps/cli/src/bw.ts
@@ -29,8 +29,9 @@ import { TokenService } from "@bitwarden/common/auth/services/token.service";
 import { TwoFactorService } from "@bitwarden/common/auth/services/two-factor.service";
 import { UserVerificationApiService } from "@bitwarden/common/auth/services/user-verification/user-verification-api.service";
 import { UserVerificationService } from "@bitwarden/common/auth/services/user-verification/user-verification.service";
-import { ClientType, KeySuffixOptions, LogLevelType } from "@bitwarden/common/enums";
+import { ClientType } from "@bitwarden/common/enums";
 import { ConfigApiServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config-api.service.abstraction";
+import { KeySuffixOptions, LogLevelType } from "@bitwarden/common/platform/enums";
 import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
 import { Account } from "@bitwarden/common/platform/models/domain/account";
 import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
@@ -53,7 +54,6 @@ import { EventCollectionService } from "@bitwarden/common/services/event/event-c
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
 import { SearchService } from "@bitwarden/common/services/search.service";
 import { SettingsService } from "@bitwarden/common/services/settings.service";
-import { TotpService } from "@bitwarden/common/services/totp.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vault-timeout/vault-timeout-settings.service";
 import { VaultTimeoutService } from "@bitwarden/common/services/vault-timeout/vault-timeout.service";
 import {
@@ -74,6 +74,7 @@ import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder
 import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service";
 import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service";
 import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service";
+import { TotpService } from "@bitwarden/common/vault/services/totp.service";
 import {
   VaultExportService,
   VaultExportServiceAbstraction,
diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts
index 1c7f37706c5..f1f6da7b6f2 100644
--- a/apps/cli/src/commands/get.command.ts
+++ b/apps/cli/src/commands/get.command.ts
@@ -2,7 +2,6 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.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 { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { EventType } from "@bitwarden/common/enums";
@@ -24,7 +23,8 @@ import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
diff --git a/apps/cli/src/platform/services/console-log.service.ts b/apps/cli/src/platform/services/console-log.service.ts
index cf3aec036ff..a35dae71fcc 100644
--- a/apps/cli/src/platform/services/console-log.service.ts
+++ b/apps/cli/src/platform/services/console-log.service.ts
@@ -1,4 +1,4 @@
-import { LogLevelType } from "@bitwarden/common/enums";
+import { LogLevelType } from "@bitwarden/common/platform/enums/log-level-type.enum";
 import { ConsoleLogService as BaseConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
 
 export class ConsoleLogService extends BaseConsoleLogService {
diff --git a/apps/cli/src/platform/services/lowdb-storage.service.ts b/apps/cli/src/platform/services/lowdb-storage.service.ts
index 5e3072ea5e6..6beea9945dd 100644
--- a/apps/cli/src/platform/services/lowdb-storage.service.ts
+++ b/apps/cli/src/platform/services/lowdb-storage.service.ts
@@ -7,7 +7,6 @@ import * as lock from "proper-lockfile";
 import { OperationOptions } from "retry";
 import { Subject } from "rxjs";
 
-import { NodeUtils } from "@bitwarden/common/misc/nodeUtils";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import {
   AbstractStorageService,
@@ -15,6 +14,7 @@ import {
 } from "@bitwarden/common/platform/abstractions/storage.service";
 import { sequentialize } from "@bitwarden/common/platform/misc/sequentialize";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { NodeUtils } from "@bitwarden/node/node-utils";
 
 const retries: OperationOptions = {
   retries: 50,
diff --git a/apps/cli/src/tools/send/commands/create.command.ts b/apps/cli/src/tools/send/commands/create.command.ts
index 54e8340bdbe..fd3b9428b2e 100644
--- a/apps/cli/src/tools/send/commands/create.command.ts
+++ b/apps/cli/src/tools/send/commands/create.command.ts
@@ -1,12 +1,12 @@
 import * as fs from "fs";
 import * as path from "path";
 
-import { NodeUtils } from "@bitwarden/common/misc/nodeUtils";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
+import { NodeUtils } from "@bitwarden/node/node-utils";
 
 import { Response } from "../../../models/response";
 import { CliUtils } from "../../../utils";
diff --git a/apps/cli/src/tools/send/commands/receive.command.ts b/apps/cli/src/tools/send/commands/receive.command.ts
index 52cff0b462e..f5f35783275 100644
--- a/apps/cli/src/tools/send/commands/receive.command.ts
+++ b/apps/cli/src/tools/send/commands/receive.command.ts
@@ -2,7 +2,6 @@ import * as program from "commander";
 import * as inquirer from "inquirer";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { NodeUtils } from "@bitwarden/common/misc/nodeUtils";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
@@ -15,6 +14,7 @@ import { SendAccess } from "@bitwarden/common/tools/send/models/domain/send-acce
 import { SendAccessRequest } from "@bitwarden/common/tools/send/models/request/send-access.request";
 import { SendAccessView } from "@bitwarden/common/tools/send/models/view/send-access.view";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
+import { NodeUtils } from "@bitwarden/node/node-utils";
 
 import { DownloadCommand } from "../../../commands/download.command";
 import { Response } from "../../../models/response";
diff --git a/apps/cli/src/utils.ts b/apps/cli/src/utils.ts
index 5d77f6d3730..77efbb80d4d 100644
--- a/apps/cli/src/utils.ts
+++ b/apps/cli/src/utils.ts
@@ -5,11 +5,11 @@ import * as inquirer from "inquirer";
 import * as JSZip from "jszip";
 
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { NodeUtils } from "@bitwarden/common/misc/nodeUtils";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
+import { NodeUtils } from "@bitwarden/node/node-utils";
 
 import { Response } from "./models/response";
 import { MessageResponse } from "./models/response/message.response";
diff --git a/apps/cli/src/vault/models/cipher.response.ts b/apps/cli/src/vault/models/cipher.response.ts
index a730894366c..8df1b42f1e8 100644
--- a/apps/cli/src/vault/models/cipher.response.ts
+++ b/apps/cli/src/vault/models/cipher.response.ts
@@ -1,5 +1,5 @@
 import { CipherWithIdExport } from "@bitwarden/common/models/export/cipher-with-ids.export";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import { BaseResponse } from "../../models/response/base.response";
diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
index 8d6ef07a515..07210ea4935 100644
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -3,19 +3,20 @@ import { FormBuilder } from "@angular/forms";
 import { BehaviorSubject, firstValueFrom, Observable, Subject } from "rxjs";
 import { concatMap, debounceTime, filter, map, switchMap, takeUntil, tap } from "rxjs/operators";
 
+import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
-import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction";
 import { SettingsService } from "@bitwarden/common/abstractions/settings.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { UserVerificationService as UserVerificationServiceAbstraction } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
-import { DeviceType, ThemeType, KeySuffixOptions } from "@bitwarden/common/enums";
+import { DeviceType } from "@bitwarden/common/enums";
 import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { ThemeType, KeySuffixOptions } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { DialogService } from "@bitwarden/components";
 
diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts
index 0525c6259d4..372f8b14da0 100644
--- a/apps/desktop/src/app/app-routing.module.ts
+++ b/apps/desktop/src/app/app-routing.module.ts
@@ -7,7 +7,7 @@ import {
   redirectGuard,
   tdeDecryptionRequiredGuard,
 } from "@bitwarden/angular/auth/guards";
-import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard";
+import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
 import { AccessibilityCookieComponent } from "../auth/accessibility-cookie.component";
diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts
index 51671542588..5216960654a 100644
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -43,7 +43,7 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { DialogService } from "@bitwarden/components";
 
 import { DeleteAccountComponent } from "../auth/delete-account.component";
diff --git a/apps/desktop/src/app/services/desktop-theming.service.ts b/apps/desktop/src/app/services/desktop-theming.service.ts
index 3157ad9f661..2d0e19eae32 100644
--- a/apps/desktop/src/app/services/desktop-theming.service.ts
+++ b/apps/desktop/src/app/services/desktop-theming.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 
-import { ThemingService } from "@bitwarden/angular/services/theming/theming.service";
-import { ThemeType } from "@bitwarden/common/enums";
+import { ThemingService } from "@bitwarden/angular/platform/services/theming/theming.service";
+import { ThemeType } from "@bitwarden/common/platform/enums";
 
 @Injectable()
 export class DesktopThemingService extends ThemingService {
diff --git a/apps/desktop/src/app/services/init.service.ts b/apps/desktop/src/app/services/init.service.ts
index f45a60cadc4..f49f0f5fb1a 100644
--- a/apps/desktop/src/app/services/init.service.ts
+++ b/apps/desktop/src/app/services/init.service.ts
@@ -1,7 +1,7 @@
 import { Inject, Injectable } from "@angular/core";
 
+import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction";
 import { WINDOW } from "@bitwarden/angular/services/injection-tokens";
-import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
 import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/auth/abstractions/two-factor.service";
diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts
index 7d5f3615eae..8ff79c7a151 100644
--- a/apps/desktop/src/app/services/services.module.ts
+++ b/apps/desktop/src/app/services/services.module.ts
@@ -1,5 +1,6 @@
 import { APP_INITIALIZER, InjectionToken, NgModule } from "@angular/core";
 
+import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction";
 import {
   SECURE_STORAGE,
   STATE_FACTORY,
@@ -11,7 +12,6 @@ import {
   OBSERVABLE_DISK_STORAGE,
 } from "@bitwarden/angular/services/injection-tokens";
 import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services.module";
-import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction";
 import { PolicyService as PolicyServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService as AccountServiceAbstraction } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service";
diff --git a/apps/desktop/src/auth/delete-account.component.ts b/apps/desktop/src/auth/delete-account.component.ts
index a6e3775b638..6efd3809500 100644
--- a/apps/desktop/src/auth/delete-account.component.ts
+++ b/apps/desktop/src/auth/delete-account.component.ts
@@ -2,10 +2,10 @@ import { Component } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 
 import { AccountApiService } from "@bitwarden/common/auth/abstractions/account-api.service";
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Verification } from "@bitwarden/common/types/verification";
 
 @Component({
   selector: "app-delete-account",
diff --git a/apps/desktop/src/auth/login/login-via-auth-request.component.ts b/apps/desktop/src/auth/login/login-via-auth-request.component.ts
index 0fd426bc852..0b8f97aaf3a 100644
--- a/apps/desktop/src/auth/login/login-via-auth-request.component.ts
+++ b/apps/desktop/src/auth/login/login-via-auth-request.component.ts
@@ -4,8 +4,8 @@ import { Router } from "@angular/router";
 
 import { LoginViaAuthRequestComponent as BaseLoginWithDeviceComponent } from "@bitwarden/angular/auth/components/login-via-auth-request.component";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
-import { AnonymousHubService } from "@bitwarden/common/abstractions/anonymousHub.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AnonymousHubService } from "@bitwarden/common/auth/abstractions/anonymous-hub.service";
 import { AuthRequestCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth-request-crypto.service.abstraction";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction";
diff --git a/apps/desktop/src/platform/preload.ts b/apps/desktop/src/platform/preload.ts
index de572122eed..0808a634385 100644
--- a/apps/desktop/src/platform/preload.ts
+++ b/apps/desktop/src/platform/preload.ts
@@ -1,6 +1,7 @@
 import { ipcRenderer } from "electron";
 
-import { DeviceType, ThemeType, KeySuffixOptions } from "@bitwarden/common/enums";
+import { DeviceType } from "@bitwarden/common/enums";
+import { ThemeType, KeySuffixOptions } from "@bitwarden/common/platform/enums";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 
 import {
diff --git a/apps/desktop/src/platform/services/electron-crypto.service.ts b/apps/desktop/src/platform/services/electron-crypto.service.ts
index e21d2001977..6ebe8d963ff 100644
--- a/apps/desktop/src/platform/services/electron-crypto.service.ts
+++ b/apps/desktop/src/platform/services/electron-crypto.service.ts
@@ -1,8 +1,8 @@
-import { KeySuffixOptions } from "@bitwarden/common/enums";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { KeySuffixOptions } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import {
diff --git a/apps/desktop/src/platform/services/electron-log.service.ts b/apps/desktop/src/platform/services/electron-log.service.ts
index 55d4c62f94a..163e0821852 100644
--- a/apps/desktop/src/platform/services/electron-log.service.ts
+++ b/apps/desktop/src/platform/services/electron-log.service.ts
@@ -2,7 +2,7 @@ import * as path from "path";
 
 import log from "electron-log";
 
-import { LogLevelType } from "@bitwarden/common/enums";
+import { LogLevelType } from "@bitwarden/common/platform/enums/log-level-type.enum";
 import { ConsoleLogService as BaseLogService } from "@bitwarden/common/platform/services/console-log.service";
 
 import { isDev } from "../../utils";
diff --git a/apps/desktop/src/platform/services/electron-storage.service.ts b/apps/desktop/src/platform/services/electron-storage.service.ts
index e9dc0664242..dc145fc2f7e 100644
--- a/apps/desktop/src/platform/services/electron-storage.service.ts
+++ b/apps/desktop/src/platform/services/electron-storage.service.ts
@@ -3,11 +3,11 @@ import * as fs from "fs";
 import { ipcMain } from "electron";
 import { Subject } from "rxjs";
 
-import { NodeUtils } from "@bitwarden/common/misc/nodeUtils";
 import {
   AbstractStorageService,
   StorageUpdate,
 } from "@bitwarden/common/platform/abstractions/storage.service";
+import { NodeUtils } from "@bitwarden/node/node-utils";
 
 // See: https://github.com/sindresorhus/electron-store/blob/main/index.d.ts
 interface ElectronStoreOptions {
diff --git a/apps/desktop/src/services/electron-main-messaging.service.ts b/apps/desktop/src/services/electron-main-messaging.service.ts
index 1c029edc7f5..e666665e2e7 100644
--- a/apps/desktop/src/services/electron-main-messaging.service.ts
+++ b/apps/desktop/src/services/electron-main-messaging.service.ts
@@ -12,8 +12,8 @@ import {
   shell,
 } from "electron";
 
-import { ThemeType } from "@bitwarden/common/enums";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { ThemeType } from "@bitwarden/common/platform/enums";
 import { SafeUrls } from "@bitwarden/common/platform/misc/safe-urls";
 
 import { WindowMain } from "../main/window.main";
diff --git a/apps/desktop/src/services/encrypted-message-handler.service.ts b/apps/desktop/src/services/encrypted-message-handler.service.ts
index 1ce52cfecc0..1178150cff3 100644
--- a/apps/desktop/src/services/encrypted-message-handler.service.ts
+++ b/apps/desktop/src/services/encrypted-message-handler.service.ts
@@ -7,7 +7,7 @@ import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authenticatio
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 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";
diff --git a/apps/desktop/src/services/native-messaging.service.ts b/apps/desktop/src/services/native-messaging.service.ts
index d4f465dca9e..cfb4c651c63 100644
--- a/apps/desktop/src/services/native-messaging.service.ts
+++ b/apps/desktop/src/services/native-messaging.service.ts
@@ -1,7 +1,6 @@
 import { Injectable, NgZone } from "@angular/core";
 import { firstValueFrom } from "rxjs";
 
-import { KeySuffixOptions } from "@bitwarden/common/enums";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -9,6 +8,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { KeySuffixOptions } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
diff --git a/apps/desktop/src/vault/app/vault/vault.component.ts b/apps/desktop/src/vault/app/vault/vault.component.ts
index 7930663499d..d45b7971b47 100644
--- a/apps/desktop/src/vault/app/vault/vault.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault.component.ts
@@ -15,7 +15,6 @@ import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { EventType } from "@bitwarden/common/enums";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -23,8 +22,9 @@ import { MessagingService } from "@bitwarden/common/platform/abstractions/messag
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
 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 { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 import { DialogService } from "@bitwarden/components";
diff --git a/apps/desktop/src/vault/app/vault/view.component.ts b/apps/desktop/src/vault/app/vault/view.component.ts
index adb72dbfe33..9d7c4db7c76 100644
--- a/apps/desktop/src/vault/app/vault/view.component.ts
+++ b/apps/desktop/src/vault/app/vault/view.component.ts
@@ -11,7 +11,6 @@ import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/vault/com
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
@@ -23,6 +22,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 import { PasswordRepromptService } from "@bitwarden/vault";
diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json
index b479905f897..6f220dd26a3 100644
--- a/apps/desktop/tsconfig.json
+++ b/apps/desktop/tsconfig.json
@@ -17,6 +17,7 @@
       "@bitwarden/exporter/*": ["../../libs/exporter/src/*"],
       "@bitwarden/importer/core": ["../../libs/importer/src"],
       "@bitwarden/importer/ui": ["../../libs/importer/src/components"],
+      "@bitwarden/node/*": ["../../libs/node/src/*"],
       "@bitwarden/vault": ["../../libs/vault/src"]
     },
     "useDefineForClassFields": false
diff --git a/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts b/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts
index 389514d35f2..f846838bf49 100644
--- a/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts
@@ -7,12 +7,12 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-conso
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { Verification } from "@bitwarden/common/types/verification";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 
diff --git a/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts b/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts
index fd09078e78b..437af95e706 100644
--- a/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts
+++ b/apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts
@@ -7,12 +7,12 @@ import { OrganizationUserService } from "@bitwarden/common/admin-console/abstrac
 import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { Verification } from "@bitwarden/common/types/verification";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { DialogService } from "@bitwarden/components";
 
diff --git a/apps/web/src/app/admin-console/providers/providers.component.ts b/apps/web/src/app/admin-console/providers/providers.component.ts
index f7e707b7f6e..dcd486242e9 100644
--- a/apps/web/src/app/admin-console/providers/providers.component.ts
+++ b/apps/web/src/app/admin-console/providers/providers.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from "@angular/core";
 
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
-import { Provider } from "@bitwarden/common/models/domain/provider";
+import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
diff --git a/apps/web/src/app/admin-console/settings/sponsored-families.component.ts b/apps/web/src/app/admin-console/settings/sponsored-families.component.ts
index 0a95773def9..5b934692fea 100644
--- a/apps/web/src/app/admin-console/settings/sponsored-families.component.ts
+++ b/apps/web/src/app/admin-console/settings/sponsored-families.component.ts
@@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit } from "@angular/core";
 import { FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms";
 import { map, Observable, Subject, takeUntil } from "rxjs";
 
-import { notAllowedValueAsync } from "@bitwarden/angular/validators/notAllowedValueAsync.validator";
+import { notAllowedValueAsync } from "@bitwarden/angular/admin-console/validators/not-allowed-value-async.validator";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
diff --git a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts
index 891d403b434..6dfe4e26562 100644
--- a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts
+++ b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts
@@ -4,8 +4,8 @@ import { BehaviorSubject, filter, from, map, Observable, shareReplay, switchMap,
 import { PrfKeySet } from "@bitwarden/auth";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { WebAuthnLoginPrfCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/webauthn/webauthn-login-prf-crypto.service.abstraction";
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { Verification } from "@bitwarden/common/types/verification";
 
 import { CredentialCreateOptionsView } from "../../views/credential-create-options.view";
 import { PendingWebauthnLoginCredentialView } from "../../views/pending-webauthn-login-credential.view";
diff --git a/apps/web/src/app/auth/emergency-access/models/emergency-access.ts b/apps/web/src/app/auth/emergency-access/models/emergency-access.ts
index 28d9476c035..adf77ed5730 100644
--- a/apps/web/src/app/auth/emergency-access/models/emergency-access.ts
+++ b/apps/web/src/app/auth/emergency-access/models/emergency-access.ts
@@ -1,4 +1,4 @@
-import { KdfType } from "@bitwarden/common/enums";
+import { KdfType } from "@bitwarden/common/platform/enums";
 import { CipherResponse } from "@bitwarden/common/vault/models/response/cipher.response";
 
 import { EmergencyAccessStatusType } from "../enums/emergency-access-status-type";
diff --git a/apps/web/src/app/auth/emergency-access/response/emergency-access.response.ts b/apps/web/src/app/auth/emergency-access/response/emergency-access.response.ts
index 1a9c1388f75..2d50da8fe30 100644
--- a/apps/web/src/app/auth/emergency-access/response/emergency-access.response.ts
+++ b/apps/web/src/app/auth/emergency-access/response/emergency-access.response.ts
@@ -1,5 +1,5 @@
-import { KdfType } from "@bitwarden/common/enums";
 import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+import { KdfType } from "@bitwarden/common/platform/enums";
 import { CipherResponse } from "@bitwarden/common/vault/models/response/cipher.response";
 
 import { EmergencyAccessStatusType } from "../enums/emergency-access-status-type";
diff --git a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts
index 596f3c1a5da..582370d93c4 100644
--- a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts
+++ b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts
@@ -2,12 +2,12 @@ import { MockProxy } from "jest-mock-extended";
 import mock from "jest-mock-extended/lib/Mock";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { EncryptionType, KdfType } from "@bitwarden/common/enums";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { UserKeyResponse } from "@bitwarden/common/models/response/user-key.response";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { EncryptionType, KdfType } from "@bitwarden/common/platform/enums";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import {
   UserKey,
diff --git a/apps/web/src/app/auth/login/login-via-auth-request.component.ts b/apps/web/src/app/auth/login/login-via-auth-request.component.ts
index 447e53bc17f..118565a4766 100644
--- a/apps/web/src/app/auth/login/login-via-auth-request.component.ts
+++ b/apps/web/src/app/auth/login/login-via-auth-request.component.ts
@@ -2,8 +2,8 @@ import { Component, OnDestroy, OnInit } from "@angular/core";
 import { Router } from "@angular/router";
 
 import { LoginViaAuthRequestComponent as BaseLoginWithDeviceComponent } from "@bitwarden/angular/auth/components/login-via-auth-request.component";
-import { AnonymousHubService } from "@bitwarden/common/abstractions/anonymousHub.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AnonymousHubService } from "@bitwarden/common/auth/abstractions/anonymous-hub.service";
 import { AuthRequestCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth-request-crypto.service.abstraction";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction";
diff --git a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts
index 08f433cf5a8..16f2e9ca62f 100644
--- a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts
+++ b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts
@@ -8,10 +8,10 @@ import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/commo
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { OrganizationKeysResponse } from "@bitwarden/common/admin-console/models/response/organization-keys.response";
 import { OrganizationApiService } from "@bitwarden/common/admin-console/services/organization/organization-api.service";
-import { EncryptionType, KdfType } from "@bitwarden/common/enums";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { EncryptionType, KdfType } from "@bitwarden/common/platform/enums";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import {
   MasterKey,
diff --git a/apps/web/src/app/auth/settings/deauthorize-sessions.component.ts b/apps/web/src/app/auth/settings/deauthorize-sessions.component.ts
index 6c649336294..7b8b7c8a6ff 100644
--- a/apps/web/src/app/auth/settings/deauthorize-sessions.component.ts
+++ b/apps/web/src/app/auth/settings/deauthorize-sessions.component.ts
@@ -2,11 +2,11 @@ import { Component } from "@angular/core";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Verification } from "@bitwarden/common/types/verification";
 
 @Component({
   selector: "app-deauthorize-sessions",
diff --git a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts
index cbf32b86988..1fec68d0913 100644
--- a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts
@@ -3,13 +3,13 @@ import { takeUntil } from "rxjs";
 
 import { ChangePasswordComponent } from "@bitwarden/angular/auth/components/change-password.component";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
-import { KdfType } from "@bitwarden/common/enums";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { KdfType } from "@bitwarden/common/platform/enums";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { DialogService } from "@bitwarden/components";
 
diff --git a/apps/web/src/app/auth/settings/emergency-access/view/emergency-add-edit-cipher.component.ts b/apps/web/src/app/auth/settings/emergency-access/view/emergency-add-edit-cipher.component.ts
index 91de00f43fd..a70c6386d5f 100644
--- a/apps/web/src/app/auth/settings/emergency-access/view/emergency-add-edit-cipher.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/view/emergency-add-edit-cipher.component.ts
@@ -3,7 +3,6 @@ import { Component } from "@angular/core";
 
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -16,6 +15,7 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { DialogService } from "@bitwarden/components";
 import { PasswordRepromptService } from "@bitwarden/vault";
diff --git a/apps/web/src/app/auth/settings/two-factor-verify.component.ts b/apps/web/src/app/auth/settings/two-factor-verify.component.ts
index 71a7772c8e0..f9ee53f54f4 100644
--- a/apps/web/src/app/auth/settings/two-factor-verify.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor-verify.component.ts
@@ -7,8 +7,8 @@ import { VerificationType } from "@bitwarden/common/auth/enums/verification-type
 import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request";
 import { AuthResponse } from "@bitwarden/common/auth/types/auth-response";
 import { TwoFactorResponse } from "@bitwarden/common/auth/types/two-factor-response";
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { Verification } from "@bitwarden/common/types/verification";
 
 @Component({
   selector: "app-two-factor-verify",
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts
index a4ca5b75214..9aef82df582 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts
@@ -4,11 +4,11 @@ import { FormBuilder, Validators } from "@angular/forms";
 import { firstValueFrom, map, Observable } from "rxjs";
 
 import { PrfKeySet } from "@bitwarden/auth";
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Verification } from "@bitwarden/common/types/verification";
 import { DialogService } from "@bitwarden/components";
 
 import { WebauthnLoginAdminService } from "../../../core";
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts
index 6a90655aba8..a268e48673d 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts
@@ -3,11 +3,11 @@ import { Component, Inject, OnDestroy, OnInit } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 import { Subject, takeUntil } from "rxjs";
 
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Verification } from "@bitwarden/common/types/verification";
 import { DialogService } from "@bitwarden/components";
 
 import { WebauthnLoginAdminService } from "../../../core";
diff --git a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts
index 800f144b748..a36cc8727fd 100644
--- a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts
+++ b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts
@@ -8,10 +8,10 @@ import { OrganizationApiKeyType } from "@bitwarden/common/admin-console/enums";
 import { OrganizationApiKeyRequest } from "@bitwarden/common/admin-console/models/request/organization-api-key.request";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { ApiKeyResponse } from "@bitwarden/common/auth/models/response/api-key.response";
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Verification } from "@bitwarden/common/types/verification";
 import { DialogService } from "@bitwarden/components";
 
 export interface BillingSyncApiModalData {
diff --git a/apps/web/src/app/billing/shared/payment.component.ts b/apps/web/src/app/billing/shared/payment.component.ts
index 68cc93c270b..b3f5ee3a24a 100644
--- a/apps/web/src/app/billing/shared/payment.component.ts
+++ b/apps/web/src/app/billing/shared/payment.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnDestroy, OnInit } from "@angular/core";
 import { Subject, takeUntil } from "rxjs";
 
-import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction";
+import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { PaymentMethodType } from "@bitwarden/common/billing/enums";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
diff --git a/apps/web/src/app/core/html-storage.service.ts b/apps/web/src/app/core/html-storage.service.ts
index 5a7cd2bbc58..d83d4c6fadb 100644
--- a/apps/web/src/app/core/html-storage.service.ts
+++ b/apps/web/src/app/core/html-storage.service.ts
@@ -1,11 +1,11 @@
 import { Injectable } from "@angular/core";
 import { Subject } from "rxjs";
 
-import { HtmlStorageLocation } from "@bitwarden/common/enums";
 import {
   AbstractStorageService,
   StorageUpdate,
 } from "@bitwarden/common/platform/abstractions/storage.service";
+import { HtmlStorageLocation } from "@bitwarden/common/platform/enums";
 import { StorageOptions } from "@bitwarden/common/platform/models/domain/storage-options";
 
 @Injectable()
diff --git a/apps/web/src/app/core/init.service.ts b/apps/web/src/app/core/init.service.ts
index f171217d3cd..fa1d2a94f8e 100644
--- a/apps/web/src/app/core/init.service.ts
+++ b/apps/web/src/app/core/init.service.ts
@@ -1,7 +1,7 @@
 import { Inject, Injectable } from "@angular/core";
 
+import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction";
 import { WINDOW } from "@bitwarden/angular/services/injection-tokens";
-import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
 import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/auth/abstractions/two-factor.service";
diff --git a/apps/web/src/app/core/state/global-state.ts b/apps/web/src/app/core/state/global-state.ts
index 79d3712c9c5..9bdcb2f8799 100644
--- a/apps/web/src/app/core/state/global-state.ts
+++ b/apps/web/src/app/core/state/global-state.ts
@@ -1,4 +1,4 @@
-import { ThemeType } from "@bitwarden/common/enums";
+import { ThemeType } from "@bitwarden/common/platform/enums";
 import { GlobalState as BaseGlobalState } from "@bitwarden/common/platform/models/domain/global-state";
 
 export class GlobalState extends BaseGlobalState {
diff --git a/apps/web/src/app/layouts/navbar.component.ts b/apps/web/src/app/layouts/navbar.component.ts
index 8dc36e4fb37..2f79931f373 100644
--- a/apps/web/src/app/layouts/navbar.component.ts
+++ b/apps/web/src/app/layouts/navbar.component.ts
@@ -8,9 +8,9 @@ import {
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum";
-import { Provider } from "@bitwarden/common/models/domain/provider";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts
index b22d9419436..87b599425af 100644
--- a/apps/web/src/app/oss-routing.module.ts
+++ b/apps/web/src/app/oss-routing.module.ts
@@ -8,7 +8,7 @@ import {
   tdeDecryptionRequiredGuard,
   UnauthGuard,
 } from "@bitwarden/angular/auth/guards";
-import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard";
+import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
 import { flagEnabled, Flags } from "../utils/flags";
diff --git a/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts b/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts
index 54a634b2510..4553745267d 100644
--- a/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts
+++ b/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts
@@ -4,7 +4,7 @@ import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { PasswordRepromptService } from "@bitwarden/vault";
 
diff --git a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts
index b1ca1f654d9..e01a4d590f5 100644
--- a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts
+++ b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts
@@ -5,7 +5,7 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { PasswordRepromptService } from "@bitwarden/vault";
 
diff --git a/apps/web/src/app/reports/pages/reused-passwords-report.component.ts b/apps/web/src/app/reports/pages/reused-passwords-report.component.ts
index c8aa305b8d8..1587fc08de4 100644
--- a/apps/web/src/app/reports/pages/reused-passwords-report.component.ts
+++ b/apps/web/src/app/reports/pages/reused-passwords-report.component.ts
@@ -3,7 +3,7 @@ import { Component, OnInit } from "@angular/core";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { PasswordRepromptService } from "@bitwarden/vault";
 
diff --git a/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts b/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts
index c1d91cf0bf5..53beccdcc51 100644
--- a/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts
+++ b/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts
@@ -3,7 +3,7 @@ import { Component, OnInit } from "@angular/core";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { PasswordRepromptService } from "@bitwarden/vault";
 
diff --git a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts
index 6ae7b15baca..cd2c8fb2fdc 100644
--- a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts
+++ b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts
@@ -5,7 +5,7 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { BadgeTypes } from "@bitwarden/components";
 import { PasswordRepromptService } from "@bitwarden/vault";
diff --git a/apps/web/src/app/settings/api-key.component.ts b/apps/web/src/app/settings/api-key.component.ts
index bdb74845c4a..067cadd0916 100644
--- a/apps/web/src/app/settings/api-key.component.ts
+++ b/apps/web/src/app/settings/api-key.component.ts
@@ -3,8 +3,8 @@ import { Component } from "@angular/core";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request";
 import { ApiKeyResponse } from "@bitwarden/common/auth/models/response/api-key.response";
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { Verification } from "@bitwarden/common/types/verification";
 
 @Component({
   selector: "app-api-key",
diff --git a/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts b/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts
index 169b1bbdfa6..9b948e8166f 100644
--- a/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts
+++ b/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts
@@ -4,7 +4,6 @@ import { FormGroup, FormControl, Validators } from "@angular/forms";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config";
-import { KdfType } from "@bitwarden/common/enums";
 import { KdfRequest } from "@bitwarden/common/models/request/kdf.request";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -12,6 +11,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { KdfType } from "@bitwarden/common/platform/enums";
 
 @Component({
   selector: "app-change-kdf-confirmation",
diff --git a/apps/web/src/app/settings/change-kdf/change-kdf.component.ts b/apps/web/src/app/settings/change-kdf/change-kdf.component.ts
index 3da4c5ea1d4..5734b216bdd 100644
--- a/apps/web/src/app/settings/change-kdf/change-kdf.component.ts
+++ b/apps/web/src/app/settings/change-kdf/change-kdf.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from "@angular/core";
 
 import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import {
   DEFAULT_KDF_CONFIG,
   DEFAULT_PBKDF2_ITERATIONS,
@@ -8,8 +9,7 @@ import {
   DEFAULT_ARGON2_MEMORY,
   DEFAULT_ARGON2_PARALLELISM,
   KdfType,
-} from "@bitwarden/common/enums";
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+} from "@bitwarden/common/platform/enums";
 import { DialogService } from "@bitwarden/components";
 
 import { ChangeKdfConfirmationComponent } from "./change-kdf-confirmation.component";
diff --git a/apps/web/src/app/settings/delete-account.component.ts b/apps/web/src/app/settings/delete-account.component.ts
index 61423d0e4fc..b76ff7d7bf7 100644
--- a/apps/web/src/app/settings/delete-account.component.ts
+++ b/apps/web/src/app/settings/delete-account.component.ts
@@ -2,10 +2,10 @@ import { Component } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 
 import { AccountApiService } from "@bitwarden/common/auth/abstractions/account-api.service";
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Verification } from "@bitwarden/common/types/verification";
 
 @Component({
   selector: "app-delete-account",
diff --git a/apps/web/src/app/settings/preferences.component.ts b/apps/web/src/app/settings/preferences.component.ts
index 9412a3e8b66..949a8db431b 100644
--- a/apps/web/src/app/settings/preferences.component.ts
+++ b/apps/web/src/app/settings/preferences.component.ts
@@ -2,17 +2,17 @@ import { Component, OnInit } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 import { concatMap, filter, firstValueFrom, map, Observable, Subject, takeUntil, tap } from "rxjs";
 
-import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction";
+import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction";
 import { SettingsService } from "@bitwarden/common/abstractions/settings.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
-import { ThemeType } from "@bitwarden/common/enums";
 import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { ThemeType } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { DialogService } from "@bitwarden/components";
 
diff --git a/apps/web/src/app/settings/purge-vault.component.ts b/apps/web/src/app/settings/purge-vault.component.ts
index 83e8c2a8df5..88bea9b51eb 100644
--- a/apps/web/src/app/settings/purge-vault.component.ts
+++ b/apps/web/src/app/settings/purge-vault.component.ts
@@ -3,10 +3,10 @@ import { Router } from "@angular/router";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Verification } from "@bitwarden/common/types/verification";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 @Component({
diff --git a/apps/web/src/app/tools/send/access.component.ts b/apps/web/src/app/tools/send/access.component.ts
index d01bc9c52ff..86dfb017ec9 100644
--- a/apps/web/src/app/tools/send/access.component.ts
+++ b/apps/web/src/app/tools/send/access.component.ts
@@ -2,7 +2,6 @@ import { Component, OnInit } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
 
-import { SEND_KDF_ITERATIONS } from "@bitwarden/common/enums";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
@@ -15,6 +14,7 @@ import { SendAccess } from "@bitwarden/common/tools/send/models/domain/send-acce
 import { SendAccessRequest } from "@bitwarden/common/tools/send/models/request/send-access.request";
 import { SendAccessResponse } from "@bitwarden/common/tools/send/models/response/send-access.response";
 import { SendAccessView } from "@bitwarden/common/tools/send/models/view/send-access.view";
+import { SEND_KDF_ITERATIONS } from "@bitwarden/common/tools/send/send-kdf";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
 import { NoItemsModule } from "@bitwarden/components";
 
diff --git a/apps/web/src/app/tools/vault-export/export.component.ts b/apps/web/src/app/tools/vault-export/export.component.ts
index b4c20384219..7f2a20cddc5 100644
--- a/apps/web/src/app/tools/vault-export/export.component.ts
+++ b/apps/web/src/app/tools/vault-export/export.component.ts
@@ -6,12 +6,12 @@ import { ExportComponent as BaseExportComponent } from "@bitwarden/angular/tools
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
-import { EncryptedExportType } from "@bitwarden/common/enums";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { EncryptedExportType } from "@bitwarden/common/tools/enums/encrypted-export-type.enum";
 import { DialogService } from "@bitwarden/components";
 import { VaultExportServiceAbstraction } from "@bitwarden/exporter/vault-export";
 
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
index 7c70a797437..49ec8ddd521 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
@@ -2,7 +2,7 @@ import { Component, EventEmitter, HostBinding, HostListener, Input, Output } fro
 import { ActivatedRoute, Router } from "@angular/router";
 
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts b/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts
index e3eed298d72..33486fcbb81 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts
@@ -12,7 +12,7 @@ import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstraction
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.ts b/apps/web/src/app/vault/individual-vault/add-edit.component.ts
index cf998c5c8f6..2a9d92f4159 100644
--- a/apps/web/src/app/vault/individual-vault/add-edit.component.ts
+++ b/apps/web/src/app/vault/individual-vault/add-edit.component.ts
@@ -4,7 +4,6 @@ import { Component, OnDestroy, OnInit } from "@angular/core";
 import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/vault/components/add-edit.component";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { EventType, ProductType } from "@bitwarden/common/enums";
@@ -18,7 +17,8 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { Launchable } from "@bitwarden/common/vault/interfaces/launchable";
 import { DialogService } from "@bitwarden/components";
 import { PasswordRepromptService } from "@bitwarden/vault";
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
index 084573446fa..41f5e661db7 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
@@ -3,10 +3,10 @@ import { firstValueFrom, Subject } from "rxjs";
 
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 
 import { VaultFilterService } from "../services/abstractions/vault-filter.service";
 import {
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts
index 0c8ced7df3a..1acd0ef8120 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts
@@ -1,9 +1,9 @@
 import { Observable } from "rxjs";
 
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { TreeNode } from "@bitwarden/common/src/models/domain/tree-node";
 import { CollectionView } from "@bitwarden/common/src/vault/models/view/collection.view";
 import { FolderView } from "@bitwarden/common/src/vault/models/view/folder.view";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 
 import {
   CipherTypeFilter,
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service.ts
index cce5a5e24a8..e1acabc63bf 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service.ts
@@ -2,8 +2,8 @@ import { Injectable } from "@angular/core";
 import { Router } from "@angular/router";
 import { combineLatest, map, Observable } from "rxjs";
 
-import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils";
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
+import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
 
 import { RoutedVaultFilterBridge } from "../shared/models/routed-vault-filter-bridge.model";
 import {
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
index db0dffbdd71..7bbc0839e93 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
@@ -15,15 +15,15 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils";
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.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 { CipherType } from "@bitwarden/common/vault/enums";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
+import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
 
 import { CollectionAdminView } from "../../../core/views/collection-admin.view";
 import {
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts
index 21e6ef727da..38f5577da60 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts
@@ -3,7 +3,7 @@ import { Observable, Subject, takeUntil } from "rxjs";
 import { map } from "rxjs/operators";
 
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { ITreeNodeObject, TreeNode } from "@bitwarden/common/models/domain/tree-node";
+import { ITreeNodeObject, TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 
 import { VaultFilterService } from "../../services/abstractions/vault-filter.service";
 import { VaultFilterSection, VaultFilterType } from "../models/vault-filter-section.type";
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.spec.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.spec.ts
index adb0d5d4f80..786b2b1c7aa 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.spec.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.spec.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import { createFilterFunction } from "./filter-function";
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts
index c8d21e314d6..4716eb631b1 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import { All, RoutedVaultFilterModel, Unassigned } from "./routed-vault-filter.model";
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts
index 07a901c8eba..4ad34257dad 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts
@@ -1,5 +1,5 @@
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 
 import { RoutedVaultFilterBridgeService } from "../../services/routed-vault-filter-bridge.service";
 
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts
index 48a687b4a20..f89a72b5d2b 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts
@@ -1,6 +1,6 @@
 import { Observable } from "rxjs";
 
-import { TreeNode } from "@bitwarden/common/src/models/domain/tree-node";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 
 import {
   CipherTypeFilter,
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts
index a754f0151bb..0abd4cf50a5 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts
@@ -1,6 +1,6 @@
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts
index 45b06232da2..b6fbb0838c8 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts
@@ -1,5 +1,5 @@
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import {
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts
index 8f459f8c8c2..fd349069aaa 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts
@@ -1,7 +1,7 @@
-import { Organization } from "@bitwarden/common/src/admin-console/models/domain/organization";
-import { ITreeNodeObject } from "@bitwarden/common/src/models/domain/tree-node";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { FolderView } from "@bitwarden/common/src/vault/models/view/folder.view";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node";
 
 import { CollectionAdminView } from "../../../../core/views/collection-admin.view";
 
diff --git a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
index 4b7d708c620..fa89aa7c300 100644
--- a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
@@ -2,9 +2,9 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from
 
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
 import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 
 import { CollectionDialogTabType } from "../../components/collection-dialog";
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index 9396d6b1812..e6df03577ce 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -33,15 +33,12 @@ import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.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 { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
-import { DEFAULT_PBKDF2_ITERATIONS, EventType, KdfType } from "@bitwarden/common/enums";
+import { EventType } from "@bitwarden/common/enums";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils";
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
@@ -50,15 +47,19 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { DEFAULT_PBKDF2_ITERATIONS, KdfType } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CollectionData } from "@bitwarden/common/vault/models/data/collection.data";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { CollectionDetailsResponse } from "@bitwarden/common/vault/models/response/collection.response";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
+import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
 import { DialogService, Icons } from "@bitwarden/components";
 import { PasswordRepromptService } from "@bitwarden/vault";
 
diff --git a/apps/web/src/app/vault/org-vault/add-edit.component.ts b/apps/web/src/app/vault/org-vault/add-edit.component.ts
index 93be56f1a0b..d8b9d6c74af 100644
--- a/apps/web/src/app/vault/org-vault/add-edit.component.ts
+++ b/apps/web/src/app/vault/org-vault/add-edit.component.ts
@@ -4,7 +4,6 @@ import { Component } from "@angular/core";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -17,6 +16,7 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
 import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { DialogService } from "@bitwarden/components";
diff --git a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts
index a5508491ca2..6fb73083e98 100644
--- a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnDestroy, OnInit } from "@angular/core";
 import { firstValueFrom, Subject } from "rxjs";
 
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 
 import { VaultFilterComponent as BaseVaultFilterComponent } from "../../individual-vault/vault-filter/components/vault-filter.component"; //../../vault/vault-filter/components/vault-filter.component";
 import {
diff --git a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts
index e38d66a5815..05928f6ae23 100644
--- a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts
+++ b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts
@@ -3,10 +3,10 @@ import { map, Observable, ReplaySubject, Subject } from "rxjs";
 
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 
 import { StateService } from "../../../core";
 import { CollectionAdminView } from "../../../vault/core/views/collection-admin.view";
diff --git a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
index 3272b3588eb..593b2bd99d0 100644
--- a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
@@ -6,9 +6,9 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { ProductType } from "@bitwarden/common/enums";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
 import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { DialogService, SimpleDialogOptions } from "@bitwarden/components";
 
 import { CollectionAdminView } from "../../../vault/core/views/collection-admin.view";
diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts
index bc6d3bb751b..5284e7e2fba 100644
--- a/apps/web/src/app/vault/org-vault/vault.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault.component.ts
@@ -34,13 +34,10 @@ import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.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 { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { EventType } from "@bitwarden/common/enums";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils";
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -50,9 +47,12 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
+import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
 import { DialogService, Icons } from "@bitwarden/components";
 import { PasswordRepromptService } from "@bitwarden/vault";
 
diff --git a/apps/web/src/app/vault/utils/collection-utils.ts b/apps/web/src/app/vault/utils/collection-utils.ts
index c25e5a37383..71aa045e186 100644
--- a/apps/web/src/app/vault/utils/collection-utils.ts
+++ b/apps/web/src/app/vault/utils/collection-utils.ts
@@ -1,9 +1,9 @@
-import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils";
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import {
   CollectionView,
   NestingDelimiter,
 } from "@bitwarden/common/vault/models/view/collection.view";
+import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
 
 import { CollectionAdminView } from "../../vault/core/views/collection-admin.view";
 
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts
index 5c6c10724ce..ba6a5f64e03 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
 import { AuthGuard } from "@bitwarden/angular/auth/guards";
-import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard";
+import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
 import { canAccessSettingsTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts
index 0d61c264e29..b2f8bf8dcf0 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts
@@ -3,7 +3,7 @@ import { Component, Inject, OnInit } from "@angular/core";
 
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { Provider } from "@bitwarden/common/models/domain/provider";
+import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts
index c584dc37533..badcaf83316 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts
@@ -3,7 +3,7 @@ import { mock, MockProxy } from "jest-mock-extended";
 
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { ProviderUserType } from "@bitwarden/common/admin-console/enums";
-import { Provider } from "@bitwarden/common/models/domain/provider";
+import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts
index 6c903fce6ed..7c0d0ce2490 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts
@@ -2,7 +2,7 @@ import { Injectable } from "@angular/core";
 import { ActivatedRouteSnapshot, CanActivate, Router } from "@angular/router";
 
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
-import { Provider } from "@bitwarden/common/models/domain/provider";
+import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/manage.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/manage.component.ts
index 94d44909337..dcc6cd06da2 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/manage.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/manage.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
-import { Provider } from "@bitwarden/common/models/domain/provider";
+import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 
 @Component({
   selector: "provider-manage",
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts
index de8ce219e6b..c357ced0bd8 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts
@@ -2,7 +2,7 @@ import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
-import { Provider } from "@bitwarden/common/models/domain/provider";
+import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 
 @Component({
   selector: "providers-layout",
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts
index 5bc2764038f..0643bde8720 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
 import { AuthGuard } from "@bitwarden/angular/auth/guards";
-import { Provider } from "@bitwarden/common/models/domain/provider";
+import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { ProvidersComponent } from "@bitwarden/web-vault/app/admin-console/providers/providers.component";
 import { FrontendLayoutComponent } from "@bitwarden/web-vault/app/layouts/frontend-layout.component";
 
diff --git a/libs/angular/src/validators/notAllowedValueAsync.validator.ts b/libs/angular/src/admin-console/validators/not-allowed-value-async.validator.ts
similarity index 100%
rename from libs/angular/src/validators/notAllowedValueAsync.validator.ts
rename to libs/angular/src/admin-console/validators/not-allowed-value-async.validator.ts
diff --git a/libs/angular/src/auth/components/change-password.component.ts b/libs/angular/src/auth/components/change-password.component.ts
index b9c2d1be4f5..2b5c16aca03 100644
--- a/libs/angular/src/auth/components/change-password.component.ts
+++ b/libs/angular/src/auth/components/change-password.component.ts
@@ -4,12 +4,12 @@ import { Subject, takeUntil } from "rxjs";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config";
-import { KdfType } from "@bitwarden/common/enums";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { KdfType } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { MasterKey, UserKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
diff --git a/libs/angular/src/auth/components/lock.component.ts b/libs/angular/src/auth/components/lock.component.ts
index f4bdd163eb8..e23ca2d1009 100644
--- a/libs/angular/src/auth/components/lock.component.ts
+++ b/libs/angular/src/auth/components/lock.component.ts
@@ -14,7 +14,6 @@ import { UserVerificationService } from "@bitwarden/common/auth/abstractions/use
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
 import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request";
 import { MasterPasswordPolicyResponse } from "@bitwarden/common/auth/models/response/master-password-policy.response";
-import { HashPurpose, KeySuffixOptions } from "@bitwarden/common/enums";
 import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
@@ -23,6 +22,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { HashPurpose, KeySuffixOptions } from "@bitwarden/common/platform/enums";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { UserKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { PinLockType } from "@bitwarden/common/services/vault-timeout/vault-timeout-settings.service";
diff --git a/libs/angular/src/auth/components/login-via-auth-request.component.ts b/libs/angular/src/auth/components/login-via-auth-request.component.ts
index 6703bdccf05..e3042a675df 100644
--- a/libs/angular/src/auth/components/login-via-auth-request.component.ts
+++ b/libs/angular/src/auth/components/login-via-auth-request.component.ts
@@ -2,8 +2,8 @@ import { Directive, OnDestroy, OnInit } from "@angular/core";
 import { IsActiveMatchOptions, Router } from "@angular/router";
 import { Subject, takeUntil } from "rxjs";
 
-import { AnonymousHubService } from "@bitwarden/common/abstractions/anonymousHub.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AnonymousHubService } from "@bitwarden/common/auth/abstractions/anonymous-hub.service";
 import { AuthRequestCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth-request-crypto.service.abstraction";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction";
diff --git a/libs/angular/src/auth/components/register.component.ts b/libs/angular/src/auth/components/register.component.ts
index a56498bdf08..2d55d411751 100644
--- a/libs/angular/src/auth/components/register.component.ts
+++ b/libs/angular/src/auth/components/register.component.ts
@@ -7,7 +7,6 @@ import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { PasswordLoginCredentials } from "@bitwarden/common/auth/models/domain/login-credentials";
 import { RegisterResponse } from "@bitwarden/common/auth/models/response/register.response";
-import { DEFAULT_KDF_CONFIG, DEFAULT_KDF_TYPE } from "@bitwarden/common/enums";
 import { KeysRequest } from "@bitwarden/common/models/request/keys.request";
 import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request";
 import { RegisterRequest } from "@bitwarden/common/models/request/register.request";
@@ -17,6 +16,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { DEFAULT_KDF_CONFIG, DEFAULT_KDF_TYPE } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { DialogService } from "@bitwarden/components";
@@ -26,7 +26,7 @@ import {
   FormValidationErrorsService,
 } from "../../platform/abstractions/form-validation-errors.service";
 import { PasswordColorText } from "../../shared/components/password-strength/password-strength.component";
-import { InputsFieldMatch } from "../../validators/inputsFieldMatch.validator";
+import { InputsFieldMatch } from "../validators/inputs-field-match.validator";
 
 import { CaptchaProtectedComponent } from "./captcha-protected.component";
 
diff --git a/libs/angular/src/auth/components/set-password.component.ts b/libs/angular/src/auth/components/set-password.component.ts
index f7650204d21..7477340bea6 100644
--- a/libs/angular/src/auth/components/set-password.component.ts
+++ b/libs/angular/src/auth/components/set-password.component.ts
@@ -13,13 +13,17 @@ import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/mod
 import { OrganizationAutoEnrollStatusResponse } from "@bitwarden/common/admin-console/models/response/organization-auto-enroll-status.response";
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
 import { SetPasswordRequest } from "@bitwarden/common/auth/models/request/set-password.request";
-import { HashPurpose, DEFAULT_KDF_TYPE, DEFAULT_KDF_CONFIG } from "@bitwarden/common/enums";
 import { KeysRequest } from "@bitwarden/common/models/request/keys.request";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import {
+  HashPurpose,
+  DEFAULT_KDF_TYPE,
+  DEFAULT_KDF_CONFIG,
+} from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { AccountDecryptionOptions } from "@bitwarden/common/platform/models/domain/account";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
diff --git a/libs/angular/src/auth/components/set-pin.component.ts b/libs/angular/src/auth/components/set-pin.component.ts
index 9219535ff73..b6f77803fd2 100644
--- a/libs/angular/src/auth/components/set-pin.component.ts
+++ b/libs/angular/src/auth/components/set-pin.component.ts
@@ -1,9 +1,9 @@
 import { Directive, OnInit } from "@angular/core";
 
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
-import { KeySuffixOptions } from "@bitwarden/common/enums/key-suffix-options.enum";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { KeySuffixOptions } from "@bitwarden/common/platform/enums/key-suffix-options.enum";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
 import { ModalRef } from "../../components/modal/modal.ref";
diff --git a/libs/angular/src/auth/components/update-password.component.ts b/libs/angular/src/auth/components/update-password.component.ts
index 81bdbb31cb9..f86189c32d1 100644
--- a/libs/angular/src/auth/components/update-password.component.ts
+++ b/libs/angular/src/auth/components/update-password.component.ts
@@ -7,6 +7,7 @@ import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/mod
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { VerificationType } from "@bitwarden/common/auth/enums/verification-type";
 import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request";
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -16,7 +17,6 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { MasterKey, UserKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
-import { Verification } from "@bitwarden/common/types/verification";
 import { DialogService } from "@bitwarden/components";
 
 import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component";
diff --git a/libs/angular/src/auth/components/update-temp-password.component.ts b/libs/angular/src/auth/components/update-temp-password.component.ts
index 4c27bfa4f0b..fd705e94f47 100644
--- a/libs/angular/src/auth/components/update-temp-password.component.ts
+++ b/libs/angular/src/auth/components/update-temp-password.component.ts
@@ -9,6 +9,7 @@ import { VerificationType } from "@bitwarden/common/auth/enums/verification-type
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
 import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request";
 import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request";
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -18,7 +19,6 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { MasterKey, UserKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
-import { Verification } from "@bitwarden/common/types/verification";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { DialogService } from "@bitwarden/components";
 
diff --git a/libs/angular/src/auth/components/user-verification-prompt.component.ts b/libs/angular/src/auth/components/user-verification-prompt.component.ts
index 1b0a1dbed86..666b890c044 100644
--- a/libs/angular/src/auth/components/user-verification-prompt.component.ts
+++ b/libs/angular/src/auth/components/user-verification-prompt.component.ts
@@ -2,9 +2,9 @@ import { Directive } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Verification } from "@bitwarden/common/types/verification";
 
 import { ModalRef } from "../../components/modal/modal.ref";
 import { ModalConfig } from "../../services/modal.service";
diff --git a/libs/angular/src/auth/components/user-verification.component.ts b/libs/angular/src/auth/components/user-verification.component.ts
index 9f512fb3507..ae0e37055cb 100644
--- a/libs/angular/src/auth/components/user-verification.component.ts
+++ b/libs/angular/src/auth/components/user-verification.component.ts
@@ -4,10 +4,10 @@ import { Subject, takeUntil } from "rxjs";
 
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { VerificationType } from "@bitwarden/common/auth/enums/verification-type";
+import { Verification } from "@bitwarden/common/auth/types/verification";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { Verification } from "@bitwarden/common/types/verification";
 
 /**
  * Used for general-purpose user verification throughout the app.
diff --git a/libs/angular/src/validators/inputsFieldMatch.validator.ts b/libs/angular/src/auth/validators/inputs-field-match.validator.ts
similarity index 94%
rename from libs/angular/src/validators/inputsFieldMatch.validator.ts
rename to libs/angular/src/auth/validators/inputs-field-match.validator.ts
index f360b5e5ee5..9c91007d0ca 100644
--- a/libs/angular/src/validators/inputsFieldMatch.validator.ts
+++ b/libs/angular/src/auth/validators/inputs-field-match.validator.ts
@@ -1,6 +1,6 @@
 import { AbstractControl, UntypedFormGroup, ValidatorFn } from "@angular/forms";
 
-import { FormGroupControls } from "../platform/abstractions/form-validation-errors.service";
+import { FormGroupControls } from "../../platform/abstractions/form-validation-errors.service";
 
 export class InputsFieldMatch {
   //check to ensure two fields do not have the same value
diff --git a/libs/angular/src/guard/feature-flag.guard.spec.ts b/libs/angular/src/platform/guard/feature-flag.guard.spec.ts
similarity index 100%
rename from libs/angular/src/guard/feature-flag.guard.spec.ts
rename to libs/angular/src/platform/guard/feature-flag.guard.spec.ts
diff --git a/libs/angular/src/guard/feature-flag.guard.ts b/libs/angular/src/platform/guard/feature-flag.guard.ts
similarity index 100%
rename from libs/angular/src/guard/feature-flag.guard.ts
rename to libs/angular/src/platform/guard/feature-flag.guard.ts
diff --git a/libs/angular/src/services/theming/themeBuilder.ts b/libs/angular/src/platform/services/theming/theme-builder.ts
similarity index 90%
rename from libs/angular/src/services/theming/themeBuilder.ts
rename to libs/angular/src/platform/services/theming/theme-builder.ts
index 1dd9ad6b38e..f970baea151 100644
--- a/libs/angular/src/services/theming/themeBuilder.ts
+++ b/libs/angular/src/platform/services/theming/theme-builder.ts
@@ -1,4 +1,4 @@
-import { ThemeType } from "@bitwarden/common/enums";
+import { ThemeType } from "@bitwarden/common/platform/enums";
 
 import { Theme } from "./theme";
 
diff --git a/libs/angular/src/services/theming/theme.ts b/libs/angular/src/platform/services/theming/theme.ts
similarity index 58%
rename from libs/angular/src/services/theming/theme.ts
rename to libs/angular/src/platform/services/theming/theme.ts
index b5a1c83d7c6..87b9f0c2160 100644
--- a/libs/angular/src/services/theming/theme.ts
+++ b/libs/angular/src/platform/services/theming/theme.ts
@@ -1,4 +1,4 @@
-import { ThemeType } from "@bitwarden/common/enums";
+import { ThemeType } from "@bitwarden/common/platform/enums";
 
 export interface Theme {
   configuredTheme: ThemeType;
diff --git a/libs/angular/src/services/theming/theming.service.abstraction.ts b/libs/angular/src/platform/services/theming/theming.service.abstraction.ts
similarity index 83%
rename from libs/angular/src/services/theming/theming.service.abstraction.ts
rename to libs/angular/src/platform/services/theming/theming.service.abstraction.ts
index 0118e2f0c5f..aaf67a92522 100644
--- a/libs/angular/src/services/theming/theming.service.abstraction.ts
+++ b/libs/angular/src/platform/services/theming/theming.service.abstraction.ts
@@ -1,6 +1,6 @@
 import { Observable } from "rxjs";
 
-import { ThemeType } from "@bitwarden/common/enums";
+import { ThemeType } from "@bitwarden/common/platform/enums";
 
 import { Theme } from "./theme";
 
diff --git a/libs/angular/src/services/theming/theming.service.ts b/libs/angular/src/platform/services/theming/theming.service.ts
similarity index 93%
rename from libs/angular/src/services/theming/theming.service.ts
rename to libs/angular/src/platform/services/theming/theming.service.ts
index 91760e07fec..9c1b19ddb27 100644
--- a/libs/angular/src/services/theming/theming.service.ts
+++ b/libs/angular/src/platform/services/theming/theming.service.ts
@@ -2,13 +2,13 @@ import { DOCUMENT } from "@angular/common";
 import { Inject, Injectable } from "@angular/core";
 import { BehaviorSubject, filter, fromEvent, Observable } from "rxjs";
 
-import { ThemeType } from "@bitwarden/common/enums";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { ThemeType } from "@bitwarden/common/platform/enums";
 
-import { WINDOW } from "../injection-tokens";
+import { WINDOW } from "../../../services/injection-tokens";
 
 import { Theme } from "./theme";
-import { ThemeBuilder } from "./themeBuilder";
+import { ThemeBuilder } from "./theme-builder";
 import { AbstractThemingService } from "./theming.service.abstraction";
 
 @Injectable()
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index fedbf43391c..97d8099b955 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -1,7 +1,6 @@
 import { LOCALE_ID, NgModule } from "@angular/core";
 
 import { AvatarUpdateService as AccountUpdateServiceAbstraction } from "@bitwarden/common/abstractions/account/avatar-update.service";
-import { AnonymousHubService as AnonymousHubServiceAbstraction } from "@bitwarden/common/abstractions/anonymousHub.service";
 import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstractions/api.service";
 import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.service";
 import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service";
@@ -9,7 +8,6 @@ import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/
 import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
 import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service";
 import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common/abstractions/settings.service";
-import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/abstractions/totp.service";
 import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service";
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
@@ -42,6 +40,7 @@ import {
   AccountService as AccountServiceAbstraction,
   InternalAccountService,
 } from "@bitwarden/common/auth/abstractions/account.service";
+import { AnonymousHubService as AnonymousHubServiceAbstraction } from "@bitwarden/common/auth/abstractions/anonymous-hub.service";
 import { AuthRequestCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth-request-crypto.service.abstraction";
 import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service";
 import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction";
@@ -59,6 +58,7 @@ import { WebAuthnLoginPrfCryptoServiceAbstraction } from "@bitwarden/common/auth
 import { WebAuthnLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/webauthn/webauthn-login.service.abstraction";
 import { AccountApiServiceImplementation } from "@bitwarden/common/auth/services/account-api.service";
 import { AccountServiceImplementation } from "@bitwarden/common/auth/services/account.service";
+import { AnonymousHubService } from "@bitwarden/common/auth/services/anonymous-hub.service";
 import { AuthRequestCryptoServiceImplementation } from "@bitwarden/common/auth/services/auth-request-crypto.service.implementation";
 import { AuthService } from "@bitwarden/common/auth/services/auth.service";
 import { DeviceTrustCryptoService } from "@bitwarden/common/auth/services/device-trust-crypto.service.implementation";
@@ -111,7 +111,6 @@ import { GlobalStateProvider } from "@bitwarden/common/platform/state";
 // eslint-disable-next-line import/no-restricted-paths -- We need the implementation to inject, but generally this should not be accessed
 import { DefaultGlobalStateProvider } from "@bitwarden/common/platform/state/implementations/default-global-state.provider";
 import { AvatarUpdateService } from "@bitwarden/common/services/account/avatar-update.service";
-import { AnonymousHubService } from "@bitwarden/common/services/anonymousHub.service";
 import { ApiService } from "@bitwarden/common/services/api.service";
 import { AuditService } from "@bitwarden/common/services/audit.service";
 import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
@@ -119,7 +118,6 @@ import { EventUploadService } from "@bitwarden/common/services/event/event-uploa
 import { NotificationsService } from "@bitwarden/common/services/notifications.service";
 import { SearchService } from "@bitwarden/common/services/search.service";
 import { SettingsService } from "@bitwarden/common/services/settings.service";
-import { TotpService } from "@bitwarden/common/services/totp.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vault-timeout/vault-timeout-settings.service";
 import { VaultTimeoutService } from "@bitwarden/common/services/vault-timeout/vault-timeout.service";
 import {
@@ -148,6 +146,7 @@ import {
 } 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 { TotpService as TotpServiceAbstraction } from "@bitwarden/common/vault/abstractions/totp.service";
 import { CipherService } from "@bitwarden/common/vault/services/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/services/collection.service";
 import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service";
@@ -155,6 +154,7 @@ import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder
 import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service";
 import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service";
 import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service";
+import { TotpService } from "@bitwarden/common/vault/services/totp.service";
 import {
   VaultExportService,
   VaultExportServiceAbstraction,
@@ -172,6 +172,8 @@ import { UnauthGuard } from "../auth/guards/unauth.guard";
 import { FormValidationErrorsService as FormValidationErrorsServiceAbstraction } from "../platform/abstractions/form-validation-errors.service";
 import { BroadcasterService } from "../platform/services/broadcaster.service";
 import { FormValidationErrorsService } from "../platform/services/form-validation-errors.service";
+import { ThemingService } from "../platform/services/theming/theming.service";
+import { AbstractThemingService } from "../platform/services/theming/theming.service.abstraction";
 
 import {
   LOCALES_DIRECTORY,
@@ -188,8 +190,6 @@ import {
   WINDOW,
 } from "./injection-tokens";
 import { ModalService } from "./modal.service";
-import { ThemingService } from "./theming/theming.service";
-import { AbstractThemingService } from "./theming/theming.service.abstraction";
 
 @NgModule({
   declarations: [],
diff --git a/libs/angular/src/tools/export/components/export.component.ts b/libs/angular/src/tools/export/components/export.component.ts
index 9d782d2822d..5cd567e49f4 100644
--- a/libs/angular/src/tools/export/components/export.component.ts
+++ b/libs/angular/src/tools/export/components/export.component.ts
@@ -6,12 +6,13 @@ import { EventCollectionService } from "@bitwarden/common/abstractions/event/eve
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
-import { EncryptedExportType, EventType } from "@bitwarden/common/enums";
+import { EventType } from "@bitwarden/common/enums";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { EncryptedExportType } from "@bitwarden/common/tools/enums/encrypted-export-type.enum";
 import { DialogService } from "@bitwarden/components";
 import { VaultExportServiceAbstraction } from "@bitwarden/exporter/vault-export";
 
diff --git a/libs/angular/src/tools/generator/components/generator.component.ts b/libs/angular/src/tools/generator/components/generator.component.ts
index b0a5d13915f..eb8c6e8c826 100644
--- a/libs/angular/src/tools/generator/components/generator.component.ts
+++ b/libs/angular/src/tools/generator/components/generator.component.ts
@@ -3,7 +3,6 @@ import { ActivatedRoute } from "@angular/router";
 import { first } from "rxjs/operators";
 
 import { PasswordGeneratorPolicyOptions } from "@bitwarden/common/admin-console/models/domain/password-generator-policy-options";
-import { EmailForwarderOptions } from "@bitwarden/common/models/domain/email-forwarder-options";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -17,6 +16,7 @@ import {
   UsernameGenerationServiceAbstraction,
   UsernameGeneratorOptions,
 } from "@bitwarden/common/tools/generator/username";
+import { EmailForwarderOptions } from "@bitwarden/common/tools/models/domain/email-forwarder-options";
 
 @Directive()
 export class GeneratorComponent implements OnInit {
diff --git a/libs/angular/src/vault/components/add-edit-custom-fields.component.ts b/libs/angular/src/vault/components/add-edit-custom-fields.component.ts
index 7d696e99a1d..357e2186157 100644
--- a/libs/angular/src/vault/components/add-edit-custom-fields.component.ts
+++ b/libs/angular/src/vault/components/add-edit-custom-fields.component.ts
@@ -2,10 +2,10 @@ import { CdkDragDrop, moveItemInArray } from "@angular/cdk/drag-drop";
 import { Directive, Input, OnChanges, SimpleChanges } from "@angular/core";
 
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { EventType, FieldType } from "@bitwarden/common/enums";
+import { EventType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
diff --git a/libs/angular/src/vault/components/add-edit.component.ts b/libs/angular/src/vault/components/add-edit.component.ts
index f99b96d1c2a..c4bfb47daa4 100644
--- a/libs/angular/src/vault/components/add-edit.component.ts
+++ b/libs/angular/src/vault/components/add-edit.component.ts
@@ -10,7 +10,7 @@ import {
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { OrganizationUserStatusType, PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { EventType, SecureNoteType, UriMatchType } from "@bitwarden/common/enums";
+import { EventType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -21,8 +21,8 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { SecureNoteType, UriMatchType, CipherType } from "@bitwarden/common/vault/enums";
 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 { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
diff --git a/libs/angular/src/vault/components/view-custom-fields.component.ts b/libs/angular/src/vault/components/view-custom-fields.component.ts
index 5ec247a09e5..c32fd798f92 100644
--- a/libs/angular/src/vault/components/view-custom-fields.component.ts
+++ b/libs/angular/src/vault/components/view-custom-fields.component.ts
@@ -1,7 +1,8 @@
 import { Directive, Input } from "@angular/core";
 
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { EventType, FieldType } from "@bitwarden/common/enums";
+import { EventType } from "@bitwarden/common/enums";
+import { FieldType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
diff --git a/libs/angular/src/vault/components/view.component.ts b/libs/angular/src/vault/components/view.component.ts
index 90032617b46..831cf31cec3 100644
--- a/libs/angular/src/vault/components/view.component.ts
+++ b/libs/angular/src/vault/components/view.component.ts
@@ -13,9 +13,8 @@ import { firstValueFrom } from "rxjs";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { EventType, FieldType } from "@bitwarden/common/enums";
+import { EventType } from "@bitwarden/common/enums";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
@@ -27,8 +26,9 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
 import { EncArrayBuffer } from "@bitwarden/common/platform/models/domain/enc-array-buffer";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
+import { FieldType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { Launchable } from "@bitwarden/common/vault/interfaces/launchable";
 import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
diff --git a/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts b/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts
index f752f9a9a9a..6318cfd2a2f 100644
--- a/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts
+++ b/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts
@@ -1,6 +1,6 @@
 import { Directive, EventEmitter, Input, Output } from "@angular/core";
 
-import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node";
+import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 
 import { DynamicTreeNode } from "../models/dynamic-tree-node.model";
diff --git a/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts b/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts
index b0239442416..1836518942f 100644
--- a/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts
+++ b/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts
@@ -1,6 +1,6 @@
 import { Directive, EventEmitter, Input, Output } from "@angular/core";
 
-import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node";
+import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
 import { DynamicTreeNode } from "../models/dynamic-tree-node.model";
diff --git a/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts b/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts
index 26fd4772719..c45b42310c0 100644
--- a/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts
+++ b/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts
@@ -1,7 +1,7 @@
 import { Directive, EventEmitter, Input, Output } from "@angular/core";
 
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node";
+import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node";
 
 import { DisplayMode } from "../models/display-mode";
 import { TopLevelTreeNode } from "../models/top-level-tree-node.model";
diff --git a/libs/angular/src/vault/vault-filter/components/type-filter.component.ts b/libs/angular/src/vault/vault-filter/components/type-filter.component.ts
index 6ff5d213308..1613912d699 100644
--- a/libs/angular/src/vault/vault-filter/components/type-filter.component.ts
+++ b/libs/angular/src/vault/vault-filter/components/type-filter.component.ts
@@ -1,7 +1,7 @@
 import { Directive, EventEmitter, Input, Output } from "@angular/core";
 
-import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node";
 
 import { TopLevelTreeNode } from "../models/top-level-tree-node.model";
 import { VaultFilter } from "../models/vault-filter.model";
diff --git a/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts b/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts
index 7c37436492a..3745924166f 100644
--- a/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts
+++ b/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts
@@ -2,7 +2,7 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
 import { firstValueFrom, Observable } from "rxjs";
 
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node";
+import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
diff --git a/libs/angular/src/vault/vault-filter/models/dynamic-tree-node.model.ts b/libs/angular/src/vault/vault-filter/models/dynamic-tree-node.model.ts
index 9898cf4ce3d..593df96f170 100644
--- a/libs/angular/src/vault/vault-filter/models/dynamic-tree-node.model.ts
+++ b/libs/angular/src/vault/vault-filter/models/dynamic-tree-node.model.ts
@@ -1,4 +1,4 @@
-import { ITreeNodeObject, TreeNode } from "@bitwarden/common/models/domain/tree-node";
+import { ITreeNodeObject, TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 
 export class DynamicTreeNode<T extends ITreeNodeObject> {
   fullList: T[];
diff --git a/libs/angular/src/vault/vault-filter/models/top-level-tree-node.model.ts b/libs/angular/src/vault/vault-filter/models/top-level-tree-node.model.ts
index 8930e05132e..c3176d4191a 100644
--- a/libs/angular/src/vault/vault-filter/models/top-level-tree-node.model.ts
+++ b/libs/angular/src/vault/vault-filter/models/top-level-tree-node.model.ts
@@ -1,4 +1,4 @@
-import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node";
+import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node";
 
 export type TopLevelTreeNodeId = "vaults" | "types" | "collections" | "folders";
 export class TopLevelTreeNode implements ITreeNodeObject {
diff --git a/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts b/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts
index 1fab9727a5a..f5a49e25618 100644
--- a/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts
+++ b/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import { VaultFilter } from "./vault-filter.model";
diff --git a/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts b/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts
index ae4151f9648..52d7707005c 100644
--- a/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts
+++ b/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import { CipherStatus } from "./cipher-status.model";
diff --git a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts
index b4fb8f62e0e..841198dc737 100644
--- a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts
+++ b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts
@@ -8,14 +8,14 @@ import {
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils";
-import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
+import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
 
 import { DeprecatedVaultFilterService as DeprecatedVaultFilterServiceAbstraction } from "../../abstractions/deprecated-vault-filter.service";
 import { DynamicTreeNode } from "../models/dynamic-tree-node.model";
diff --git a/libs/common/src/admin-console/abstractions/organization-user/responses/organization-user.response.ts b/libs/common/src/admin-console/abstractions/organization-user/responses/organization-user.response.ts
index b526fa1fcff..413ee58732f 100644
--- a/libs/common/src/admin-console/abstractions/organization-user/responses/organization-user.response.ts
+++ b/libs/common/src/admin-console/abstractions/organization-user/responses/organization-user.response.ts
@@ -1,5 +1,5 @@
-import { KdfType } from "../../../../enums";
 import { BaseResponse } from "../../../../models/response/base.response";
+import { KdfType } from "../../../../platform/enums";
 import { OrganizationUserStatusType, OrganizationUserType } from "../../../enums";
 import { PermissionsApi } from "../../../models/api/permissions.api";
 import { SelectionReadOnlyResponse } from "../../../models/response/selection-read-only.response";
diff --git a/libs/common/src/admin-console/abstractions/provider.service.ts b/libs/common/src/admin-console/abstractions/provider.service.ts
index 3c62776a90d..d843154f3f0 100644
--- a/libs/common/src/admin-console/abstractions/provider.service.ts
+++ b/libs/common/src/admin-console/abstractions/provider.service.ts
@@ -1,5 +1,5 @@
-import { Provider } from "../../models/domain/provider";
 import { ProviderData } from "../models/data/provider.data";
+import { Provider } from "../models/domain/provider";
 
 export abstract class ProviderService {
   get: (id: string) => Promise<Provider>;
diff --git a/libs/common/src/admin-console/enums/index.ts b/libs/common/src/admin-console/enums/index.ts
index d624ffd8853..0cbdf658053 100644
--- a/libs/common/src/admin-console/enums/index.ts
+++ b/libs/common/src/admin-console/enums/index.ts
@@ -3,6 +3,7 @@ export * from "./organization-connection-type.enum";
 export * from "./organization-user-status-type.enum";
 export * from "./organization-user-type.enum";
 export * from "./policy-type.enum";
+export * from "./provider-type.enum";
 export * from "./provider-user-status-type.enum";
 export * from "./provider-user-type.enum";
 export * from "./scim-provider-type.enum";
diff --git a/libs/common/src/enums/provider-type.enum.ts b/libs/common/src/admin-console/enums/provider-type.enum.ts
similarity index 100%
rename from libs/common/src/enums/provider-type.enum.ts
rename to libs/common/src/admin-console/enums/provider-type.enum.ts
diff --git a/libs/common/src/admin-console/models/data/organization.data.ts b/libs/common/src/admin-console/models/data/organization.data.ts
index 2eba9576609..36f2c4ce666 100644
--- a/libs/common/src/admin-console/models/data/organization.data.ts
+++ b/libs/common/src/admin-console/models/data/organization.data.ts
@@ -1,5 +1,5 @@
-import { ProductType, ProviderType } from "../../../enums";
-import { OrganizationUserStatusType, OrganizationUserType } from "../../enums";
+import { ProductType } from "../../../enums";
+import { OrganizationUserStatusType, OrganizationUserType, ProviderType } from "../../enums";
 import { PermissionsApi } from "../api/permissions.api";
 import { ProfileOrganizationResponse } from "../response/profile-organization.response";
 
diff --git a/libs/common/src/admin-console/models/domain/organization.ts b/libs/common/src/admin-console/models/domain/organization.ts
index c7d8ee49243..802fe6fcf8c 100644
--- a/libs/common/src/admin-console/models/domain/organization.ts
+++ b/libs/common/src/admin-console/models/domain/organization.ts
@@ -1,7 +1,7 @@
 import { Jsonify } from "type-fest";
 
-import { ProductType, ProviderType } from "../../../enums";
-import { OrganizationUserStatusType, OrganizationUserType } from "../../enums";
+import { ProductType } from "../../../enums";
+import { OrganizationUserStatusType, OrganizationUserType, ProviderType } from "../../enums";
 import { PermissionsApi } from "../api/permissions.api";
 import { OrganizationData } from "../data/organization.data";
 
diff --git a/libs/common/src/models/domain/provider.ts b/libs/common/src/admin-console/models/domain/provider.ts
similarity index 90%
rename from libs/common/src/models/domain/provider.ts
rename to libs/common/src/admin-console/models/domain/provider.ts
index 3afd01649ad..d6d3d3c4623 100644
--- a/libs/common/src/models/domain/provider.ts
+++ b/libs/common/src/admin-console/models/domain/provider.ts
@@ -1,5 +1,5 @@
-import { ProviderUserStatusType, ProviderUserType } from "../../admin-console/enums";
-import { ProviderData } from "../../admin-console/models/data/provider.data";
+import { ProviderUserStatusType, ProviderUserType } from "../../enums";
+import { ProviderData } from "../data/provider.data";
 
 export class Provider {
   id: string;
diff --git a/libs/common/src/admin-console/models/response/profile-organization.response.ts b/libs/common/src/admin-console/models/response/profile-organization.response.ts
index 83187082e5a..7cae701de52 100644
--- a/libs/common/src/admin-console/models/response/profile-organization.response.ts
+++ b/libs/common/src/admin-console/models/response/profile-organization.response.ts
@@ -1,6 +1,6 @@
-import { ProductType, ProviderType } from "../../../enums";
+import { ProductType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
-import { OrganizationUserStatusType, OrganizationUserType } from "../../enums";
+import { OrganizationUserStatusType, OrganizationUserType, ProviderType } from "../../enums";
 import { PermissionsApi } from "../api/permissions.api";
 
 export class ProfileOrganizationResponse extends BaseResponse {
diff --git a/libs/common/src/admin-console/services/provider.service.ts b/libs/common/src/admin-console/services/provider.service.ts
index 99a2d463d8f..dce35c57896 100644
--- a/libs/common/src/admin-console/services/provider.service.ts
+++ b/libs/common/src/admin-console/services/provider.service.ts
@@ -1,7 +1,7 @@
-import { Provider } from "../../models/domain/provider";
 import { StateService } from "../../platform/abstractions/state.service";
 import { ProviderService as ProviderServiceAbstraction } from "../abstractions/provider.service";
 import { ProviderData } from "../models/data/provider.data";
+import { Provider } from "../models/domain/provider";
 
 export class ProviderService implements ProviderServiceAbstraction {
   constructor(private stateService: StateService) {}
diff --git a/libs/common/src/auth/abstractions/account-api.service.ts b/libs/common/src/auth/abstractions/account-api.service.ts
index 751a020b150..a897dcd5ce2 100644
--- a/libs/common/src/auth/abstractions/account-api.service.ts
+++ b/libs/common/src/auth/abstractions/account-api.service.ts
@@ -1,4 +1,4 @@
-import { Verification } from "../../types/verification";
+import { Verification } from "../types/verification";
 
 export abstract class AccountApiService {
   abstract deleteAccount(verification: Verification): Promise<void>;
diff --git a/libs/common/src/abstractions/anonymousHub.service.ts b/libs/common/src/auth/abstractions/anonymous-hub.service.ts
similarity index 100%
rename from libs/common/src/abstractions/anonymousHub.service.ts
rename to libs/common/src/auth/abstractions/anonymous-hub.service.ts
diff --git a/libs/common/src/auth/abstractions/user-verification/user-verification.service.abstraction.ts b/libs/common/src/auth/abstractions/user-verification/user-verification.service.abstraction.ts
index 46b8d753c97..9eb1024e733 100644
--- a/libs/common/src/auth/abstractions/user-verification/user-verification.service.abstraction.ts
+++ b/libs/common/src/auth/abstractions/user-verification/user-verification.service.abstraction.ts
@@ -1,5 +1,5 @@
-import { Verification } from "../../../types/verification";
 import { SecretVerificationRequest } from "../../models/request/secret-verification.request";
+import { Verification } from "../../types/verification";
 
 export abstract class UserVerificationService {
   buildRequest: <T extends SecretVerificationRequest>(
diff --git a/libs/common/src/auth/captcha-iframe.ts b/libs/common/src/auth/captcha-iframe.ts
index 6fb0f5a43a4..db97865606a 100644
--- a/libs/common/src/auth/captcha-iframe.ts
+++ b/libs/common/src/auth/captcha-iframe.ts
@@ -1,6 +1,7 @@
-import { IFrameComponent } from "../misc/iframe_component";
 import { I18nService } from "../platform/abstractions/i18n.service";
 
+import { IFrameComponent } from "./iframe-component";
+
 export class CaptchaIFrame extends IFrameComponent {
   constructor(
     win: Window,
diff --git a/libs/common/src/misc/iframe_component.ts b/libs/common/src/auth/iframe-component.ts
similarity index 100%
rename from libs/common/src/misc/iframe_component.ts
rename to libs/common/src/auth/iframe-component.ts
diff --git a/libs/common/src/auth/login-strategies/password-login.strategy.spec.ts b/libs/common/src/auth/login-strategies/password-login.strategy.spec.ts
index a0f8091bca7..0fe0147f248 100644
--- a/libs/common/src/auth/login-strategies/password-login.strategy.spec.ts
+++ b/libs/common/src/auth/login-strategies/password-login.strategy.spec.ts
@@ -2,13 +2,13 @@ import { mock, MockProxy } from "jest-mock-extended";
 
 import { ApiService } from "../../abstractions/api.service";
 import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
-import { HashPurpose } from "../../enums";
 import { AppIdService } from "../../platform/abstractions/app-id.service";
 import { CryptoService } from "../../platform/abstractions/crypto.service";
 import { LogService } from "../../platform/abstractions/log.service";
 import { MessagingService } from "../../platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
 import { StateService } from "../../platform/abstractions/state.service";
+import { HashPurpose } from "../../platform/enums";
 import { Utils } from "../../platform/misc/utils";
 import {
   MasterKey,
diff --git a/libs/common/src/auth/login-strategies/password-login.strategy.ts b/libs/common/src/auth/login-strategies/password-login.strategy.ts
index 6475bbe5a70..d05f5451e73 100644
--- a/libs/common/src/auth/login-strategies/password-login.strategy.ts
+++ b/libs/common/src/auth/login-strategies/password-login.strategy.ts
@@ -1,13 +1,13 @@
 import { ApiService } from "../../abstractions/api.service";
 import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
 import { MasterPasswordPolicyOptions } from "../../admin-console/models/domain/master-password-policy-options";
-import { HashPurpose } from "../../enums";
 import { AppIdService } from "../../platform/abstractions/app-id.service";
 import { CryptoService } from "../../platform/abstractions/crypto.service";
 import { LogService } from "../../platform/abstractions/log.service";
 import { MessagingService } from "../../platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
 import { StateService } from "../../platform/abstractions/state.service";
+import { HashPurpose } from "../../platform/enums";
 import { MasterKey } from "../../platform/models/domain/symmetric-crypto-key";
 import { PasswordStrengthServiceAbstraction } from "../../tools/password-strength";
 import { AuthService } from "../abstractions/auth.service";
diff --git a/libs/common/src/auth/models/request/set-key-connector-key.request.ts b/libs/common/src/auth/models/request/set-key-connector-key.request.ts
index 5215288dc31..4ff19dc2c10 100644
--- a/libs/common/src/auth/models/request/set-key-connector-key.request.ts
+++ b/libs/common/src/auth/models/request/set-key-connector-key.request.ts
@@ -1,5 +1,5 @@
-import { KdfType } from "../../../enums";
 import { KeysRequest } from "../../../models/request/keys.request";
+import { KdfType } from "../../../platform/enums";
 import { KdfConfig } from "../domain/kdf-config";
 
 export class SetKeyConnectorKeyRequest {
diff --git a/libs/common/src/auth/models/request/set-password.request.ts b/libs/common/src/auth/models/request/set-password.request.ts
index 30fa05662f5..74a36938d02 100644
--- a/libs/common/src/auth/models/request/set-password.request.ts
+++ b/libs/common/src/auth/models/request/set-password.request.ts
@@ -1,5 +1,5 @@
-import { KdfType } from "../../../enums";
 import { KeysRequest } from "../../../models/request/keys.request";
+import { KdfType } from "../../../platform/enums";
 
 export class SetPasswordRequest {
   masterPasswordHash: string;
diff --git a/libs/common/src/auth/models/response/identity-token.response.ts b/libs/common/src/auth/models/response/identity-token.response.ts
index d080341ed41..b0132f57473 100644
--- a/libs/common/src/auth/models/response/identity-token.response.ts
+++ b/libs/common/src/auth/models/response/identity-token.response.ts
@@ -1,5 +1,5 @@
-import { KdfType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
+import { KdfType } from "../../../platform/enums";
 
 import { MasterPasswordPolicyResponse } from "./master-password-policy.response";
 import { UserDecryptionOptionsResponse } from "./user-decryption-options/user-decryption-options.response";
diff --git a/libs/common/src/auth/models/response/prelogin.response.ts b/libs/common/src/auth/models/response/prelogin.response.ts
index 83262f904b8..c6762e22376 100644
--- a/libs/common/src/auth/models/response/prelogin.response.ts
+++ b/libs/common/src/auth/models/response/prelogin.response.ts
@@ -1,5 +1,5 @@
-import { KdfType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
+import { KdfType } from "../../../platform/enums";
 
 export class PreloginResponse extends BaseResponse {
   kdf: KdfType;
diff --git a/libs/common/src/auth/services/account-api.service.ts b/libs/common/src/auth/services/account-api.service.ts
index 270ec1a201f..8db1a18f8e8 100644
--- a/libs/common/src/auth/services/account-api.service.ts
+++ b/libs/common/src/auth/services/account-api.service.ts
@@ -1,9 +1,9 @@
 import { ApiService } from "../../abstractions/api.service";
 import { LogService } from "../../platform/abstractions/log.service";
-import { Verification } from "../../types/verification";
 import { AccountApiService } from "../abstractions/account-api.service";
 import { InternalAccountService } from "../abstractions/account.service";
 import { UserVerificationService } from "../abstractions/user-verification/user-verification.service.abstraction";
+import { Verification } from "../types/verification";
 
 export class AccountApiServiceImplementation implements AccountApiService {
   constructor(
diff --git a/libs/common/src/services/anonymousHub.service.ts b/libs/common/src/auth/services/anonymous-hub.service.ts
similarity index 83%
rename from libs/common/src/services/anonymousHub.service.ts
rename to libs/common/src/auth/services/anonymous-hub.service.ts
index 31b394ae587..4cb4aafcca4 100644
--- a/libs/common/src/services/anonymousHub.service.ts
+++ b/libs/common/src/auth/services/anonymous-hub.service.ts
@@ -6,15 +6,14 @@ import {
 } from "@microsoft/signalr";
 import { MessagePackHubProtocol } from "@microsoft/signalr-protocol-msgpack";
 
-import { AnonymousHubService as AnonymousHubServiceAbstraction } from "../abstractions/anonymousHub.service";
-import { AuthService } from "../auth/abstractions/auth.service";
-import { EnvironmentService } from "../platform/abstractions/environment.service";
-import { LogService } from "../platform/abstractions/log.service";
-
 import {
   AuthRequestPushNotification,
   NotificationResponse,
-} from "./../models/response/notification.response";
+} from "../../models/response/notification.response";
+import { EnvironmentService } from "../../platform/abstractions/environment.service";
+import { LogService } from "../../platform/abstractions/log.service";
+import { AnonymousHubService as AnonymousHubServiceAbstraction } from "../abstractions/anonymous-hub.service";
+import { AuthService } from "../abstractions/auth.service";
 
 export class AnonymousHubService implements AnonymousHubServiceAbstraction {
   private anonHubConnection: HubConnection;
diff --git a/libs/common/src/auth/services/auth.service.ts b/libs/common/src/auth/services/auth.service.ts
index 1c5f066d3a7..c4474a534db 100644
--- a/libs/common/src/auth/services/auth.service.ts
+++ b/libs/common/src/auth/services/auth.service.ts
@@ -2,7 +2,6 @@ import { Observable, Subject } from "rxjs";
 
 import { ApiService } from "../../abstractions/api.service";
 import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
-import { KdfType, KeySuffixOptions } from "../../enums";
 import { PreloginRequest } from "../../models/request/prelogin.request";
 import { ErrorResponse } from "../../models/response/error.response";
 import { AuthRequestPushNotification } from "../../models/response/notification.response";
@@ -15,6 +14,7 @@ import { LogService } from "../../platform/abstractions/log.service";
 import { MessagingService } from "../../platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
 import { StateService } from "../../platform/abstractions/state.service";
+import { KdfType, KeySuffixOptions } from "../../platform/enums";
 import { Utils } from "../../platform/misc/utils";
 import { MasterKey } from "../../platform/models/domain/symmetric-crypto-key";
 import { PasswordStrengthServiceAbstraction } from "../../tools/password-strength";
diff --git a/libs/common/src/auth/services/device-trust-crypto.service.spec.ts b/libs/common/src/auth/services/device-trust-crypto.service.spec.ts
index 66a14ac87ce..c7e8b3865a6 100644
--- a/libs/common/src/auth/services/device-trust-crypto.service.spec.ts
+++ b/libs/common/src/auth/services/device-trust-crypto.service.spec.ts
@@ -1,7 +1,6 @@
 import { matches, mock } from "jest-mock-extended";
 
 import { DeviceType } from "../../enums";
-import { EncryptionType } from "../../enums/encryption-type.enum";
 import { AppIdService } from "../../platform/abstractions/app-id.service";
 import { CryptoFunctionService } from "../../platform/abstractions/crypto-function.service";
 import { CryptoService } from "../../platform/abstractions/crypto.service";
@@ -9,6 +8,7 @@ import { EncryptService } from "../../platform/abstractions/encrypt.service";
 import { I18nService } from "../../platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
 import { StateService } from "../../platform/abstractions/state.service";
+import { EncryptionType } from "../../platform/enums/encryption-type.enum";
 import { EncString } from "../../platform/models/domain/enc-string";
 import {
   SymmetricCryptoKey,
diff --git a/libs/common/src/auth/services/user-verification/user-verification.service.ts b/libs/common/src/auth/services/user-verification/user-verification.service.ts
index 5e20eb7645b..75bd88a2d0c 100644
--- a/libs/common/src/auth/services/user-verification/user-verification.service.ts
+++ b/libs/common/src/auth/services/user-verification/user-verification.service.ts
@@ -1,12 +1,12 @@
 import { CryptoService } from "../../../platform/abstractions/crypto.service";
 import { I18nService } from "../../../platform/abstractions/i18n.service";
 import { StateService } from "../../../platform/abstractions/state.service";
-import { Verification } from "../../../types/verification";
 import { UserVerificationApiServiceAbstraction } from "../../abstractions/user-verification/user-verification-api.service.abstraction";
 import { UserVerificationService as UserVerificationServiceAbstraction } from "../../abstractions/user-verification/user-verification.service.abstraction";
 import { VerificationType } from "../../enums/verification-type";
 import { SecretVerificationRequest } from "../../models/request/secret-verification.request";
 import { VerifyOTPRequest } from "../../models/request/verify-otp.request";
+import { Verification } from "../../types/verification";
 
 /**
  * Used for general-purpose user verification throughout the app.
diff --git a/libs/common/src/types/verification.ts b/libs/common/src/auth/types/verification.ts
similarity index 53%
rename from libs/common/src/types/verification.ts
rename to libs/common/src/auth/types/verification.ts
index b3e229cbd67..5a3ec9a6c75 100644
--- a/libs/common/src/types/verification.ts
+++ b/libs/common/src/auth/types/verification.ts
@@ -1,4 +1,4 @@
-import { VerificationType } from "../auth/enums/verification-type";
+import { VerificationType } from "../enums/verification-type";
 
 export type Verification = {
   type: VerificationType;
diff --git a/libs/common/src/enums/index.ts b/libs/common/src/enums/index.ts
index b62b3ecfa81..378af213e67 100644
--- a/libs/common/src/enums/index.ts
+++ b/libs/common/src/enums/index.ts
@@ -1,23 +1,8 @@
 export * from "./client-type.enum";
 export * from "./device-type.enum";
-export * from "./encrypted-export-type.enum";
-export * from "./encryption-type.enum";
 export * from "./event-system-user.enum";
 export * from "./event-type.enum";
-export * from "./field-type.enum";
-export * from "./file-upload-type.enum";
-export * from "./hash-purpose.enum";
-export * from "./html-storage-location.enum";
 export * from "./http-status-code.enum";
-export * from "./kdf-type.enum";
-export * from "./key-suffix-options.enum";
-export * from "./linked-id-type.enum";
-export * from "./log-level-type.enum";
 export * from "./native-messaging-version.enum";
 export * from "./notification-type.enum";
 export * from "./product-type.enum";
-export * from "./provider-type.enum";
-export * from "./secure-note-type.enum";
-export * from "./storage-location.enum";
-export * from "./theme-type.enum";
-export * from "./uri-match-type.enum";
diff --git a/libs/common/src/models/export/field.export.ts b/libs/common/src/models/export/field.export.ts
index b30ce64eeb9..098249312c2 100644
--- a/libs/common/src/models/export/field.export.ts
+++ b/libs/common/src/models/export/field.export.ts
@@ -1,5 +1,5 @@
-import { FieldType, LinkedIdType } from "../../enums";
 import { EncString } from "../../platform/models/domain/enc-string";
+import { FieldType, LinkedIdType } from "../../vault/enums";
 import { Field as FieldDomain } from "../../vault/models/domain/field";
 import { FieldView } from "../../vault/models/view/field.view";
 
diff --git a/libs/common/src/models/export/login-uri.export.ts b/libs/common/src/models/export/login-uri.export.ts
index af9c362e44e..9c8a96e99dd 100644
--- a/libs/common/src/models/export/login-uri.export.ts
+++ b/libs/common/src/models/export/login-uri.export.ts
@@ -1,5 +1,5 @@
-import { UriMatchType } from "../../enums";
 import { EncString } from "../../platform/models/domain/enc-string";
+import { UriMatchType } from "../../vault/enums";
 import { LoginUri as LoginUriDomain } from "../../vault/models/domain/login-uri";
 import { LoginUriView } from "../../vault/models/view/login-uri.view";
 
diff --git a/libs/common/src/models/export/secure-note.export.ts b/libs/common/src/models/export/secure-note.export.ts
index 4cef8f88a0a..a9a0f78182a 100644
--- a/libs/common/src/models/export/secure-note.export.ts
+++ b/libs/common/src/models/export/secure-note.export.ts
@@ -1,4 +1,4 @@
-import { SecureNoteType } from "../../enums";
+import { SecureNoteType } from "../../vault/enums";
 import { SecureNote as SecureNoteDomain } from "../../vault/models/domain/secure-note";
 import { SecureNoteView } from "../../vault/models/view/secure-note.view";
 
diff --git a/libs/common/src/models/request/kdf.request.ts b/libs/common/src/models/request/kdf.request.ts
index 0ae4ac8f006..8f27b0ec10f 100644
--- a/libs/common/src/models/request/kdf.request.ts
+++ b/libs/common/src/models/request/kdf.request.ts
@@ -1,5 +1,5 @@
 import { PasswordRequest } from "../../auth/models/request/password.request";
-import { KdfType } from "../../enums";
+import { KdfType } from "../../platform/enums";
 
 export class KdfRequest extends PasswordRequest {
   kdf: KdfType;
diff --git a/libs/common/src/models/request/register.request.ts b/libs/common/src/models/request/register.request.ts
index 30f05180930..a29b5f84d41 100644
--- a/libs/common/src/models/request/register.request.ts
+++ b/libs/common/src/models/request/register.request.ts
@@ -1,5 +1,5 @@
 import { CaptchaProtectedRequest } from "../../auth/models/request/captcha-protected.request";
-import { KdfType } from "../../enums";
+import { KdfType } from "../../platform/enums";
 
 import { KeysRequest } from "./keys.request";
 import { ReferenceEventRequest } from "./reference-event.request";
diff --git a/libs/common/src/platform/abstractions/crypto.service.ts b/libs/common/src/platform/abstractions/crypto.service.ts
index 8f1d9c48662..84b4d2f13e1 100644
--- a/libs/common/src/platform/abstractions/crypto.service.ts
+++ b/libs/common/src/platform/abstractions/crypto.service.ts
@@ -2,7 +2,7 @@ import { ProfileOrganizationResponse } from "../../admin-console/models/response
 import { ProfileProviderOrganizationResponse } from "../../admin-console/models/response/profile-provider-organization.response";
 import { ProfileProviderResponse } from "../../admin-console/models/response/profile-provider.response";
 import { KdfConfig } from "../../auth/models/domain/kdf-config";
-import { KeySuffixOptions, KdfType, HashPurpose } from "../../enums";
+import { KeySuffixOptions, KdfType, HashPurpose } from "../enums";
 import { EncArrayBuffer } from "../models/domain/enc-array-buffer";
 import { EncString } from "../models/domain/enc-string";
 import {
diff --git a/libs/common/src/platform/abstractions/file-upload/file-upload.service.ts b/libs/common/src/platform/abstractions/file-upload/file-upload.service.ts
index 29fde216453..eff5a018a29 100644
--- a/libs/common/src/platform/abstractions/file-upload/file-upload.service.ts
+++ b/libs/common/src/platform/abstractions/file-upload/file-upload.service.ts
@@ -1,4 +1,4 @@
-import { FileUploadType } from "../../../enums";
+import { FileUploadType } from "../../enums";
 import { EncArrayBuffer } from "../../models/domain/enc-array-buffer";
 import { EncString } from "../../models/domain/enc-string";
 
diff --git a/libs/common/src/platform/abstractions/log.service.ts b/libs/common/src/platform/abstractions/log.service.ts
index e8258060170..17db5976871 100644
--- a/libs/common/src/platform/abstractions/log.service.ts
+++ b/libs/common/src/platform/abstractions/log.service.ts
@@ -1,4 +1,4 @@
-import { LogLevelType } from "../../enums";
+import { LogLevelType } from "../enums/log-level-type.enum";
 
 export abstract class LogService {
   debug: (message: string) => void;
diff --git a/libs/common/src/platform/abstractions/state.service.ts b/libs/common/src/platform/abstractions/state.service.ts
index f4f86cb8595..61e361ad6de 100644
--- a/libs/common/src/platform/abstractions/state.service.ts
+++ b/libs/common/src/platform/abstractions/state.service.ts
@@ -10,7 +10,6 @@ import { EnvironmentUrls } from "../../auth/models/domain/environment-urls";
 import { ForceSetPasswordReason } from "../../auth/models/domain/force-set-password-reason";
 import { KdfConfig } from "../../auth/models/domain/kdf-config";
 import { BiometricKey } from "../../auth/types/biometric-key";
-import { KdfType, ThemeType, UriMatchType } from "../../enums";
 import { EventData } from "../../models/data/event.data";
 import { WindowState } from "../../models/domain/window-state";
 import { GeneratorOptions } from "../../tools/generator/generator-options";
@@ -18,6 +17,7 @@ import { GeneratedPasswordHistory, PasswordGeneratorOptions } from "../../tools/
 import { UsernameGeneratorOptions } from "../../tools/generator/username";
 import { SendData } from "../../tools/send/models/data/send.data";
 import { SendView } from "../../tools/send/models/view/send.view";
+import { UriMatchType } from "../../vault/enums";
 import { CipherData } from "../../vault/models/data/cipher.data";
 import { CollectionData } from "../../vault/models/data/collection.data";
 import { FolderData } from "../../vault/models/data/folder.data";
@@ -25,6 +25,7 @@ import { LocalData } from "../../vault/models/data/local.data";
 import { CipherView } from "../../vault/models/view/cipher.view";
 import { CollectionView } from "../../vault/models/view/collection.view";
 import { AddEditCipherInfo } from "../../vault/types/add-edit-cipher-info";
+import { KdfType, ThemeType } from "../enums";
 import { ServerConfigData } from "../models/data/server-config.data";
 import {
   Account,
diff --git a/libs/common/src/enums/encryption-type.enum.ts b/libs/common/src/platform/enums/encryption-type.enum.ts
similarity index 100%
rename from libs/common/src/enums/encryption-type.enum.ts
rename to libs/common/src/platform/enums/encryption-type.enum.ts
diff --git a/libs/common/src/enums/file-upload-type.enum.ts b/libs/common/src/platform/enums/file-upload-type.enum.ts
similarity index 100%
rename from libs/common/src/enums/file-upload-type.enum.ts
rename to libs/common/src/platform/enums/file-upload-type.enum.ts
diff --git a/libs/common/src/enums/hash-purpose.enum.ts b/libs/common/src/platform/enums/hash-purpose.enum.ts
similarity index 100%
rename from libs/common/src/enums/hash-purpose.enum.ts
rename to libs/common/src/platform/enums/hash-purpose.enum.ts
diff --git a/libs/common/src/enums/html-storage-location.enum.ts b/libs/common/src/platform/enums/html-storage-location.enum.ts
similarity index 100%
rename from libs/common/src/enums/html-storage-location.enum.ts
rename to libs/common/src/platform/enums/html-storage-location.enum.ts
diff --git a/libs/common/src/platform/enums/index.ts b/libs/common/src/platform/enums/index.ts
new file mode 100644
index 00000000000..bac3f4ec41a
--- /dev/null
+++ b/libs/common/src/platform/enums/index.ts
@@ -0,0 +1,9 @@
+export * from "./encryption-type.enum";
+export * from "./file-upload-type.enum";
+export * from "./hash-purpose.enum";
+export * from "./html-storage-location.enum";
+export * from "./kdf-type.enum";
+export * from "./key-suffix-options.enum";
+export * from "./log-level-type.enum";
+export * from "./storage-location.enum";
+export * from "./theme-type.enum";
diff --git a/libs/common/src/enums/kdf-type.enum.ts b/libs/common/src/platform/enums/kdf-type.enum.ts
similarity index 78%
rename from libs/common/src/enums/kdf-type.enum.ts
rename to libs/common/src/platform/enums/kdf-type.enum.ts
index eb8702437ce..13f671dfdaa 100644
--- a/libs/common/src/enums/kdf-type.enum.ts
+++ b/libs/common/src/platform/enums/kdf-type.enum.ts
@@ -1,4 +1,4 @@
-import { KdfConfig } from "../auth/models/domain/kdf-config";
+import { KdfConfig } from "../../auth/models/domain/kdf-config";
 
 export enum KdfType {
   PBKDF2_SHA256 = 0,
@@ -12,4 +12,3 @@ export const DEFAULT_ARGON2_ITERATIONS = 3;
 export const DEFAULT_KDF_TYPE = KdfType.PBKDF2_SHA256;
 export const DEFAULT_PBKDF2_ITERATIONS = 600000;
 export const DEFAULT_KDF_CONFIG = new KdfConfig(DEFAULT_PBKDF2_ITERATIONS);
-export const SEND_KDF_ITERATIONS = 100000;
diff --git a/libs/common/src/enums/key-suffix-options.enum.ts b/libs/common/src/platform/enums/key-suffix-options.enum.ts
similarity index 100%
rename from libs/common/src/enums/key-suffix-options.enum.ts
rename to libs/common/src/platform/enums/key-suffix-options.enum.ts
diff --git a/libs/common/src/enums/log-level-type.enum.ts b/libs/common/src/platform/enums/log-level-type.enum.ts
similarity index 100%
rename from libs/common/src/enums/log-level-type.enum.ts
rename to libs/common/src/platform/enums/log-level-type.enum.ts
diff --git a/libs/common/src/enums/storage-location.enum.ts b/libs/common/src/platform/enums/storage-location.enum.ts
similarity index 100%
rename from libs/common/src/enums/storage-location.enum.ts
rename to libs/common/src/platform/enums/storage-location.enum.ts
diff --git a/libs/common/src/enums/theme-type.enum.ts b/libs/common/src/platform/enums/theme-type.enum.ts
similarity index 100%
rename from libs/common/src/enums/theme-type.enum.ts
rename to libs/common/src/platform/enums/theme-type.enum.ts
diff --git a/libs/common/src/platform/interfaces/encrypted.ts b/libs/common/src/platform/interfaces/encrypted.ts
index 26a49a32ec5..6f9d3a191df 100644
--- a/libs/common/src/platform/interfaces/encrypted.ts
+++ b/libs/common/src/platform/interfaces/encrypted.ts
@@ -1,4 +1,4 @@
-import { EncryptionType } from "../../enums";
+import { EncryptionType } from "../enums";
 
 export interface Encrypted {
   encryptionType?: EncryptionType;
diff --git a/libs/common/src/platform/models/domain/account.ts b/libs/common/src/platform/models/domain/account.ts
index 359e765f792..d3964bd1165 100644
--- a/libs/common/src/platform/models/domain/account.ts
+++ b/libs/common/src/platform/models/domain/account.ts
@@ -11,7 +11,6 @@ import { ForceSetPasswordReason } from "../../../auth/models/domain/force-set-pa
 import { KeyConnectorUserDecryptionOption } from "../../../auth/models/domain/user-decryption-options/key-connector-user-decryption-option";
 import { TrustedDeviceUserDecryptionOption } from "../../../auth/models/domain/user-decryption-options/trusted-device-user-decryption-option";
 import { IdentityTokenResponse } from "../../../auth/models/response/identity-token.response";
-import { KdfType, UriMatchType } from "../../../enums";
 import { EventData } from "../../../models/data/event.data";
 import { GeneratorOptions } from "../../../tools/generator/generator-options";
 import {
@@ -22,11 +21,13 @@ import { UsernameGeneratorOptions } from "../../../tools/generator/username/user
 import { SendData } from "../../../tools/send/models/data/send.data";
 import { SendView } from "../../../tools/send/models/view/send.view";
 import { DeepJsonify } from "../../../types/deep-jsonify";
+import { UriMatchType } from "../../../vault/enums";
 import { CipherData } from "../../../vault/models/data/cipher.data";
 import { CollectionData } from "../../../vault/models/data/collection.data";
 import { FolderData } from "../../../vault/models/data/folder.data";
 import { CipherView } from "../../../vault/models/view/cipher.view";
 import { CollectionView } from "../../../vault/models/view/collection.view";
+import { KdfType } from "../../enums";
 import { Utils } from "../../misc/utils";
 import { ServerConfigData } from "../../models/data/server-config.data";
 
diff --git a/libs/common/src/platform/models/domain/enc-array-buffer.spec.ts b/libs/common/src/platform/models/domain/enc-array-buffer.spec.ts
index 4e0464fd622..45a45ffe087 100644
--- a/libs/common/src/platform/models/domain/enc-array-buffer.spec.ts
+++ b/libs/common/src/platform/models/domain/enc-array-buffer.spec.ts
@@ -1,5 +1,5 @@
 import { makeStaticByteArray } from "../../../../spec";
-import { EncryptionType } from "../../../enums";
+import { EncryptionType } from "../../enums";
 
 import { EncArrayBuffer } from "./enc-array-buffer";
 
diff --git a/libs/common/src/platform/models/domain/enc-array-buffer.ts b/libs/common/src/platform/models/domain/enc-array-buffer.ts
index afe9bad57f2..9b7f7cd0362 100644
--- a/libs/common/src/platform/models/domain/enc-array-buffer.ts
+++ b/libs/common/src/platform/models/domain/enc-array-buffer.ts
@@ -1,5 +1,5 @@
-import { EncryptionType } from "../../../enums";
 import { Utils } from "../../../platform/misc/utils";
+import { EncryptionType } from "../../enums";
 import { Encrypted } from "../../interfaces/encrypted";
 
 const ENC_TYPE_LENGTH = 1;
diff --git a/libs/common/src/platform/models/domain/enc-string.spec.ts b/libs/common/src/platform/models/domain/enc-string.spec.ts
index a2b8be6d55b..3f2c508ce8d 100644
--- a/libs/common/src/platform/models/domain/enc-string.spec.ts
+++ b/libs/common/src/platform/models/domain/enc-string.spec.ts
@@ -1,7 +1,6 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
 import { makeStaticByteArray } from "../../../../spec";
-import { EncryptionType } from "../../../enums";
 import { EncryptService } from "../../../platform/abstractions/encrypt.service";
 import {
   OrgKey,
@@ -9,6 +8,7 @@ import {
   UserKey,
 } from "../../../platform/models/domain/symmetric-crypto-key";
 import { CryptoService } from "../../abstractions/crypto.service";
+import { EncryptionType } from "../../enums";
 import { ContainerService } from "../../services/container.service";
 
 import { EncString } from "./enc-string";
diff --git a/libs/common/src/platform/models/domain/enc-string.ts b/libs/common/src/platform/models/domain/enc-string.ts
index 60b59fa4d8c..75206d640da 100644
--- a/libs/common/src/platform/models/domain/enc-string.ts
+++ b/libs/common/src/platform/models/domain/enc-string.ts
@@ -1,8 +1,8 @@
 import { Jsonify, Opaque } from "type-fest";
 
-import { EncryptionType, EXPECTED_NUM_PARTS_BY_ENCRYPTION_TYPE } from "../../../enums";
-import { Utils } from "../../../platform/misc/utils";
+import { EncryptionType, EXPECTED_NUM_PARTS_BY_ENCRYPTION_TYPE } from "../../enums";
 import { Encrypted } from "../../interfaces/encrypted";
+import { Utils } from "../../misc/utils";
 
 import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
diff --git a/libs/common/src/platform/models/domain/global-state.ts b/libs/common/src/platform/models/domain/global-state.ts
index ab52115a7ed..c5bba532cc0 100644
--- a/libs/common/src/platform/models/domain/global-state.ts
+++ b/libs/common/src/platform/models/domain/global-state.ts
@@ -1,6 +1,6 @@
 import { EnvironmentUrls } from "../../../auth/models/domain/environment-urls";
-import { ThemeType } from "../../../enums";
 import { WindowState } from "../../../models/domain/window-state";
+import { ThemeType } from "../../enums";
 
 export class GlobalState {
   enableAlwaysOnTop?: boolean;
diff --git a/libs/common/src/platform/models/domain/storage-options.ts b/libs/common/src/platform/models/domain/storage-options.ts
index 767c4ba2379..6ed430ac50f 100644
--- a/libs/common/src/platform/models/domain/storage-options.ts
+++ b/libs/common/src/platform/models/domain/storage-options.ts
@@ -1,6 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { HtmlStorageLocation, StorageLocation } from "../../../enums";
+import { HtmlStorageLocation, StorageLocation } from "../../enums";
 
 export type StorageOptions = {
   storageLocation?: StorageLocation;
diff --git a/libs/common/src/platform/models/domain/symmetric-crypto-key.spec.ts b/libs/common/src/platform/models/domain/symmetric-crypto-key.spec.ts
index 13d5835c918..f39b298a27d 100644
--- a/libs/common/src/platform/models/domain/symmetric-crypto-key.spec.ts
+++ b/libs/common/src/platform/models/domain/symmetric-crypto-key.spec.ts
@@ -1,5 +1,5 @@
 import { makeStaticByteArray } from "../../../../spec";
-import { EncryptionType } from "../../../enums";
+import { EncryptionType } from "../../enums";
 
 import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
diff --git a/libs/common/src/platform/models/domain/symmetric-crypto-key.ts b/libs/common/src/platform/models/domain/symmetric-crypto-key.ts
index ea5e4e8aa1b..8ac3b0d7118 100644
--- a/libs/common/src/platform/models/domain/symmetric-crypto-key.ts
+++ b/libs/common/src/platform/models/domain/symmetric-crypto-key.ts
@@ -1,7 +1,7 @@
 import { Jsonify, Opaque } from "type-fest";
 
-import { EncryptionType } from "../../../enums";
 import { Utils } from "../../../platform/misc/utils";
+import { EncryptionType } from "../../enums";
 
 export class SymmetricCryptoKey {
   key: Uint8Array;
diff --git a/libs/common/src/platform/services/app-id.service.ts b/libs/common/src/platform/services/app-id.service.ts
index 0ce1286e4d3..fa3d943edea 100644
--- a/libs/common/src/platform/services/app-id.service.ts
+++ b/libs/common/src/platform/services/app-id.service.ts
@@ -1,6 +1,6 @@
-import { HtmlStorageLocation } from "../../enums";
 import { AppIdService as AppIdServiceAbstraction } from "../abstractions/app-id.service";
 import { AbstractStorageService } from "../abstractions/storage.service";
+import { HtmlStorageLocation } from "../enums";
 import { Utils } from "../misc/utils";
 
 export class AppIdService implements AppIdServiceAbstraction {
diff --git a/libs/common/src/platform/services/console-log.service.ts b/libs/common/src/platform/services/console-log.service.ts
index 966d848f765..531cccb4cee 100644
--- a/libs/common/src/platform/services/console-log.service.ts
+++ b/libs/common/src/platform/services/console-log.service.ts
@@ -1,5 +1,5 @@
-import { LogLevelType } from "../../enums";
 import { LogService as LogServiceAbstraction } from "../abstractions/log.service";
+import { LogLevelType } from "../enums/log-level-type.enum";
 
 export class ConsoleLogService implements LogServiceAbstraction {
   protected timersMap: Map<string, [number, number]> = new Map();
diff --git a/libs/common/src/platform/services/crypto.service.ts b/libs/common/src/platform/services/crypto.service.ts
index 0ea9acc53da..17297b2636d 100644
--- a/libs/common/src/platform/services/crypto.service.ts
+++ b/libs/common/src/platform/services/crypto.service.ts
@@ -6,6 +6,13 @@ import { ProfileOrganizationResponse } from "../../admin-console/models/response
 import { ProfileProviderOrganizationResponse } from "../../admin-console/models/response/profile-provider-organization.response";
 import { ProfileProviderResponse } from "../../admin-console/models/response/profile-provider.response";
 import { KdfConfig } from "../../auth/models/domain/kdf-config";
+import { Utils } from "../../platform/misc/utils";
+import { CryptoFunctionService } from "../abstractions/crypto-function.service";
+import { CryptoService as CryptoServiceAbstraction } from "../abstractions/crypto.service";
+import { EncryptService } from "../abstractions/encrypt.service";
+import { LogService } from "../abstractions/log.service";
+import { PlatformUtilsService } from "../abstractions/platform-utils.service";
+import { StateService } from "../abstractions/state.service";
 import {
   KeySuffixOptions,
   HashPurpose,
@@ -14,14 +21,7 @@ import {
   DEFAULT_ARGON2_MEMORY,
   DEFAULT_ARGON2_PARALLELISM,
   EncryptionType,
-} from "../../enums";
-import { Utils } from "../../platform/misc/utils";
-import { CryptoFunctionService } from "../abstractions/crypto-function.service";
-import { CryptoService as CryptoServiceAbstraction } from "../abstractions/crypto.service";
-import { EncryptService } from "../abstractions/encrypt.service";
-import { LogService } from "../abstractions/log.service";
-import { PlatformUtilsService } from "../abstractions/platform-utils.service";
-import { StateService } from "../abstractions/state.service";
+} from "../enums";
 import { sequentialize } from "../misc/sequentialize";
 import { EFFLongWordList } from "../misc/wordlist";
 import { EncArrayBuffer } from "../models/domain/enc-array-buffer";
diff --git a/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts b/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts
index 2df24bb33fd..87943a32036 100644
--- a/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts
+++ b/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts
@@ -1,8 +1,8 @@
-import { EncryptionType } from "../../../enums";
 import { Utils } from "../../../platform/misc/utils";
 import { CryptoFunctionService } from "../../abstractions/crypto-function.service";
 import { EncryptService } from "../../abstractions/encrypt.service";
 import { LogService } from "../../abstractions/log.service";
+import { EncryptionType } from "../../enums";
 import { Decryptable } from "../../interfaces/decryptable.interface";
 import { Encrypted } from "../../interfaces/encrypted";
 import { InitializerMetadata } from "../../interfaces/initializer-metadata.interface";
diff --git a/libs/common/src/platform/services/encrypt.service.spec.ts b/libs/common/src/platform/services/encrypt.service.spec.ts
index aa3039a4708..a2225c0c3fe 100644
--- a/libs/common/src/platform/services/encrypt.service.spec.ts
+++ b/libs/common/src/platform/services/encrypt.service.spec.ts
@@ -1,10 +1,10 @@
 import { mockReset, mock } from "jest-mock-extended";
 
 import { makeStaticByteArray } from "../../../spec";
-import { EncryptionType } from "../../enums";
 import { CsprngArray } from "../../types/csprng";
 import { CryptoFunctionService } from "../abstractions/crypto-function.service";
 import { LogService } from "../abstractions/log.service";
+import { EncryptionType } from "../enums";
 import { EncArrayBuffer } from "../models/domain/enc-array-buffer";
 import { EncString } from "../models/domain/enc-string";
 import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
diff --git a/libs/common/src/platform/services/file-upload/file-upload.service.ts b/libs/common/src/platform/services/file-upload/file-upload.service.ts
index 750259da980..03efb89ee8c 100644
--- a/libs/common/src/platform/services/file-upload/file-upload.service.ts
+++ b/libs/common/src/platform/services/file-upload/file-upload.service.ts
@@ -1,9 +1,9 @@
-import { FileUploadType } from "../../../enums";
 import {
   FileUploadApiMethods,
   FileUploadService as FileUploadServiceAbstraction,
 } from "../../abstractions/file-upload/file-upload.service";
 import { LogService } from "../../abstractions/log.service";
+import { FileUploadType } from "../../enums";
 import { EncArrayBuffer } from "../../models/domain/enc-array-buffer";
 import { EncString } from "../../models/domain/enc-string";
 
diff --git a/libs/common/src/platform/services/state.service.ts b/libs/common/src/platform/services/state.service.ts
index fda79c5524c..7baaabec5f4 100644
--- a/libs/common/src/platform/services/state.service.ts
+++ b/libs/common/src/platform/services/state.service.ts
@@ -14,13 +14,6 @@ import { EnvironmentUrls } from "../../auth/models/domain/environment-urls";
 import { ForceSetPasswordReason } from "../../auth/models/domain/force-set-password-reason";
 import { KdfConfig } from "../../auth/models/domain/kdf-config";
 import { BiometricKey } from "../../auth/types/biometric-key";
-import {
-  HtmlStorageLocation,
-  KdfType,
-  StorageLocation,
-  ThemeType,
-  UriMatchType,
-} from "../../enums";
 import { VaultTimeoutAction } from "../../enums/vault-timeout-action.enum";
 import { EventData } from "../../models/data/event.data";
 import { WindowState } from "../../models/domain/window-state";
@@ -31,6 +24,7 @@ import { UsernameGeneratorOptions } from "../../tools/generator/username";
 import { SendData } from "../../tools/send/models/data/send.data";
 import { SendView } from "../../tools/send/models/view/send.view";
 import { UserId } from "../../types/guid";
+import { UriMatchType } from "../../vault/enums";
 import { CipherData } from "../../vault/models/data/cipher.data";
 import { CollectionData } from "../../vault/models/data/collection.data";
 import { FolderData } from "../../vault/models/data/folder.data";
@@ -44,6 +38,7 @@ import {
   AbstractMemoryStorageService,
   AbstractStorageService,
 } from "../abstractions/storage.service";
+import { HtmlStorageLocation, KdfType, StorageLocation, ThemeType } from "../enums";
 import { StateFactory } from "../factories/state-factory";
 import { Utils } from "../misc/utils";
 import { ServerConfigData } from "../models/data/server-config.data";
diff --git a/libs/common/src/services/search.service.ts b/libs/common/src/services/search.service.ts
index c1d9dc7fb75..d40988878ff 100644
--- a/libs/common/src/services/search.service.ts
+++ b/libs/common/src/services/search.service.ts
@@ -1,10 +1,10 @@
 import * as lunr from "lunr";
 
 import { SearchService as SearchServiceAbstraction } from "../abstractions/search.service";
-import { FieldType, UriMatchType } from "../enums";
 import { I18nService } from "../platform/abstractions/i18n.service";
 import { LogService } from "../platform/abstractions/log.service";
 import { SendView } from "../tools/send/models/view/send.view";
+import { FieldType, UriMatchType } from "../vault/enums";
 import { CipherType } from "../vault/enums/cipher-type";
 import { CipherView } from "../vault/models/view/cipher.view";
 
diff --git a/libs/common/src/enums/encrypted-export-type.enum.ts b/libs/common/src/tools/enums/encrypted-export-type.enum.ts
similarity index 100%
rename from libs/common/src/enums/encrypted-export-type.enum.ts
rename to libs/common/src/tools/enums/encrypted-export-type.enum.ts
diff --git a/libs/common/src/models/domain/email-forwarder-options.ts b/libs/common/src/tools/models/domain/email-forwarder-options.ts
similarity index 100%
rename from libs/common/src/models/domain/email-forwarder-options.ts
rename to libs/common/src/tools/models/domain/email-forwarder-options.ts
diff --git a/libs/common/src/tools/send/models/response/send-file-upload-data.response.ts b/libs/common/src/tools/send/models/response/send-file-upload-data.response.ts
index 1098fb2f69f..3ed5e368855 100644
--- a/libs/common/src/tools/send/models/response/send-file-upload-data.response.ts
+++ b/libs/common/src/tools/send/models/response/send-file-upload-data.response.ts
@@ -1,5 +1,5 @@
-import { FileUploadType } from "../../../../enums";
 import { BaseResponse } from "../../../../models/response/base.response";
+import { FileUploadType } from "../../../../platform/enums";
 
 import { SendResponse } from "./send.response";
 
diff --git a/libs/common/src/tools/send/send-kdf.ts b/libs/common/src/tools/send/send-kdf.ts
new file mode 100644
index 00000000000..48264fd7e57
--- /dev/null
+++ b/libs/common/src/tools/send/send-kdf.ts
@@ -0,0 +1 @@
+export const SEND_KDF_ITERATIONS = 100000;
diff --git a/libs/common/src/tools/send/services/send.service.ts b/libs/common/src/tools/send/services/send.service.ts
index fc1985067fb..45a3ab8373d 100644
--- a/libs/common/src/tools/send/services/send.service.ts
+++ b/libs/common/src/tools/send/services/send.service.ts
@@ -1,6 +1,5 @@
 import { BehaviorSubject, concatMap } from "rxjs";
 
-import { SEND_KDF_ITERATIONS } from "../../../enums";
 import { CryptoFunctionService } from "../../../platform/abstractions/crypto-function.service";
 import { CryptoService } from "../../../platform/abstractions/crypto.service";
 import { I18nService } from "../../../platform/abstractions/i18n.service";
@@ -15,6 +14,7 @@ import { Send } from "../models/domain/send";
 import { SendFile } from "../models/domain/send-file";
 import { SendText } from "../models/domain/send-text";
 import { SendView } from "../models/view/send.view";
+import { SEND_KDF_ITERATIONS } from "../send-kdf";
 
 import { InternalSendService as InternalSendServiceAbstraction } from "./send.service.abstraction";
 
diff --git a/libs/common/src/vault/abstractions/cipher.service.ts b/libs/common/src/vault/abstractions/cipher.service.ts
index 404a58abb1a..1dcec9dc9a8 100644
--- a/libs/common/src/vault/abstractions/cipher.service.ts
+++ b/libs/common/src/vault/abstractions/cipher.service.ts
@@ -1,5 +1,5 @@
-import { UriMatchType } from "../../enums";
 import { SymmetricCryptoKey } from "../../platform/models/domain/symmetric-crypto-key";
+import { UriMatchType } from "../enums";
 import { CipherType } from "../enums/cipher-type";
 import { CipherData } from "../models/data/cipher.data";
 import { Cipher } from "../models/domain/cipher";
diff --git a/libs/common/src/vault/abstractions/collection.service.ts b/libs/common/src/vault/abstractions/collection.service.ts
index 18708406ab9..316794a5562 100644
--- a/libs/common/src/vault/abstractions/collection.service.ts
+++ b/libs/common/src/vault/abstractions/collection.service.ts
@@ -1,6 +1,6 @@
-import { TreeNode } from "../../models/domain/tree-node";
 import { CollectionData } from "../models/data/collection.data";
 import { Collection } from "../models/domain/collection";
+import { TreeNode } from "../models/domain/tree-node";
 import { CollectionView } from "../models/view/collection.view";
 
 export abstract class CollectionService {
diff --git a/libs/common/src/abstractions/totp.service.ts b/libs/common/src/vault/abstractions/totp.service.ts
similarity index 100%
rename from libs/common/src/abstractions/totp.service.ts
rename to libs/common/src/vault/abstractions/totp.service.ts
diff --git a/libs/common/src/enums/field-type.enum.ts b/libs/common/src/vault/enums/field-type.enum.ts
similarity index 100%
rename from libs/common/src/enums/field-type.enum.ts
rename to libs/common/src/vault/enums/field-type.enum.ts
diff --git a/libs/common/src/vault/enums/index.ts b/libs/common/src/vault/enums/index.ts
new file mode 100644
index 00000000000..e7715f6c042
--- /dev/null
+++ b/libs/common/src/vault/enums/index.ts
@@ -0,0 +1,6 @@
+export * from "./cipher-reprompt-type";
+export * from "./cipher-type";
+export * from "./field-type.enum";
+export * from "./linked-id-type.enum";
+export * from "./secure-note-type.enum";
+export * from "./uri-match-type.enum";
diff --git a/libs/common/src/enums/linked-id-type.enum.ts b/libs/common/src/vault/enums/linked-id-type.enum.ts
similarity index 100%
rename from libs/common/src/enums/linked-id-type.enum.ts
rename to libs/common/src/vault/enums/linked-id-type.enum.ts
diff --git a/libs/common/src/enums/secure-note-type.enum.ts b/libs/common/src/vault/enums/secure-note-type.enum.ts
similarity index 100%
rename from libs/common/src/enums/secure-note-type.enum.ts
rename to libs/common/src/vault/enums/secure-note-type.enum.ts
diff --git a/libs/common/src/enums/uri-match-type.enum.ts b/libs/common/src/vault/enums/uri-match-type.enum.ts
similarity index 100%
rename from libs/common/src/enums/uri-match-type.enum.ts
rename to libs/common/src/vault/enums/uri-match-type.enum.ts
diff --git a/libs/common/src/misc/linkedFieldOption.decorator.ts b/libs/common/src/vault/linked-field-option.decorator.ts
similarity index 90%
rename from libs/common/src/misc/linkedFieldOption.decorator.ts
rename to libs/common/src/vault/linked-field-option.decorator.ts
index 061aebedfd3..86a4b6f2749 100644
--- a/libs/common/src/misc/linkedFieldOption.decorator.ts
+++ b/libs/common/src/vault/linked-field-option.decorator.ts
@@ -1,5 +1,5 @@
-import { LinkedIdType } from "../enums";
-import { ItemView } from "../vault/models/view/item.view";
+import { LinkedIdType } from "./enums";
+import { ItemView } from "./models/view/item.view";
 
 export class LinkedMetadata {
   constructor(readonly propertyKey: string, private readonly _i18nKey?: string) {}
diff --git a/libs/common/src/models/api/card.api.ts b/libs/common/src/vault/models/api/card.api.ts
similarity index 89%
rename from libs/common/src/models/api/card.api.ts
rename to libs/common/src/vault/models/api/card.api.ts
index d687357f751..da68d000ddc 100644
--- a/libs/common/src/models/api/card.api.ts
+++ b/libs/common/src/vault/models/api/card.api.ts
@@ -1,4 +1,4 @@
-import { BaseResponse } from "../response/base.response";
+import { BaseResponse } from "../../../models/response/base.response";
 
 export class CardApi extends BaseResponse {
   cardholderName: string;
diff --git a/libs/common/src/vault/api/fido2-credential.api.ts b/libs/common/src/vault/models/api/fido2-credential.api.ts
similarity index 94%
rename from libs/common/src/vault/api/fido2-credential.api.ts
rename to libs/common/src/vault/models/api/fido2-credential.api.ts
index 4a836d4d83c..0ceaa7fce89 100644
--- a/libs/common/src/vault/api/fido2-credential.api.ts
+++ b/libs/common/src/vault/models/api/fido2-credential.api.ts
@@ -1,4 +1,4 @@
-import { BaseResponse } from "../../models/response/base.response";
+import { BaseResponse } from "../../../models/response/base.response";
 
 export class Fido2CredentialApi extends BaseResponse {
   credentialId: string;
diff --git a/libs/common/src/models/api/field.api.ts b/libs/common/src/vault/models/api/field.api.ts
similarity index 87%
rename from libs/common/src/models/api/field.api.ts
rename to libs/common/src/vault/models/api/field.api.ts
index 5df51cdb8b7..b319d138009 100644
--- a/libs/common/src/models/api/field.api.ts
+++ b/libs/common/src/vault/models/api/field.api.ts
@@ -1,5 +1,5 @@
+import { BaseResponse } from "../../../models/response/base.response";
 import { FieldType, LinkedIdType } from "../../enums";
-import { BaseResponse } from "../response/base.response";
 
 export class FieldApi extends BaseResponse {
   name: string;
diff --git a/libs/common/src/models/api/identity.api.ts b/libs/common/src/vault/models/api/identity.api.ts
similarity index 95%
rename from libs/common/src/models/api/identity.api.ts
rename to libs/common/src/vault/models/api/identity.api.ts
index 3fb61b2b3c7..795bf83b2bb 100644
--- a/libs/common/src/models/api/identity.api.ts
+++ b/libs/common/src/vault/models/api/identity.api.ts
@@ -1,4 +1,4 @@
-import { BaseResponse } from "../response/base.response";
+import { BaseResponse } from "../../../models/response/base.response";
 
 export class IdentityApi extends BaseResponse {
   title: string;
diff --git a/libs/common/src/models/api/login-uri.api.ts b/libs/common/src/vault/models/api/login-uri.api.ts
similarity index 84%
rename from libs/common/src/models/api/login-uri.api.ts
rename to libs/common/src/vault/models/api/login-uri.api.ts
index 9b6a1306e67..f4e18bebd87 100644
--- a/libs/common/src/models/api/login-uri.api.ts
+++ b/libs/common/src/vault/models/api/login-uri.api.ts
@@ -1,5 +1,5 @@
+import { BaseResponse } from "../../../models/response/base.response";
 import { UriMatchType } from "../../enums";
-import { BaseResponse } from "../response/base.response";
 
 export class LoginUriApi extends BaseResponse {
   uri: string;
diff --git a/libs/common/src/models/api/login.api.ts b/libs/common/src/vault/models/api/login.api.ts
similarity index 89%
rename from libs/common/src/models/api/login.api.ts
rename to libs/common/src/vault/models/api/login.api.ts
index 934d2e99b5b..e9d677d150f 100644
--- a/libs/common/src/models/api/login.api.ts
+++ b/libs/common/src/vault/models/api/login.api.ts
@@ -1,8 +1,8 @@
 import { JsonObject } from "type-fest";
 
-import { Fido2CredentialApi } from "../../vault/api/fido2-credential.api";
-import { BaseResponse } from "../response/base.response";
+import { BaseResponse } from "../../../models/response/base.response";
 
+import { Fido2CredentialApi } from "./fido2-credential.api";
 import { LoginUriApi } from "./login-uri.api";
 
 export class LoginApi extends BaseResponse {
diff --git a/libs/common/src/models/api/secure-note.api.ts b/libs/common/src/vault/models/api/secure-note.api.ts
similarity index 79%
rename from libs/common/src/models/api/secure-note.api.ts
rename to libs/common/src/vault/models/api/secure-note.api.ts
index 619ce277cb2..6d7826b5fa7 100644
--- a/libs/common/src/models/api/secure-note.api.ts
+++ b/libs/common/src/vault/models/api/secure-note.api.ts
@@ -1,5 +1,5 @@
+import { BaseResponse } from "../../../models/response/base.response";
 import { SecureNoteType } from "../../enums";
-import { BaseResponse } from "../response/base.response";
 
 export class SecureNoteApi extends BaseResponse {
   type: SecureNoteType;
diff --git a/libs/common/src/vault/models/data/card.data.ts b/libs/common/src/vault/models/data/card.data.ts
index c142266f6d5..fe80003a8f5 100644
--- a/libs/common/src/vault/models/data/card.data.ts
+++ b/libs/common/src/vault/models/data/card.data.ts
@@ -1,4 +1,4 @@
-import { CardApi } from "../../../models/api/card.api";
+import { CardApi } from "../api/card.api";
 
 export class CardData {
   cardholderName: string;
diff --git a/libs/common/src/vault/models/data/fido2-credential.data.ts b/libs/common/src/vault/models/data/fido2-credential.data.ts
index 0ba13682b92..230def35f21 100644
--- a/libs/common/src/vault/models/data/fido2-credential.data.ts
+++ b/libs/common/src/vault/models/data/fido2-credential.data.ts
@@ -1,4 +1,4 @@
-import { Fido2CredentialApi } from "../../api/fido2-credential.api";
+import { Fido2CredentialApi } from "../api/fido2-credential.api";
 
 export class Fido2CredentialData {
   credentialId: string;
diff --git a/libs/common/src/vault/models/data/field.data.ts b/libs/common/src/vault/models/data/field.data.ts
index 5b2ec28fca2..0733b6c0f05 100644
--- a/libs/common/src/vault/models/data/field.data.ts
+++ b/libs/common/src/vault/models/data/field.data.ts
@@ -1,5 +1,5 @@
-import { FieldType, LinkedIdType } from "../../../enums";
-import { FieldApi } from "../../../models/api/field.api";
+import { FieldType, LinkedIdType } from "../../enums";
+import { FieldApi } from "../api/field.api";
 
 export class FieldData {
   type: FieldType;
diff --git a/libs/common/src/vault/models/data/identity.data.ts b/libs/common/src/vault/models/data/identity.data.ts
index 9f71f9bc2bd..620ec2ec433 100644
--- a/libs/common/src/vault/models/data/identity.data.ts
+++ b/libs/common/src/vault/models/data/identity.data.ts
@@ -1,4 +1,4 @@
-import { IdentityApi } from "../../../models/api/identity.api";
+import { IdentityApi } from "../api/identity.api";
 
 export class IdentityData {
   title: string;
diff --git a/libs/common/src/vault/models/data/login-uri.data.ts b/libs/common/src/vault/models/data/login-uri.data.ts
index ebe1d948ba0..344e6c377b2 100644
--- a/libs/common/src/vault/models/data/login-uri.data.ts
+++ b/libs/common/src/vault/models/data/login-uri.data.ts
@@ -1,5 +1,5 @@
-import { UriMatchType } from "../../../enums";
-import { LoginUriApi } from "../../../models/api/login-uri.api";
+import { UriMatchType } from "../../enums";
+import { LoginUriApi } from "../api/login-uri.api";
 
 export class LoginUriData {
   uri: string;
diff --git a/libs/common/src/vault/models/data/login.data.ts b/libs/common/src/vault/models/data/login.data.ts
index 0d8c71e77b4..766718fa884 100644
--- a/libs/common/src/vault/models/data/login.data.ts
+++ b/libs/common/src/vault/models/data/login.data.ts
@@ -1,4 +1,4 @@
-import { LoginApi } from "../../../models/api/login.api";
+import { LoginApi } from "../api/login.api";
 
 import { Fido2CredentialData } from "./fido2-credential.data";
 import { LoginUriData } from "./login-uri.data";
diff --git a/libs/common/src/vault/models/data/secure-note.data.ts b/libs/common/src/vault/models/data/secure-note.data.ts
index 09139974787..f156eec2974 100644
--- a/libs/common/src/vault/models/data/secure-note.data.ts
+++ b/libs/common/src/vault/models/data/secure-note.data.ts
@@ -1,5 +1,5 @@
-import { SecureNoteType } from "../../../enums";
-import { SecureNoteApi } from "../../../models/api/secure-note.api";
+import { SecureNoteType } from "../../enums";
+import { SecureNoteApi } from "../api/secure-note.api";
 
 export class SecureNoteData {
   type: SecureNoteType;
diff --git a/libs/common/src/vault/models/domain/cipher.spec.ts b/libs/common/src/vault/models/domain/cipher.spec.ts
index 1707c1dca76..79f3fd22bcd 100644
--- a/libs/common/src/vault/models/domain/cipher.spec.ts
+++ b/libs/common/src/vault/models/domain/cipher.spec.ts
@@ -2,13 +2,13 @@ import { mock } from "jest-mock-extended";
 import { Jsonify } from "type-fest";
 
 import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec/utils";
-import { FieldType, SecureNoteType, UriMatchType } from "../../../enums";
 import { CryptoService } from "../../../platform/abstractions/crypto.service";
 import { EncryptService } from "../../../platform/abstractions/encrypt.service";
 import { EncString } from "../../../platform/models/domain/enc-string";
 import { ContainerService } from "../../../platform/services/container.service";
 import { InitializerKey } from "../../../platform/services/cryptography/initializer-key";
 import { CipherService } from "../../abstractions/cipher.service";
+import { FieldType, SecureNoteType, UriMatchType } from "../../enums";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
 import { CipherType } from "../../enums/cipher-type";
 import { CipherData } from "../../models/data/cipher.data";
diff --git a/libs/common/src/vault/models/domain/fido2-credential.spec.ts b/libs/common/src/vault/models/domain/fido2-credential.spec.ts
index 9705862460e..e2cddcea3f3 100644
--- a/libs/common/src/vault/models/domain/fido2-credential.spec.ts
+++ b/libs/common/src/vault/models/domain/fido2-credential.spec.ts
@@ -1,5 +1,5 @@
 import { mockEnc } from "../../../../spec";
-import { EncryptionType } from "../../../enums";
+import { EncryptionType } from "../../../platform/enums";
 import { EncString } from "../../../platform/models/domain/enc-string";
 import { Fido2CredentialData } from "../data/fido2-credential.data";
 
diff --git a/libs/common/src/vault/models/domain/field.spec.ts b/libs/common/src/vault/models/domain/field.spec.ts
index 8aa77b78a51..7dc5556e6cf 100644
--- a/libs/common/src/vault/models/domain/field.spec.ts
+++ b/libs/common/src/vault/models/domain/field.spec.ts
@@ -1,6 +1,6 @@
 import { mockEnc, mockFromJson } from "../../../../spec";
-import { FieldType } from "../../../enums";
 import { EncryptedString, EncString } from "../../../platform/models/domain/enc-string";
+import { FieldType } from "../../enums";
 import { FieldData } from "../../models/data/field.data";
 import { Field } from "../../models/domain/field";
 
diff --git a/libs/common/src/vault/models/domain/field.ts b/libs/common/src/vault/models/domain/field.ts
index 388f9f806c4..ffc5b8cb415 100644
--- a/libs/common/src/vault/models/domain/field.ts
+++ b/libs/common/src/vault/models/domain/field.ts
@@ -1,9 +1,9 @@
 import { Jsonify } from "type-fest";
 
-import { FieldType, LinkedIdType } from "../../../enums";
 import Domain from "../../../platform/models/domain/domain-base";
 import { EncString } from "../../../platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { FieldType, LinkedIdType } from "../../enums";
 import { FieldData } from "../data/field.data";
 import { FieldView } from "../view/field.view";
 
diff --git a/libs/common/src/vault/models/domain/login-uri.spec.ts b/libs/common/src/vault/models/domain/login-uri.spec.ts
index 7649739267d..8f0657e37e2 100644
--- a/libs/common/src/vault/models/domain/login-uri.spec.ts
+++ b/libs/common/src/vault/models/domain/login-uri.spec.ts
@@ -1,8 +1,8 @@
 import { Jsonify } from "type-fest";
 
 import { mockEnc, mockFromJson } from "../../../../spec";
-import { UriMatchType } from "../../../enums";
 import { EncString } from "../../../platform/models/domain/enc-string";
+import { UriMatchType } from "../../enums";
 import { LoginUriData } from "../data/login-uri.data";
 
 import { LoginUri } from "./login-uri";
diff --git a/libs/common/src/vault/models/domain/login-uri.ts b/libs/common/src/vault/models/domain/login-uri.ts
index 5b599467588..6bdd50c3d47 100644
--- a/libs/common/src/vault/models/domain/login-uri.ts
+++ b/libs/common/src/vault/models/domain/login-uri.ts
@@ -1,9 +1,9 @@
 import { Jsonify } from "type-fest";
 
-import { UriMatchType } from "../../../enums";
 import Domain from "../../../platform/models/domain/domain-base";
 import { EncString } from "../../../platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { UriMatchType } from "../../enums";
 import { LoginUriData } from "../data/login-uri.data";
 import { LoginUriView } from "../view/login-uri.view";
 
diff --git a/libs/common/src/vault/models/domain/login.spec.ts b/libs/common/src/vault/models/domain/login.spec.ts
index b4b5065272a..9c9e005cedf 100644
--- a/libs/common/src/vault/models/domain/login.spec.ts
+++ b/libs/common/src/vault/models/domain/login.spec.ts
@@ -1,13 +1,13 @@
 import { mock } from "jest-mock-extended";
 
 import { mockEnc, mockFromJson } from "../../../../spec";
-import { UriMatchType } from "../../../enums";
 import { EncryptedString, EncString } from "../../../platform/models/domain/enc-string";
-import { Fido2CredentialApi } from "../../api/fido2-credential.api";
+import { UriMatchType } from "../../enums";
 import { LoginData } from "../../models/data/login.data";
 import { Login } from "../../models/domain/login";
 import { LoginUri } from "../../models/domain/login-uri";
 import { LoginUriView } from "../../models/view/login-uri.view";
+import { Fido2CredentialApi } from "../api/fido2-credential.api";
 import { Fido2CredentialData } from "../data/fido2-credential.data";
 import { Fido2CredentialView } from "../view/fido2-credential.view";
 
diff --git a/libs/common/src/vault/models/domain/secure-note.spec.ts b/libs/common/src/vault/models/domain/secure-note.spec.ts
index aec3169a0c5..719cf59f136 100644
--- a/libs/common/src/vault/models/domain/secure-note.spec.ts
+++ b/libs/common/src/vault/models/domain/secure-note.spec.ts
@@ -1,4 +1,4 @@
-import { SecureNoteType } from "../../../enums";
+import { SecureNoteType } from "../../enums";
 import { SecureNoteData } from "../data/secure-note.data";
 
 import { SecureNote } from "./secure-note";
diff --git a/libs/common/src/vault/models/domain/secure-note.ts b/libs/common/src/vault/models/domain/secure-note.ts
index cc70c42abbb..7ae16f099a8 100644
--- a/libs/common/src/vault/models/domain/secure-note.ts
+++ b/libs/common/src/vault/models/domain/secure-note.ts
@@ -1,8 +1,8 @@
 import { Jsonify } from "type-fest";
 
-import { SecureNoteType } from "../../../enums";
 import Domain from "../../../platform/models/domain/domain-base";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { SecureNoteType } from "../../enums";
 import { SecureNoteData } from "../data/secure-note.data";
 import { SecureNoteView } from "../view/secure-note.view";
 
diff --git a/libs/common/src/models/domain/tree-node.ts b/libs/common/src/vault/models/domain/tree-node.ts
similarity index 100%
rename from libs/common/src/models/domain/tree-node.ts
rename to libs/common/src/vault/models/domain/tree-node.ts
diff --git a/libs/common/src/vault/models/request/cipher.request.ts b/libs/common/src/vault/models/request/cipher.request.ts
index 4fabd57d4a0..58664495b1d 100644
--- a/libs/common/src/vault/models/request/cipher.request.ts
+++ b/libs/common/src/vault/models/request/cipher.request.ts
@@ -1,12 +1,12 @@
-import { CardApi } from "../../../models/api/card.api";
-import { FieldApi } from "../../../models/api/field.api";
-import { IdentityApi } from "../../../models/api/identity.api";
-import { LoginUriApi } from "../../../models/api/login-uri.api";
-import { LoginApi } from "../../../models/api/login.api";
-import { SecureNoteApi } from "../../../models/api/secure-note.api";
-import { Fido2CredentialApi } from "../../api/fido2-credential.api";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
 import { CipherType } from "../../enums/cipher-type";
+import { CardApi } from "../api/card.api";
+import { Fido2CredentialApi } from "../api/fido2-credential.api";
+import { FieldApi } from "../api/field.api";
+import { IdentityApi } from "../api/identity.api";
+import { LoginUriApi } from "../api/login-uri.api";
+import { LoginApi } from "../api/login.api";
+import { SecureNoteApi } from "../api/secure-note.api";
 import { Cipher } from "../domain/cipher";
 
 import { AttachmentRequest } from "./attachment.request";
diff --git a/libs/common/src/vault/models/response/attachment-upload-data.response.ts b/libs/common/src/vault/models/response/attachment-upload-data.response.ts
index 732f8e4f7fc..cfbd38beaaa 100644
--- a/libs/common/src/vault/models/response/attachment-upload-data.response.ts
+++ b/libs/common/src/vault/models/response/attachment-upload-data.response.ts
@@ -1,5 +1,5 @@
-import { FileUploadType } from "../../../enums";
 import { BaseResponse } from "../../../models/response/base.response";
+import { FileUploadType } from "../../../platform/enums";
 
 import { CipherResponse } from "./cipher.response";
 
diff --git a/libs/common/src/vault/models/response/cipher.response.ts b/libs/common/src/vault/models/response/cipher.response.ts
index 8bc8a37874e..67709b602e3 100644
--- a/libs/common/src/vault/models/response/cipher.response.ts
+++ b/libs/common/src/vault/models/response/cipher.response.ts
@@ -1,10 +1,10 @@
-import { CardApi } from "../../../models/api/card.api";
-import { FieldApi } from "../../../models/api/field.api";
-import { IdentityApi } from "../../../models/api/identity.api";
-import { LoginApi } from "../../../models/api/login.api";
-import { SecureNoteApi } from "../../../models/api/secure-note.api";
 import { BaseResponse } from "../../../models/response/base.response";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
+import { CardApi } from "../api/card.api";
+import { FieldApi } from "../api/field.api";
+import { IdentityApi } from "../api/identity.api";
+import { LoginApi } from "../api/login.api";
+import { SecureNoteApi } from "../api/secure-note.api";
 
 import { AttachmentResponse } from "./attachment.response";
 import { PasswordHistoryResponse } from "./password-history.response";
diff --git a/libs/common/src/vault/models/view/card.view.ts b/libs/common/src/vault/models/view/card.view.ts
index 25c70977076..d4067cdc3d9 100644
--- a/libs/common/src/vault/models/view/card.view.ts
+++ b/libs/common/src/vault/models/view/card.view.ts
@@ -1,7 +1,7 @@
 import { Jsonify } from "type-fest";
 
-import { CardLinkedId as LinkedId } from "../../../enums";
-import { linkedFieldOption } from "../../../misc/linkedFieldOption.decorator";
+import { CardLinkedId as LinkedId } from "../../enums";
+import { linkedFieldOption } from "../../linked-field-option.decorator";
 
 import { ItemView } from "./item.view";
 
diff --git a/libs/common/src/vault/models/view/cipher.view.ts b/libs/common/src/vault/models/view/cipher.view.ts
index de3a1a62bf3..a56817418bc 100644
--- a/libs/common/src/vault/models/view/cipher.view.ts
+++ b/libs/common/src/vault/models/view/cipher.view.ts
@@ -1,9 +1,9 @@
 import { Jsonify } from "type-fest";
 
-import { LinkedIdType } from "../../../enums";
 import { View } from "../../../models/view/view";
 import { InitializerMetadata } from "../../../platform/interfaces/initializer-metadata.interface";
 import { InitializerKey } from "../../../platform/services/cryptography/initializer-key";
+import { LinkedIdType } from "../../enums";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
 import { CipherType } from "../../enums/cipher-type";
 import { LocalData } from "../data/local.data";
diff --git a/libs/common/src/vault/models/view/collection.view.ts b/libs/common/src/vault/models/view/collection.view.ts
index 48cacb7b556..17894d566cd 100644
--- a/libs/common/src/vault/models/view/collection.view.ts
+++ b/libs/common/src/vault/models/view/collection.view.ts
@@ -1,7 +1,7 @@
 import { Organization } from "../../../admin-console/models/domain/organization";
-import { ITreeNodeObject } from "../../../models/domain/tree-node";
 import { View } from "../../../models/view/view";
 import { Collection } from "../domain/collection";
+import { ITreeNodeObject } from "../domain/tree-node";
 import { CollectionAccessDetailsResponse } from "../response/collection.response";
 
 export const NestingDelimiter = "/";
diff --git a/libs/common/src/vault/models/view/field.view.ts b/libs/common/src/vault/models/view/field.view.ts
index 29c6c3ad4ed..1428b20b7fb 100644
--- a/libs/common/src/vault/models/view/field.view.ts
+++ b/libs/common/src/vault/models/view/field.view.ts
@@ -1,7 +1,7 @@
 import { Jsonify } from "type-fest";
 
-import { FieldType, LinkedIdType } from "../../../enums";
 import { View } from "../../../models/view/view";
+import { FieldType, LinkedIdType } from "../../enums";
 import { Field } from "../domain/field";
 
 export class FieldView implements View {
diff --git a/libs/common/src/vault/models/view/folder.view.ts b/libs/common/src/vault/models/view/folder.view.ts
index b3a11f9a43f..7e5c51bc307 100644
--- a/libs/common/src/vault/models/view/folder.view.ts
+++ b/libs/common/src/vault/models/view/folder.view.ts
@@ -1,8 +1,8 @@
 import { Jsonify } from "type-fest";
 
-import { ITreeNodeObject } from "../../../models/domain/tree-node";
 import { View } from "../../../models/view/view";
 import { Folder } from "../domain/folder";
+import { ITreeNodeObject } from "../domain/tree-node";
 
 export class FolderView implements View, ITreeNodeObject {
   id: string = null;
diff --git a/libs/common/src/vault/models/view/identity.view.ts b/libs/common/src/vault/models/view/identity.view.ts
index 9d14a554f76..21e6324abbc 100644
--- a/libs/common/src/vault/models/view/identity.view.ts
+++ b/libs/common/src/vault/models/view/identity.view.ts
@@ -1,8 +1,8 @@
 import { Jsonify } from "type-fest";
 
-import { IdentityLinkedId as LinkedId } from "../../../enums";
-import { linkedFieldOption } from "../../../misc/linkedFieldOption.decorator";
 import { Utils } from "../../../platform/misc/utils";
+import { IdentityLinkedId as LinkedId } from "../../enums";
+import { linkedFieldOption } from "../../linked-field-option.decorator";
 
 import { ItemView } from "./item.view";
 
diff --git a/libs/common/src/vault/models/view/item.view.ts b/libs/common/src/vault/models/view/item.view.ts
index 948982dbdc8..70e4afccc78 100644
--- a/libs/common/src/vault/models/view/item.view.ts
+++ b/libs/common/src/vault/models/view/item.view.ts
@@ -1,5 +1,5 @@
-import { LinkedMetadata } from "../../../misc/linkedFieldOption.decorator";
 import { View } from "../../../models/view/view";
+import { LinkedMetadata } from "../../linked-field-option.decorator";
 
 export abstract class ItemView implements View {
   linkedFieldOptions: Map<number, LinkedMetadata>;
diff --git a/libs/common/src/vault/models/view/login-uri-view.spec.ts b/libs/common/src/vault/models/view/login-uri-view.spec.ts
index b4a5e7288a4..92db1a6cc41 100644
--- a/libs/common/src/vault/models/view/login-uri-view.spec.ts
+++ b/libs/common/src/vault/models/view/login-uri-view.spec.ts
@@ -1,5 +1,5 @@
-import { UriMatchType } from "../../../enums";
 import { Utils } from "../../../platform/misc/utils";
+import { UriMatchType } from "../../enums";
 
 import { LoginUriView } from "./login-uri.view";
 
diff --git a/libs/common/src/vault/models/view/login-uri.view.ts b/libs/common/src/vault/models/view/login-uri.view.ts
index 7bd650f2f2d..467db76169d 100644
--- a/libs/common/src/vault/models/view/login-uri.view.ts
+++ b/libs/common/src/vault/models/view/login-uri.view.ts
@@ -1,9 +1,9 @@
 import { Jsonify } from "type-fest";
 
-import { UriMatchType } from "../../../enums";
 import { View } from "../../../models/view/view";
 import { SafeUrls } from "../../../platform/misc/safe-urls";
 import { Utils } from "../../../platform/misc/utils";
+import { UriMatchType } from "../../enums";
 import { LoginUri } from "../domain/login-uri";
 
 export class LoginUriView implements View {
diff --git a/libs/common/src/vault/models/view/login.view.ts b/libs/common/src/vault/models/view/login.view.ts
index fa05189ba0c..aec3d39d264 100644
--- a/libs/common/src/vault/models/view/login.view.ts
+++ b/libs/common/src/vault/models/view/login.view.ts
@@ -1,8 +1,8 @@
 import { Jsonify } from "type-fest";
 
-import { LoginLinkedId as LinkedId, UriMatchType } from "../../../enums";
-import { linkedFieldOption } from "../../../misc/linkedFieldOption.decorator";
 import { Utils } from "../../../platform/misc/utils";
+import { LoginLinkedId as LinkedId, UriMatchType } from "../../enums";
+import { linkedFieldOption } from "../../linked-field-option.decorator";
 import { Login } from "../domain/login";
 
 import { Fido2CredentialView } from "./fido2-credential.view";
diff --git a/libs/common/src/vault/models/view/secure-note.view.ts b/libs/common/src/vault/models/view/secure-note.view.ts
index a182d1c0503..6267280b463 100644
--- a/libs/common/src/vault/models/view/secure-note.view.ts
+++ b/libs/common/src/vault/models/view/secure-note.view.ts
@@ -1,6 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { SecureNoteType } from "../../../enums";
+import { SecureNoteType } from "../../enums";
 import { SecureNote } from "../domain/secure-note";
 
 import { ItemView } from "./item.view";
diff --git a/libs/common/src/misc/serviceUtils.spec.ts b/libs/common/src/vault/service-utils.spec.ts
similarity index 95%
rename from libs/common/src/misc/serviceUtils.spec.ts
rename to libs/common/src/vault/service-utils.spec.ts
index 7cfa318f8c3..1760ef40454 100644
--- a/libs/common/src/misc/serviceUtils.spec.ts
+++ b/libs/common/src/vault/service-utils.spec.ts
@@ -1,6 +1,5 @@
-import { ITreeNodeObject, TreeNode } from "../models/domain/tree-node";
-
-import { ServiceUtils } from "./serviceUtils";
+import { ITreeNodeObject, TreeNode } from "./models/domain/tree-node";
+import { ServiceUtils } from "./service-utils";
 
 type FakeObject = { id: string; name: string };
 
diff --git a/libs/common/src/misc/serviceUtils.ts b/libs/common/src/vault/service-utils.ts
similarity index 98%
rename from libs/common/src/misc/serviceUtils.ts
rename to libs/common/src/vault/service-utils.ts
index 7fe07f7253c..52029f1b9b0 100644
--- a/libs/common/src/misc/serviceUtils.ts
+++ b/libs/common/src/vault/service-utils.ts
@@ -1,4 +1,4 @@
-import { ITreeNodeObject, TreeNode } from "../models/domain/tree-node";
+import { ITreeNodeObject, TreeNode } from "./models/domain/tree-node";
 
 export class ServiceUtils {
   /**
diff --git a/libs/common/src/vault/services/cipher.service.spec.ts b/libs/common/src/vault/services/cipher.service.spec.ts
index 755397ebfb0..b68b81c6cfe 100644
--- a/libs/common/src/vault/services/cipher.service.spec.ts
+++ b/libs/common/src/vault/services/cipher.service.spec.ts
@@ -5,7 +5,6 @@ import { makeStaticByteArray } from "../../../spec/utils";
 import { ApiService } from "../../abstractions/api.service";
 import { SearchService } from "../../abstractions/search.service";
 import { SettingsService } from "../../abstractions/settings.service";
-import { UriMatchType, FieldType } from "../../enums";
 import { ConfigServiceAbstraction } from "../../platform/abstractions/config/config.service.abstraction";
 import { CryptoService } from "../../platform/abstractions/crypto.service";
 import { EncryptService } from "../../platform/abstractions/encrypt.service";
@@ -20,6 +19,7 @@ import {
 } from "../../platform/models/domain/symmetric-crypto-key";
 import { ContainerService } from "../../platform/services/container.service";
 import { CipherFileUploadService } from "../abstractions/file-upload/cipher-file-upload.service";
+import { UriMatchType, FieldType } from "../enums";
 import { CipherRepromptType } from "../enums/cipher-reprompt-type";
 import { CipherType } from "../enums/cipher-type";
 import { CipherData } from "../models/data/cipher.data";
diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts
index d800d699824..382fb81deca 100644
--- a/libs/common/src/vault/services/cipher.service.ts
+++ b/libs/common/src/vault/services/cipher.service.ts
@@ -4,7 +4,6 @@ import { SemVer } from "semver";
 import { ApiService } from "../../abstractions/api.service";
 import { SearchService } from "../../abstractions/search.service";
 import { SettingsService } from "../../abstractions/settings.service";
-import { FieldType, UriMatchType } from "../../enums";
 import { ErrorResponse } from "../../models/response/error.response";
 import { View } from "../../models/view/view";
 import { ConfigServiceAbstraction } from "../../platform/abstractions/config/config.service.abstraction";
@@ -25,6 +24,7 @@ import {
 } from "../../platform/models/domain/symmetric-crypto-key";
 import { CipherService as CipherServiceAbstraction } from "../abstractions/cipher.service";
 import { CipherFileUploadService } from "../abstractions/file-upload/cipher-file-upload.service";
+import { FieldType, UriMatchType } from "../enums";
 import { CipherType } from "../enums/cipher-type";
 import { CipherData } from "../models/data/cipher.data";
 import { Attachment } from "../models/domain/attachment";
diff --git a/libs/common/src/vault/services/collection.service.ts b/libs/common/src/vault/services/collection.service.ts
index 277d40cc88d..db6df79521e 100644
--- a/libs/common/src/vault/services/collection.service.ts
+++ b/libs/common/src/vault/services/collection.service.ts
@@ -1,5 +1,3 @@
-import { ServiceUtils } from "../../misc/serviceUtils";
-import { TreeNode } from "../../models/domain/tree-node";
 import { CryptoService } from "../../platform/abstractions/crypto.service";
 import { I18nService } from "../../platform/abstractions/i18n.service";
 import { StateService } from "../../platform/abstractions/state.service";
@@ -7,7 +5,9 @@ import { Utils } from "../../platform/misc/utils";
 import { CollectionService as CollectionServiceAbstraction } from "../../vault/abstractions/collection.service";
 import { CollectionData } from "../models/data/collection.data";
 import { Collection } from "../models/domain/collection";
+import { TreeNode } from "../models/domain/tree-node";
 import { CollectionView } from "../models/view/collection.view";
+import { ServiceUtils } from "../service-utils";
 
 const NestingDelimiter = "/";
 
diff --git a/libs/common/src/services/totp.service.ts b/libs/common/src/vault/services/totp.service.ts
similarity index 95%
rename from libs/common/src/services/totp.service.ts
rename to libs/common/src/vault/services/totp.service.ts
index 7896a8c4516..33bce068d2a 100644
--- a/libs/common/src/services/totp.service.ts
+++ b/libs/common/src/vault/services/totp.service.ts
@@ -1,7 +1,7 @@
+import { CryptoFunctionService } from "../../platform/abstractions/crypto-function.service";
+import { LogService } from "../../platform/abstractions/log.service";
+import { Utils } from "../../platform/misc/utils";
 import { TotpService as TotpServiceAbstraction } from "../abstractions/totp.service";
-import { CryptoFunctionService } from "../platform/abstractions/crypto-function.service";
-import { LogService } from "../platform/abstractions/log.service";
-import { Utils } from "../platform/misc/utils";
 
 const B32Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
 const SteamChars = "23456789BCDFGHJKMNPQRTVWXY";
diff --git a/libs/exporter/src/vault-export/services/vault-export.service.spec.ts b/libs/exporter/src/vault-export/services/vault-export.service.spec.ts
index 366ea53bdb1..bb6423f7239 100644
--- a/libs/exporter/src/vault-export/services/vault-export.service.spec.ts
+++ b/libs/exporter/src/vault-export/services/vault-export.service.spec.ts
@@ -2,16 +2,16 @@ import { mock, MockProxy } from "jest-mock-extended";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config";
-import { KdfType, DEFAULT_PBKDF2_ITERATIONS } from "@bitwarden/common/enums";
 import { CipherWithIdExport } from "@bitwarden/common/models/export/cipher-with-ids.export";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
+import { KdfType, DEFAULT_PBKDF2_ITERATIONS } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncryptedString, EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { StateService } from "@bitwarden/common/platform/services/state.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 { CipherType } from "@bitwarden/common/vault/enums";
 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";
diff --git a/libs/exporter/src/vault-export/services/vault-export.service.ts b/libs/exporter/src/vault-export/services/vault-export.service.ts
index c214646d9aa..12ac883d301 100644
--- a/libs/exporter/src/vault-export/services/vault-export.service.ts
+++ b/libs/exporter/src/vault-export/services/vault-export.service.ts
@@ -2,7 +2,6 @@ import * as papa from "papaparse";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config";
-import { KdfType } from "@bitwarden/common/enums";
 import {
   CipherWithIdExport,
   CollectionWithIdExport,
@@ -11,10 +10,11 @@ import {
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { KdfType } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 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 { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data";
 import { CollectionData } from "@bitwarden/common/vault/models/data/collection.data";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
diff --git a/libs/importer/spec/base-importer.spec.ts b/libs/importer/spec/base-importer.spec.ts
index db98872142c..0332fa14c5f 100644
--- a/libs/importer/spec/base-importer.spec.ts
+++ b/libs/importer/spec/base-importer.spec.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
diff --git a/libs/importer/spec/bitwarden-password-protected-importer.spec.ts b/libs/importer/spec/bitwarden-password-protected-importer.spec.ts
index 5d24cef4140..e7dc3d86ffa 100644
--- a/libs/importer/spec/bitwarden-password-protected-importer.spec.ts
+++ b/libs/importer/spec/bitwarden-password-protected-importer.spec.ts
@@ -1,8 +1,8 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
-import { KdfType } from "@bitwarden/common/enums";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { KdfType } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 
diff --git a/libs/importer/spec/dashlane-csv-importer.spec.ts b/libs/importer/spec/dashlane-csv-importer.spec.ts
index bd957eaa87b..e76a4d4cb3b 100644
--- a/libs/importer/spec/dashlane-csv-importer.spec.ts
+++ b/libs/importer/spec/dashlane-csv-importer.spec.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 
 import { DashlaneCsvImporter } from "../src/importers";
 
diff --git a/libs/importer/spec/enpass-json-importer.spec.ts b/libs/importer/spec/enpass-json-importer.spec.ts
index 0c45746de06..bf653225da9 100644
--- a/libs/importer/spec/enpass-json-importer.spec.ts
+++ b/libs/importer/spec/enpass-json-importer.spec.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
 import { EnpassJsonImporter } from "../src/importers";
diff --git a/libs/importer/spec/lastpass-csv-importer.spec.ts b/libs/importer/spec/lastpass-csv-importer.spec.ts
index e2f9b141401..de43c4aa473 100644
--- a/libs/importer/spec/lastpass-csv-importer.spec.ts
+++ b/libs/importer/spec/lastpass-csv-importer.spec.ts
@@ -1,5 +1,4 @@
-import { FieldType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
diff --git a/libs/importer/spec/myki-csv-importer.spec.ts b/libs/importer/spec/myki-csv-importer.spec.ts
index 5d4b909935d..68d4e9b2bd7 100644
--- a/libs/importer/spec/myki-csv-importer.spec.ts
+++ b/libs/importer/spec/myki-csv-importer.spec.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import { MykiCsvImporter } from "../src/importers";
diff --git a/libs/importer/spec/nordpass-csv-importer.spec.ts b/libs/importer/spec/nordpass-csv-importer.spec.ts
index b4e2ca457cd..d79c001c436 100644
--- a/libs/importer/spec/nordpass-csv-importer.spec.ts
+++ b/libs/importer/spec/nordpass-csv-importer.spec.ts
@@ -1,5 +1,4 @@
-import { SecureNoteType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
 
diff --git a/libs/importer/spec/onepassword-1pif-importer.spec.ts b/libs/importer/spec/onepassword-1pif-importer.spec.ts
index f71e6e3df96..fbf79ec8e0b 100644
--- a/libs/importer/spec/onepassword-1pif-importer.spec.ts
+++ b/libs/importer/spec/onepassword-1pif-importer.spec.ts
@@ -1,4 +1,4 @@
-import { FieldType } from "@bitwarden/common/enums";
+import { FieldType } from "@bitwarden/common/vault/enums";
 
 import { OnePassword1PifImporter } from "../src/importers";
 
diff --git a/libs/importer/spec/onepassword-1pux-importer.spec.ts b/libs/importer/spec/onepassword-1pux-importer.spec.ts
index a703f4aaa95..4ae22db6a2d 100644
--- a/libs/importer/spec/onepassword-1pux-importer.spec.ts
+++ b/libs/importer/spec/onepassword-1pux-importer.spec.ts
@@ -1,6 +1,5 @@
-import { FieldType, SecureNoteType } from "@bitwarden/common/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
 import { OnePassword1PuxImporter } from "../src/importers";
diff --git a/libs/importer/spec/onepassword-mac-csv-importer.spec.ts b/libs/importer/spec/onepassword-mac-csv-importer.spec.ts
index a865f1892f0..23daba70dc1 100644
--- a/libs/importer/spec/onepassword-mac-csv-importer.spec.ts
+++ b/libs/importer/spec/onepassword-mac-csv-importer.spec.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import { OnePasswordMacCsvImporter } from "../src/importers";
diff --git a/libs/importer/spec/onepassword-win-csv-importer.spec.ts b/libs/importer/spec/onepassword-win-csv-importer.spec.ts
index 8d4b2b7d8b8..0da6099470e 100644
--- a/libs/importer/spec/onepassword-win-csv-importer.spec.ts
+++ b/libs/importer/spec/onepassword-win-csv-importer.spec.ts
@@ -1,5 +1,4 @@
-import { FieldType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
diff --git a/libs/importer/spec/protonpass-json-importer.spec.ts b/libs/importer/spec/protonpass-json-importer.spec.ts
index b8d57b9be7b..c6f8fb48383 100644
--- a/libs/importer/spec/protonpass-json-importer.spec.ts
+++ b/libs/importer/spec/protonpass-json-importer.spec.ts
@@ -1,9 +1,8 @@
 import { MockProxy } from "jest-mock-extended";
 
-import { FieldType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldType, CipherType } from "@bitwarden/common/vault/enums";
 
 import { ProtonPassJsonImporter } from "../src/importers";
 
diff --git a/libs/importer/spec/psono-json-importer.spec.ts b/libs/importer/spec/psono-json-importer.spec.ts
index 41d76333529..31bea062ed7 100644
--- a/libs/importer/spec/psono-json-importer.spec.ts
+++ b/libs/importer/spec/psono-json-importer.spec.ts
@@ -1,5 +1,4 @@
-import { FieldType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldType, CipherType } from "@bitwarden/common/vault/enums";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
 import { PsonoJsonImporter } from "../src/importers";
diff --git a/libs/importer/src/components/dialog/import-success-dialog.component.ts b/libs/importer/src/components/dialog/import-success-dialog.component.ts
index 4d10002da48..7f34ea1869c 100644
--- a/libs/importer/src/components/dialog/import-success-dialog.component.ts
+++ b/libs/importer/src/components/dialog/import-success-dialog.component.ts
@@ -3,7 +3,7 @@ import { CommonModule } from "@angular/common";
 import { Component, Inject, OnInit } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { ButtonModule, DialogModule, TableDataSource, TableModule } from "@bitwarden/components";
 
 import { ImportResult } from "../../models";
diff --git a/libs/importer/src/importers/avast/avast-json-importer.ts b/libs/importer/src/importers/avast/avast-json-importer.ts
index 92d407e9455..1774f13be92 100644
--- a/libs/importer/src/importers/avast/avast-json-importer.ts
+++ b/libs/importer/src/importers/avast/avast-json-importer.ts
@@ -1,5 +1,4 @@
-import { SecureNoteType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 
 import { ImportResult } from "../../models/import-result";
diff --git a/libs/importer/src/importers/base-importer.ts b/libs/importer/src/importers/base-importer.ts
index 676fec4f333..0db20fa4b4d 100644
--- a/libs/importer/src/importers/base-importer.ts
+++ b/libs/importer/src/importers/base-importer.ts
@@ -1,10 +1,9 @@
 import * as papa from "papaparse";
 
-import { FieldType, SecureNoteType } from "@bitwarden/common/enums";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
diff --git a/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts b/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts
index 9024f5fff63..1792448dfee 100644
--- a/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts
+++ b/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts
@@ -1,6 +1,5 @@
-import { FieldType, SecureNoteType } from "@bitwarden/common/enums";
+import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 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 { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
diff --git a/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts
index 49288e9dd8c..7759f5ffce3 100644
--- a/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts
+++ b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts
@@ -1,7 +1,7 @@
 import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config";
-import { KdfType } from "@bitwarden/common/enums";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { KdfType } from "@bitwarden/common/platform/enums";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
diff --git a/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts b/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts
index 45aff447e30..888aeb823e8 100644
--- a/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts
+++ b/libs/importer/src/importers/dashlane/dashlane-csv-importer.ts
@@ -1,5 +1,4 @@
-import { SecureNoteType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
diff --git a/libs/importer/src/importers/dashlane/dashlane-json-importer.ts b/libs/importer/src/importers/dashlane/dashlane-json-importer.ts
index 2cfb29f21ad..d4d40a56701 100644
--- a/libs/importer/src/importers/dashlane/dashlane-json-importer.ts
+++ b/libs/importer/src/importers/dashlane/dashlane-json-importer.ts
@@ -1,5 +1,4 @@
-import { SecureNoteType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
diff --git a/libs/importer/src/importers/encryptr-csv-importer.ts b/libs/importer/src/importers/encryptr-csv-importer.ts
index a925ad24395..759639d98a4 100644
--- a/libs/importer/src/importers/encryptr-csv-importer.ts
+++ b/libs/importer/src/importers/encryptr-csv-importer.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 
 import { ImportResult } from "../models/import-result";
diff --git a/libs/importer/src/importers/enpass/enpass-csv-importer.ts b/libs/importer/src/importers/enpass/enpass-csv-importer.ts
index 546dd33b222..55a56c5a701 100644
--- a/libs/importer/src/importers/enpass/enpass-csv-importer.ts
+++ b/libs/importer/src/importers/enpass/enpass-csv-importer.ts
@@ -1,5 +1,4 @@
-import { SecureNoteType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view";
 
diff --git a/libs/importer/src/importers/enpass/enpass-json-importer.ts b/libs/importer/src/importers/enpass/enpass-json-importer.ts
index 76306721e54..733926b3b1a 100644
--- a/libs/importer/src/importers/enpass/enpass-json-importer.ts
+++ b/libs/importer/src/importers/enpass/enpass-json-importer.ts
@@ -1,5 +1,4 @@
-import { FieldType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldType, CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
diff --git a/libs/importer/src/importers/fsecure/fsecure-fsk-importer.spec.ts b/libs/importer/src/importers/fsecure/fsecure-fsk-importer.spec.ts
index ff191134306..8381842c516 100644
--- a/libs/importer/src/importers/fsecure/fsecure-fsk-importer.spec.ts
+++ b/libs/importer/src/importers/fsecure/fsecure-fsk-importer.spec.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 
 import { FSecureFskImporter as Importer } from "./fsecure-fsk-importer";
 import { CreditCardTestEntry, LoginTestEntry } from "./fsk-test-data";
diff --git a/libs/importer/src/importers/fsecure/fsecure-fsk-importer.ts b/libs/importer/src/importers/fsecure/fsecure-fsk-importer.ts
index db431a64561..c29605a9205 100644
--- a/libs/importer/src/importers/fsecure/fsecure-fsk-importer.ts
+++ b/libs/importer/src/importers/fsecure/fsecure-fsk-importer.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
diff --git a/libs/importer/src/importers/keepass2-xml-importer.ts b/libs/importer/src/importers/keepass2-xml-importer.ts
index 15f379acbb9..306c946ca44 100644
--- a/libs/importer/src/importers/keepass2-xml-importer.ts
+++ b/libs/importer/src/importers/keepass2-xml-importer.ts
@@ -1,4 +1,4 @@
-import { FieldType } from "@bitwarden/common/enums";
+import { FieldType } from "@bitwarden/common/vault/enums";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
 import { ImportResult } from "../models/import-result";
diff --git a/libs/importer/src/importers/lastpass-csv-importer.ts b/libs/importer/src/importers/lastpass-csv-importer.ts
index 464b1d3429d..737baab78f4 100644
--- a/libs/importer/src/importers/lastpass-csv-importer.ts
+++ b/libs/importer/src/importers/lastpass-csv-importer.ts
@@ -1,5 +1,4 @@
-import { SecureNoteType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
diff --git a/libs/importer/src/importers/msecure-csv-importer.ts b/libs/importer/src/importers/msecure-csv-importer.ts
index 1ed5ff76e4a..788dfd1d4e2 100644
--- a/libs/importer/src/importers/msecure-csv-importer.ts
+++ b/libs/importer/src/importers/msecure-csv-importer.ts
@@ -1,5 +1,4 @@
-import { SecureNoteType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view";
 
 import { ImportResult } from "../models/import-result";
diff --git a/libs/importer/src/importers/myki-csv-importer.ts b/libs/importer/src/importers/myki-csv-importer.ts
index c75a409376d..0ad1349acf0 100644
--- a/libs/importer/src/importers/myki-csv-importer.ts
+++ b/libs/importer/src/importers/myki-csv-importer.ts
@@ -1,5 +1,4 @@
-import { SecureNoteType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
diff --git a/libs/importer/src/importers/nordpass-csv-importer.ts b/libs/importer/src/importers/nordpass-csv-importer.ts
index d17a9fbfdd5..39685df3d4e 100644
--- a/libs/importer/src/importers/nordpass-csv-importer.ts
+++ b/libs/importer/src/importers/nordpass-csv-importer.ts
@@ -1,5 +1,4 @@
-import { SecureNoteType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
diff --git a/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts b/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts
index a4f78d203ba..a3db3ff3851 100644
--- a/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts
+++ b/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts
@@ -1,5 +1,4 @@
-import { FieldType, SecureNoteType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
diff --git a/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts
index b8329a5d449..cf9177fcf4c 100644
--- a/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts
+++ b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts
@@ -1,6 +1,5 @@
-import { FieldType, SecureNoteType } from "@bitwarden/common/enums";
+import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
diff --git a/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts b/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts
index 3f920a7d4f1..5a90bdb2175 100644
--- a/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts
+++ b/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts
@@ -1,5 +1,4 @@
-import { FieldType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldType, CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
diff --git a/libs/importer/src/importers/onepassword/onepassword-mac-csv-importer.ts b/libs/importer/src/importers/onepassword/onepassword-mac-csv-importer.ts
index 601ba77d832..3983e742b93 100644
--- a/libs/importer/src/importers/onepassword/onepassword-mac-csv-importer.ts
+++ b/libs/importer/src/importers/onepassword/onepassword-mac-csv-importer.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
diff --git a/libs/importer/src/importers/onepassword/onepassword-win-csv-importer.ts b/libs/importer/src/importers/onepassword/onepassword-win-csv-importer.ts
index f2ae98cd45d..0a7dec7d32a 100644
--- a/libs/importer/src/importers/onepassword/onepassword-win-csv-importer.ts
+++ b/libs/importer/src/importers/onepassword/onepassword-win-csv-importer.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
diff --git a/libs/importer/src/importers/passwordboss-json-importer.ts b/libs/importer/src/importers/passwordboss-json-importer.ts
index 8c426575068..169df7a9dcc 100644
--- a/libs/importer/src/importers/passwordboss-json-importer.ts
+++ b/libs/importer/src/importers/passwordboss-json-importer.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
diff --git a/libs/importer/src/importers/protonpass/protonpass-json-importer.ts b/libs/importer/src/importers/protonpass/protonpass-json-importer.ts
index c161630be5c..f1d8763a13d 100644
--- a/libs/importer/src/importers/protonpass/protonpass-json-importer.ts
+++ b/libs/importer/src/importers/protonpass/protonpass-json-importer.ts
@@ -1,6 +1,5 @@
-import { FieldType, SecureNoteType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view";
 
diff --git a/libs/importer/src/importers/psono/psono-json-importer.ts b/libs/importer/src/importers/psono/psono-json-importer.ts
index f9401b4a97b..2bd886c8e8a 100644
--- a/libs/importer/src/importers/psono/psono-json-importer.ts
+++ b/libs/importer/src/importers/psono/psono-json-importer.ts
@@ -1,5 +1,4 @@
-import { FieldType, SecureNoteType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view";
 
diff --git a/libs/importer/src/importers/remembear-csv-importer.ts b/libs/importer/src/importers/remembear-csv-importer.ts
index f23271892d4..492a94c8660 100644
--- a/libs/importer/src/importers/remembear-csv-importer.ts
+++ b/libs/importer/src/importers/remembear-csv-importer.ts
@@ -1,4 +1,4 @@
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 
 import { ImportResult } from "../models/import-result";
diff --git a/libs/importer/src/importers/safeincloud-xml-importer.ts b/libs/importer/src/importers/safeincloud-xml-importer.ts
index e83ef3c7f5f..5c5c88021f4 100644
--- a/libs/importer/src/importers/safeincloud-xml-importer.ts
+++ b/libs/importer/src/importers/safeincloud-xml-importer.ts
@@ -1,5 +1,4 @@
-import { FieldType, SecureNoteType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
diff --git a/libs/importer/src/importers/truekey-csv-importer.ts b/libs/importer/src/importers/truekey-csv-importer.ts
index 3d52be1bd85..64c4b7882f0 100644
--- a/libs/importer/src/importers/truekey-csv-importer.ts
+++ b/libs/importer/src/importers/truekey-csv-importer.ts
@@ -1,5 +1,4 @@
-import { SecureNoteType } from "@bitwarden/common/enums";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view";
 
diff --git a/libs/importer/src/services/import.service.ts b/libs/importer/src/services/import.service.ts
index 15ac802c406..25357f28639 100644
--- a/libs/importer/src/services/import.service.ts
+++ b/libs/importer/src/services/import.service.ts
@@ -8,7 +8,7 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherRequest } from "@bitwarden/common/vault/models/request/cipher.request";
 import { CollectionWithIdRequest } from "@bitwarden/common/vault/models/request/collection-with-id.request";
 import { FolderWithIdRequest } from "@bitwarden/common/vault/models/request/folder-with-id.request";
diff --git a/libs/common/src/misc/nodeUtils.ts b/libs/node/src/node-utils.ts
similarity index 100%
rename from libs/common/src/misc/nodeUtils.ts
rename to libs/node/src/node-utils.ts

From 7fef8243457ea6a1efef00f018ec2880ca5fbd41 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 22:26:51 +0100
Subject: [PATCH 11/14] [deps] Tools: Update electron-updater to v6 (#6981)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 45 +++++++++++++++++++++++++++------------------
 package.json      |  2 +-
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e2a30702a37..0031c2294ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -130,7 +130,7 @@
         "electron-log": "5.0.1",
         "electron-reload": "2.0.0-alpha.1",
         "electron-store": "8.1.0",
-        "electron-updater": "5.3.0",
+        "electron-updater": "6.1.7",
         "eslint": "8.47.0",
         "eslint-config-prettier": "8.10.0",
         "eslint-import-resolver-typescript": "3.6.0",
@@ -20318,20 +20318,19 @@
       "integrity": "sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A=="
     },
     "node_modules/electron-updater": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-5.3.0.tgz",
-      "integrity": "sha512-iKEr7yQBcvnQUPnSDYGSWC9t0eF2YbZWeYYYZzYxdl+HiRejXFENjYMnYjoOm2zxyD6Cr2JTHZhp9pqxiXuCOw==",
+      "version": "6.1.7",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.7.tgz",
+      "integrity": "sha512-SNOhYizjkm4ET+Y8ilJyUzcVsFJDtINzVN1TyHnZeMidZEG3YoBebMyXc/J6WSiXdUaOjC7ngekN6rNp6ardHA==",
       "dev": true,
       "dependencies": {
-        "@types/semver": "^7.3.6",
-        "builder-util-runtime": "9.1.1",
-        "fs-extra": "^10.0.0",
+        "builder-util-runtime": "9.2.3",
+        "fs-extra": "^10.1.0",
         "js-yaml": "^4.1.0",
         "lazy-val": "^1.0.5",
         "lodash.escaperegexp": "^4.1.2",
         "lodash.isequal": "^4.5.0",
-        "semver": "^7.3.5",
-        "typed-emitter": "^2.1.0"
+        "semver": "^7.3.8",
+        "tiny-typed-emitter": "^2.1.0"
       }
     },
     "node_modules/electron-updater/node_modules/argparse": {
@@ -20340,6 +20339,19 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
+    "node_modules/electron-updater/node_modules/builder-util-runtime": {
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "sax": "^1.2.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/electron-updater/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -37919,6 +37931,12 @@
       "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==",
       "dev": true
     },
+    "node_modules/tiny-typed-emitter": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz",
+      "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==",
+      "dev": true
+    },
     "node_modules/tldts": {
       "version": "6.0.14",
       "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.0.14.tgz",
@@ -38600,15 +38618,6 @@
       "integrity": "sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==",
       "dev": true
     },
-    "node_modules/typed-emitter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/typed-emitter/-/typed-emitter-2.1.0.tgz",
-      "integrity": "sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==",
-      "dev": true,
-      "optionalDependencies": {
-        "rxjs": "*"
-      }
-    },
     "node_modules/typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
diff --git a/package.json b/package.json
index 337a5e9c465..492e6a35570 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "electron-log": "5.0.1",
     "electron-reload": "2.0.0-alpha.1",
     "electron-store": "8.1.0",
-    "electron-updater": "5.3.0",
+    "electron-updater": "6.1.7",
     "eslint": "8.47.0",
     "eslint-config-prettier": "8.10.0",
     "eslint-import-resolver-typescript": "3.6.0",

From 92d3efbcdc1f5c790605b3059d494fb90030fac4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 22:08:33 +0000
Subject: [PATCH 12/14] [deps] Tools: Update @electron/notarize to v2 (#6983)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 11 ++++++-----
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0031c2294ee..1dcc0aa57a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -79,7 +79,7 @@
         "@angular/compiler-cli": "15.2.9",
         "@angular/elements": "15.2.9",
         "@compodoc/compodoc": "1.1.21",
-        "@electron/notarize": "1.2.4",
+        "@electron/notarize": "2.2.0",
         "@electron/rebuild": "3.2.13",
         "@ngtools/webpack": "15.2.9",
         "@storybook/addon-a11y": "7.3.0",
@@ -5332,13 +5332,14 @@
       }
     },
     "node_modules/@electron/notarize": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-1.2.4.tgz",
-      "integrity": "sha512-W5GQhJEosFNafewnS28d3bpQ37/s91CDWqxVchHfmv2dQSTWpOzNlUVQwYzC1ay5bChRV/A9BTL68yj0Pa+TSg==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.2.0.tgz",
+      "integrity": "sha512-Sf7RG47rafeGuUm+kLEbTXMN8XZeYXN70dMBstrcgiykxCq3SLl1uqxFWndxSI1LfMqv4Eq9PTDHLPwiya31Kg==",
       "dev": true,
       "dependencies": {
         "debug": "^4.1.1",
-        "fs-extra": "^9.0.1"
+        "fs-extra": "^9.0.1",
+        "promise-retry": "^2.0.1"
       },
       "engines": {
         "node": ">= 10.0.0"
diff --git a/package.json b/package.json
index 492e6a35570..9490cbede87 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/compiler-cli": "15.2.9",
     "@angular/elements": "15.2.9",
     "@compodoc/compodoc": "1.1.21",
-    "@electron/notarize": "1.2.4",
+    "@electron/notarize": "2.2.0",
     "@electron/rebuild": "3.2.13",
     "@ngtools/webpack": "15.2.9",
     "@storybook/addon-a11y": "7.3.0",

From 0489e1a4a12c6d2cf1f8f5f37377a73a923b8a56 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 23:15:01 +0100
Subject: [PATCH 13/14] [deps] Tools: Update tldts to v6.0.22 (#6990)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 apps/cli/package.json |  2 +-
 package-lock.json     | 18 +++++++++---------
 package.json          |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/cli/package.json b/apps/cli/package.json
index 5e93f08ab47..2736e1b02ce 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -71,7 +71,7 @@
     "papaparse": "5.4.1",
     "proper-lockfile": "4.1.2",
     "rxjs": "7.8.1",
-    "tldts": "6.0.14",
+    "tldts": "6.0.22",
     "zxcvbn": "4.4.2"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 1dcc0aa57a6..2769a166c4e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -65,7 +65,7 @@
         "qrious": "4.0.2",
         "rxjs": "7.8.1",
         "tabbable": "6.2.0",
-        "tldts": "6.0.14",
+        "tldts": "6.0.22",
         "utf-8-validate": "5.0.10",
         "zone.js": "0.12.0",
         "zxcvbn": "4.4.2"
@@ -222,7 +222,7 @@
         "papaparse": "5.4.1",
         "proper-lockfile": "4.1.2",
         "rxjs": "7.8.1",
-        "tldts": "6.0.14",
+        "tldts": "6.0.22",
         "zxcvbn": "4.4.2"
       },
       "bin": {
@@ -37939,20 +37939,20 @@
       "dev": true
     },
     "node_modules/tldts": {
-      "version": "6.0.14",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.0.14.tgz",
-      "integrity": "sha512-mYU7xwVGfiiC4lkWr4h3Q6U4kfAq3aWP1KsJZyRlVVeDQ3ZSBLmE20543dWSqI0U799PNzhpHObex5n60TeBGw==",
+      "version": "6.0.22",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.0.22.tgz",
+      "integrity": "sha512-dBxlzF/sbr8DBCI6To3gMUzTgoz7P8qrnZsfF+nYGkjEfcPaOUkwtJMjLzde4dN7xyjDLMIS5+uxChhYaFzRKw==",
       "dependencies": {
-        "tldts-core": "^6.0.14"
+        "tldts-core": "^6.0.22"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "6.0.14",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.0.14.tgz",
-      "integrity": "sha512-ESYhU/bgs6jiHlnl5h029f+0dB7EKRiTaxM/jHLZ6powScbmsgsrFcFjmyrjDgCvI/BRY79TEBBClmqLNEPyjQ=="
+      "version": "6.0.22",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.0.22.tgz",
+      "integrity": "sha512-5m5+f69JzLj+QP+5DVgBv0fKjAE0zJaU8kBWx6dN+Tm9cm+OHNDIVNf2dmy3WL+ujECROIPJZHNAr+74hm8ujA=="
     },
     "node_modules/tmp": {
       "version": "0.0.33",
diff --git a/package.json b/package.json
index 9490cbede87..1a22cdaacf1 100644
--- a/package.json
+++ b/package.json
@@ -198,7 +198,7 @@
     "qrious": "4.0.2",
     "rxjs": "7.8.1",
     "tabbable": "6.2.0",
-    "tldts": "6.0.14",
+    "tldts": "6.0.22",
     "utf-8-validate": "5.0.10",
     "zone.js": "0.12.0",
     "zxcvbn": "4.4.2"

From 80517233973f73388311becdd230ba7f8389c3ae Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 23:20:57 +0100
Subject: [PATCH 14/14] [deps] Tools: Update @electron/rebuild to v3.3.1
 (#6989)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2769a166c4e..fa7475aa670 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -80,7 +80,7 @@
         "@angular/elements": "15.2.9",
         "@compodoc/compodoc": "1.1.21",
         "@electron/notarize": "2.2.0",
-        "@electron/rebuild": "3.2.13",
+        "@electron/rebuild": "3.3.1",
         "@ngtools/webpack": "15.2.9",
         "@storybook/addon-a11y": "7.3.0",
         "@storybook/addon-actions": "7.3.0",
@@ -5361,9 +5361,9 @@
       }
     },
     "node_modules/@electron/rebuild": {
-      "version": "3.2.13",
-      "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.2.13.tgz",
-      "integrity": "sha512-DH9Ol4JCnHDYVOD0fKWq+Qqbn/0WU1O6QR0mIpMXEVU4YFM4PlaqNC9K36mGShNBxxGFotZCMDrB1wl/iHM12g==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.3.1.tgz",
+      "integrity": "sha512-bQDWw9rkEGYW+gzPNFCD+ugJ8LIFSu0pORJl5fmrT+H8qETOIPAe99Klzg0wGaZRu9JN+5qLzKG+PehRGOlzmQ==",
       "dev": true,
       "dependencies": {
         "@malept/cross-spawn-promise": "^2.0.0",
@@ -5372,7 +5372,7 @@
         "detect-libc": "^2.0.1",
         "fs-extra": "^10.0.0",
         "got": "^11.7.0",
-        "node-abi": "^3.0.0",
+        "node-abi": "^3.45.0",
         "node-api-version": "^0.1.4",
         "node-gyp": "^9.0.0",
         "ora": "^5.1.0",
@@ -30822,9 +30822,9 @@
       }
     },
     "node_modules/node-abi": {
-      "version": "3.40.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.40.0.tgz",
-      "integrity": "sha512-zNy02qivjjRosswoYmPi8hIKJRr8MpQyeKT6qlcq/OnOgA3Rhoae+IYOqsM9V5+JnHWmxKnWOT2GxvtqdtOCXA==",
+      "version": "3.51.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.51.0.tgz",
+      "integrity": "sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA==",
       "dev": true,
       "dependencies": {
         "semver": "^7.3.5"
diff --git a/package.json b/package.json
index 1a22cdaacf1..dc09b5029cb 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@angular/elements": "15.2.9",
     "@compodoc/compodoc": "1.1.21",
     "@electron/notarize": "2.2.0",
-    "@electron/rebuild": "3.2.13",
+    "@electron/rebuild": "3.3.1",
     "@ngtools/webpack": "15.2.9",
     "@storybook/addon-a11y": "7.3.0",
     "@storybook/addon-actions": "7.3.0",