Merge branch 'master' into PM-2135-beeep-refactor-and-refresh-web-user-verification-components

2025-12-16 16:23:44 +00:00 · 2023-06-08 11:53:28 +02:00
parent 1486b5decb 806bd8d039
commit 1554874814
1041 changed files with 16409 additions and 22771 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -52,3 +52,25 @@ libs/common/src/admin-console @bitwarden/team-admin-console-dev
 apps/web/src/app/billing @bitwarden/team-billing-dev
 libs/angular/src/billing @bitwarden/team-billing-dev
 libs/common/src/billing @bitwarden/team-billing-dev
+
+## Platform team files ##
+apps/browser/src/platform @bitwarden/team-platform-dev
+apps/cli/src/platform @bitwarden/team-platform-dev
+apps/desktop/src/platform @bitwarden/team-platform-dev
+apps/web/src/app/platform @bitwarden/team-platform-dev
+libs/angular/src/platform @bitwarden/team-platform-dev
+libs/common/src/platform @bitwarden/team-platform-dev
+# Node-specifc platform files
+libs/node @bitwarden/team-platform-dev
+# Web utils used across app and connectors
+apps/web/src/utils/ @bitwarden/team-platform-dev
+# Web core and shared files
+apps/web/src/app/core @bitwarden/team-platform-dev
+apps/web/src/app/shared @bitwarden/team-platform-dev
+apps/web/src/translation-constants.ts @bitwarden/team-platform-dev
+
+## Component Library ##
+libs/components @bitwarden/team-platform-dev
+
+## Desktop native module ##
+apps/desktop/desktop_native @bitwarden/team-platform-dev
--- a/.github/whitelist-capital-letters.txt
+++ b/.github/whitelist-capital-letters.txt
@@ -5,6 +5,7 @@
 ./apps/browser/src/services/vaultTimeout
 ./apps/browser/store/windows/Assets
 ./libs/common/src/abstractions/fileDownload
+./libs/common/src/abstractions/userVerification
 ./libs/common/src/abstractions/vaultTimeout
 ./libs/common/src/services/vaultTimeout
 ./bitwarden_license/README.md
@@ -22,8 +23,6 @@
 ./libs/angular/src/validators/inputsFieldMatch.validator.ts
 ./libs/angular/src/validators/notAllowedValueAsync.validator.ts
 ./libs/angular/src/services/theming/themeBuilder.ts
-./libs/angular/src/interfaces/selectOptions.ts
-./libs/components/src/stories/Introduction.stories.mdx
 ./libs/common/src/misc/nodeUtils.ts
 ./libs/common/src/misc/linkedFieldOption.decorator.ts
 ./libs/common/src/misc/serviceUtils.ts
@@ -37,24 +36,14 @@
 ./libs/common/src/abstractions/fileDownload/fileDownload.service.ts
 ./libs/common/src/abstractions/fileDownload/fileDownloadRequest.ts
 ./libs/common/src/abstractions/formValidationErrors.service.ts
+./libs/common/src/abstractions/userVerification/userVerification.service.abstraction.ts
+./libs/common/src/abstractions/userVerification/userVerification-api.service.abstraction.ts
 ./libs/common/src/abstractions/vaultTimeout/vaultTimeoutSettings.service.ts
 ./libs/common/src/abstractions/vaultTimeout/vaultTimeout.service.ts
-./libs/common/src/abstractions/cryptoFunction.service.ts
 ./libs/common/src/abstractions/anonymousHub.service.ts
-./libs/common/src/abstractions/appId.service.ts
-./libs/common/src/services/azureFileUpload.service.ts
-./libs/common/src/services/stateMigration.service.ts
-./libs/common/src/services/consoleLog.service.ts
-./libs/common/src/services/formValidationErrors.service.ts
 ./libs/common/src/services/vaultTimeout/vaultTimeoutSettings.service.ts
 ./libs/common/src/services/vaultTimeout/vaultTimeout.service.ts
 ./libs/common/src/services/anonymousHub.service.ts
-./libs/common/src/services/appId.service.ts
-./libs/common/src/services/noopMessaging.service.ts
-./libs/common/src/services/memoryStorage.service.ts
-./libs/common/src/services/bitwardenFileUpload.service.ts
-./libs/common/src/services/webCryptoFunction.service.ts
-./libs/common/src/interfaces/IEncrypted.ts
 ./README.md
 ./LICENSE_BITWARDEN.txt
 ./CONTRIBUTING.md
@@ -91,7 +80,6 @@
 ./apps/browser/src/models/browserGroupingsComponentState.ts
 ./apps/browser/src/models/biometricErrors.ts
 ./apps/browser/src/browser/safariApp.ts
-./apps/browser/src/browser/browserApi.ts
 ./apps/browser/src/safari/desktop/ViewController.swift
 ./apps/browser/src/safari/desktop/Assets.xcassets/AppIcon.appiconset/Contents.json
 ./apps/browser/src/safari/desktop/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -102,21 +90,5 @@
 ./apps/browser/src/safari/safari/SafariWebExtensionHandler.swift
 ./apps/browser/src/safari/safari/Info.plist
 ./apps/browser/src/safari/desktop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
-./apps/browser/src/listeners/onCommandListener.ts
-./apps/browser/src/listeners/onInstallListener.ts
-./apps/browser/src/services/browserFileDownloadService.ts
-./apps/browser/src/services/localBackedSessionStorage.service.spec.ts
-./apps/browser/src/services/browserMessagingPrivateModeBackground.service.ts
-./apps/browser/src/services/browserPlatformUtils.service.spec.ts
-./apps/browser/src/services/browserMemoryStorage.service.ts
 ./apps/browser/src/services/vaultTimeout/vaultTimeout.service.ts
-./apps/browser/src/services/browserCrypto.service.ts
-./apps/browser/src/services/browserPlatformUtils.service.ts
-./apps/browser/src/services/abstractions/abstractKeyGeneration.service.ts
-./apps/browser/src/services/browserLocalStorage.service.ts
-./apps/browser/src/services/localBackedSessionStorage.service.ts
-./apps/browser/src/services/browserMessagingPrivateModePopup.service.ts
-./apps/browser/src/services/browserMessaging.service.ts
-./apps/browser/src/services/keyGeneration.service.ts
-./apps/browser/src/services/abstractChromeStorageApi.service.ts
 ./SECURITY.md
--- a/.github/workflows/brew-bump-cli.yml
+++ b/.github/workflows/brew-bump-cli.yml
@@ -23,7 +23,7 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "brew-bump-workflow-pat"
--- a/.github/workflows/brew-bump-desktop.yml
+++ b/.github/workflows/brew-bump-desktop.yml
@@ -23,7 +23,7 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "brew-bump-workflow-pat"
--- a/.github/workflows/build-browser.yml
+++ b/.github/workflows/build-browser.yml
@@ -354,7 +354,7 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "crowdin-api-token"
@@ -416,7 +416,7 @@ jobs:
      - name: Retrieve secrets
        id: retrieve-secrets
        if: failure()
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "devops-alerts-slack-webhook-url"
--- a/.github/workflows/build-cli.yml
+++ b/.github/workflows/build-cli.yml
@@ -404,7 +404,7 @@ jobs:
      - name: Retrieve secrets
        id: retrieve-secrets
        if: failure()
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "devops-alerts-slack-webhook-url"
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -277,7 +277,7 @@ jobs:
          node-gyp install $(node -v)

      - name: Install AST
-        uses: bitwarden/gh-actions/install-ast@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/install-ast@72594be690a4e7bfa87b1402b2aedc75acdbff12

      - name: Set up environmentF
        run: choco install checksum --no-progress
@@ -302,7 +302,7 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "code-signing-vault-url,
@@ -1190,7 +1190,7 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "crowdin-api-token"
@@ -1269,7 +1269,7 @@ jobs:
      - name: Retrieve secrets
        id: retrieve-secrets
        if: failure()
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "devops-alerts-slack-webhook-url"
--- a/.github/workflows/build-web.yml
+++ b/.github/workflows/build-web.yml
@@ -84,6 +84,8 @@ jobs:
            npm_command: "build:bit:poc"
          - name: "ee"
            npm_command: "build:bit:ee"
+          - name: "eudevtest"
+            npm_command: "build:bit:eudevtest"

    steps:
      - name: Checkout repo
@@ -235,7 +237,7 @@ jobs:

      - name: Retrieve github PAT secrets
        id: retrieve-secret-pat
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "github-pat-bitwarden-devops-bot-repo-scope"
@@ -243,7 +245,7 @@ jobs:
      - name: Setup DCT
        if: ${{ env.is_publish_branch == 'true' }}
        id: setup-dct
-        uses: bitwarden/gh-actions/setup-docker-trust@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/setup-docker-trust@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          azure-creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
          azure-keyvault-name: "bitwarden-ci"
@@ -291,7 +293,7 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "crowdin-api-token"
@@ -352,7 +354,7 @@ jobs:
      - name: Retrieve secrets
        id: retrieve-secrets
        if: failure()
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "devops-alerts-slack-webhook-url"
--- a/.github/workflows/chromatic.yml
+++ b/.github/workflows/chromatic.yml
@@ -31,12 +31,17 @@ jobs:

      - name: Install Node dependencies
        run: npm ci
+      
+      # Manual build the storybook to resolve a chromatic/storybook bug related to TurboSnap
+      - name: Build Storybook
+        run: npm run build-storybook:ci

      - name: Publish to Chromatic
-        uses: chromaui/action@a89b674adf766dbde41ad9ea2b2b60b91188a0f0
+        uses: chromaui/action@a2ed440e22f7d4e2c6b0710f7903aa2df70a1ecd
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
+          storybookBuildDir: ./storybook-static
          exitOnceUploaded: true
          onlyChanged: true
          externals: "[\"libs/components/**/*.scss\", \"libs/components/tailwind.config*.js\"]"
--- a/.github/workflows/crowdin-pull.yml
+++ b/.github/workflows/crowdin-pull.yml
@@ -32,13 +32,13 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase"

      - name: Download translations
-        uses: bitwarden/gh-actions/crowdin@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/crowdin@72594be690a4e7bfa87b1402b2aedc75acdbff12
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
--- a/.github/workflows/deploy-non-prod-web.yml
+++ b/.github/workflows/deploy-non-prod-web.yml
@@ -13,6 +13,7 @@ on:
        options:
          - QA
          - POC2
+          - eudevtest


 jobs:
@@ -63,7 +64,7 @@ jobs:
        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2

      - name: Download latest cloud asset
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-web.yml
          path: apps/web
--- a/.github/workflows/release-browser.yml
+++ b/.github/workflows/release-browser.yml
@@ -41,7 +41,7 @@ jobs:

      - name: Check Release Version
        id: version
-        uses: bitwarden/gh-actions/release-version-check@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/release-version-check@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          release-type: ${{ github.event.inputs.release_type }}
          project-type: ts
@@ -103,7 +103,7 @@ jobs:

      - name: Download latest Release build artifacts
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-browser.yml
          workflow_conclusion: success
@@ -116,7 +116,7 @@ jobs:

      - name: Dry Run - Download latest master build artifacts
        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-browser.yml
          workflow_conclusion: success
--- a/.github/workflows/release-cli.yml
+++ b/.github/workflows/release-cli.yml
@@ -57,7 +57,7 @@ jobs:

      - name: Check Release Version
        id: version
-        uses: bitwarden/gh-actions/release-version-check@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/release-version-check@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          release-type: ${{ github.event.inputs.release_type }}
          project-type: ts
@@ -78,7 +78,7 @@ jobs:

      - name: Download all Release artifacts
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-cli.yml
          path: apps/cli
@@ -87,7 +87,7 @@ jobs:

      - name: Dry Run - Download all artifacts
        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-cli.yml
          path: apps/cli
@@ -150,7 +150,7 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "snapcraft-store-token"
@@ -162,7 +162,7 @@ jobs:

      - name: Download artifacts
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-cli.yml
          path: apps/cli
@@ -172,7 +172,7 @@ jobs:

      - name: Dry Run - Download artifacts
        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-cli.yml
          path: apps/cli
@@ -204,7 +204,7 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "cli-choco-api-key"
@@ -220,7 +220,7 @@ jobs:

      - name: Download artifacts
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-cli.yml
          path: apps/cli/dist
@@ -230,7 +230,7 @@ jobs:

      - name: Dry Run - Download artifacts
        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-cli.yml
          path: apps/cli/dist
@@ -263,14 +263,14 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "npm-api-key"

      - name: Download artifacts
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-cli.yml
          path: apps/cli/build
@@ -280,7 +280,7 @@ jobs:

      - name: Dry Run - Download artifacts
        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-cli.yml
          path: apps/cli/build
--- a/.github/workflows/release-desktop-beta.yml
+++ b/.github/workflows/release-desktop-beta.yml
@@ -47,7 +47,7 @@ jobs:

      - name: Check Release Version
        id: version
-        uses: bitwarden/gh-actions/release-version-check@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/release-version-check@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          release-type: 'Initial Release'
          project-type: ts
@@ -231,7 +231,7 @@ jobs:
          node-gyp install $(node -v)

      - name: Install AST
-        uses: bitwarden/gh-actions/install-ast@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/install-ast@72594be690a4e7bfa87b1402b2aedc75acdbff12

      - name: Set up environment
        run: choco install checksum --no-progress
@@ -249,7 +249,7 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "code-signing-vault-url,
@@ -932,7 +932,7 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "aws-electron-access-id,
--- a/.github/workflows/release-desktop.yml
+++ b/.github/workflows/release-desktop.yml
@@ -67,7 +67,7 @@ jobs:

      - name: Check Release Version
        id: version
-        uses: bitwarden/gh-actions/release-version-check@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/release-version-check@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          release-type: ${{ github.event.inputs.release_type }}
          project-type: ts
@@ -110,7 +110,7 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "aws-electron-access-id,
@@ -123,7 +123,7 @@ jobs:

      - name: Download all artifacts
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-desktop.yml
          workflow_conclusion: success
@@ -132,7 +132,7 @@ jobs:

      - name: Dry Run - Download all artifacts
        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-desktop.yml
          workflow_conclusion: success
@@ -185,14 +185,14 @@ jobs:
          --endpoint-url https://${CF_ACCOUNT}.r2.cloudflarestorage.com

      - name: Get checksum files
-        uses: bitwarden/gh-actions/get-checksum@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-checksum@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          packages_dir: "apps/desktop/artifacts"
          file_path: "apps/desktop/artifacts/sha256-checksums.txt"

      - name: Create Release
        uses: ncipollo/release-action@a2e71bdd4e7dab70ca26a852f29600c98b33153e # v1.12.0
-        if: ${{ steps.release-channel.outputs.channel == 'latest' && github.event.inputs.release_type != 'Dry Run' && github.event.inputs.github_release }}
+        if: ${{ steps.release-channel.outputs.channel == 'latest' && github.event.inputs.release_type != 'Dry Run' && inputs.github_release }}
        env:
          PKG_VERSION: ${{ steps.version.outputs.version }}
          RELEASE_CHANNEL: ${{ steps.release-channel.outputs.channel }}
@@ -263,15 +263,15 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "snapcraft-store-token"

      - name: Install Snap
        uses: samuelmeuli/action-snapcraft@d33c176a9b784876d966f80fb1b461808edc0641 # v2.1.1
-        with:
-          snapcraft_token: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }}
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }}

      - name: Setup
        run: mkdir dist
@@ -279,7 +279,7 @@ jobs:

      - name: Download Snap artifact
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-desktop.yml
          workflow_conclusion: success
@@ -289,7 +289,7 @@ jobs:

      - name: Dry Run - Download Snap artifact
        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-desktop.yml
          workflow_conclusion: success
@@ -299,9 +299,11 @@ jobs:

      - name: Deploy to Snap Store
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }}
        run: |
-          snapcraft upload bitwarden_${{ env._PKG_VERSION }}_amd64.snap --release stable
-          snapcraft logout
+          /snap/bin/snapcraft upload bitwarden_${{ env._PKG_VERSION }}_amd64.snap --release stable
+          /snap/bin/snapcraft logout
        working-directory: apps/desktop/dist

  choco:
@@ -327,7 +329,7 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "cli-choco-api-key"
@@ -345,7 +347,7 @@ jobs:

      - name: Download choco artifact
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-desktop.yml
          workflow_conclusion: success
@@ -355,7 +357,7 @@ jobs:

      - name: Dry Run - Download choco artifact
        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-desktop.yml
          workflow_conclusion: success
--- a/.github/workflows/release-qa-web.yml
+++ b/.github/workflows/release-qa-web.yml
@@ -23,7 +23,7 @@ jobs:
        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2

      - name: Download latest cloud asset
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-web.yml
          path: apps/web
--- a/.github/workflows/release-web.yml
+++ b/.github/workflows/release-web.yml
@@ -38,7 +38,7 @@ jobs:

      - name: Check Release Version
        id: version
-        uses: bitwarden/gh-actions/release-version-check@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/release-version-check@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          release-type: ${{ github.event.inputs.release_type }}
          project-type: ts
@@ -70,7 +70,7 @@ jobs:
      ########## DockerHub ##########
      - name: Setup DCT
        id: setup-dct
-        uses: bitwarden/gh-actions/setup-docker-trust@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/setup-docker-trust@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          azure-creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
          azure-keyvault-name: "bitwarden-ci"
@@ -156,7 +156,7 @@ jobs:

      - name: Retrieve bot secrets
        id: retrieve-bot-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: bitwarden-ci
          secrets: "github-pat-bitwarden-devops-bot-repo-scope"
@@ -170,7 +170,7 @@ jobs:

      - name: Download latest cloud asset
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-web.yml
          path: assets
@@ -180,7 +180,7 @@ jobs:

      - name: Dry Run - Download latest cloud asset
        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-web.yml
          path: assets
@@ -253,7 +253,7 @@ jobs:

      - name: Download latest build artifacts
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-web.yml
          path: apps/web/artifacts
@@ -264,7 +264,7 @@ jobs:

      - name: Dry Run - Download latest build artifacts
        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          workflow: build-web.yml
          path: apps/web/artifacts
--- a/.github/workflows/staged-rollout-desktop.yml
+++ b/.github/workflows/staged-rollout-desktop.yml
@@ -26,7 +26,7 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "aws-electron-access-id,
--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -49,7 +49,7 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          keyvault: "bitwarden-ci"
          secrets: "github-gpg-private-key, github-gpg-private-key-passphrase"
@@ -86,14 +86,14 @@ jobs:

      - name: Bump Browser Version - Manifest
        if: ${{ github.event.inputs.client == 'Browser' || github.event.inputs.client == 'All' }}
-        uses: bitwarden/gh-actions/version-bump@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/version-bump@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "apps/browser/src/manifest.json"

      - name: Bump Browser Version - Manifest v3
        if: ${{ github.event.inputs.client == 'Browser' || github.event.inputs.client == 'All' }}
-        uses: bitwarden/gh-actions/version-bump@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+        uses: bitwarden/gh-actions/version-bump@72594be690a4e7bfa87b1402b2aedc75acdbff12
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "apps/browser/src/manifest.v3.json"
--- a/.github/workflows/workflow-linter.yml
+++ b/.github/workflows/workflow-linter.yml
@@ -8,4 +8,4 @@ on:

 jobs:
  call-workflow:
-    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b
+    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@72594be690a4e7bfa87b1402b2aedc75acdbff12
--- a/.storybook/main.js
+++ b/.storybook/main.js
@@ -1,33 +0,0 @@
-const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
-
-module.exports = {
-  stories: [
-    "../libs/components/src/**/*.stories.mdx",
-    "../libs/components/src/**/*.stories.@(js|jsx|ts|tsx)",
-    "../apps/web/src/**/*.stories.mdx",
-    "../apps/web/src/**/*.stories.@(js|jsx|ts|tsx)",
-    "../bitwarden_license/bit-web/src/**/*.stories.mdx",
-    "../bitwarden_license/bit-web/src/**/*.stories.@(js|jsx|ts|tsx)",
-  ],
-  addons: [
-    "@storybook/addon-links",
-    "@storybook/addon-essentials",
-    "@storybook/addon-a11y",
-    "storybook-addon-designs",
-  ],
-  framework: "@storybook/angular",
-  core: {
-    builder: "webpack5",
-    disableTelemetry: true,
-  },
-  env: (config) => ({
-    ...config,
-    FLAGS: JSON.stringify({
-      secretsManager: true,
-    }),
-  }),
-  webpackFinal: async (config, { configType }) => {
-    config.resolve.plugins = [new TsconfigPathsPlugin()];
-    return config;
-  },
-};
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -0,0 +1,53 @@
+import { StorybookConfig } from "@storybook/angular";
+import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";
+import remarkGfm from "remark-gfm";
+
+const config: StorybookConfig = {
+  stories: [
+    "../libs/components/src/**/*.mdx",
+    "../libs/components/src/**/*.stories.@(js|jsx|ts|tsx)",
+    "../apps/web/src/**/*.mdx",
+    "../apps/web/src/**/*.stories.@(js|jsx|ts|tsx)",
+    "../bitwarden_license/bit-web/src/**/*.mdx",
+    "../bitwarden_license/bit-web/src/**/*.stories.@(js|jsx|ts|tsx)",
+  ],
+  addons: [
+    "@storybook/addon-links",
+    "@storybook/addon-essentials",
+    "@storybook/addon-a11y",
+    {
+      name: "@storybook/addon-docs",
+      options: {
+        mdxPluginOptions: {
+          mdxCompileOptions: {
+            remarkPlugins: [remarkGfm],
+          },
+        },
+      },
+    },
+  ],
+  framework: {
+    name: "@storybook/angular",
+    options: {},
+  },
+  core: {
+    disableTelemetry: true,
+  },
+  env: (config) => ({
+    ...config,
+    FLAGS: JSON.stringify({
+      secretsManager: true,
+    }),
+  }),
+  webpackFinal: async (config, { configType }) => {
+    if (config.resolve) {
+      config.resolve.plugins = [new TsconfigPathsPlugin()] as any;
+    }
+    return config;
+  },
+  docs: {
+    autodocs: true,
+  },
+};
+
+export default config;
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -1,38 +0,0 @@
-import { setCompodocJson } from "@storybook/addon-docs/angular";
-import { componentWrapperDecorator, addDecorator } from "@storybook/angular";
-
-import docJson from "../documentation.json";
-setCompodocJson(docJson);
-
-export const parameters = {
-  actions: { argTypesRegex: "^on[A-Z].*" },
-  controls: {
-    matchers: {
-      color: /(background|color)$/i,
-      date: /Date$/,
-    },
-  },
-  options: {
-    storySort: {
-      order: ["Documentation", ["Introduction", "Colors", "Icons"], "Component Library"],
-    },
-  },
-  docs: { inlineStories: true },
-};
-
-// ng-template is used to scope any template reference variables and isolate the previews
-const decorator = componentWrapperDecorator(
-  (story) => `
-<ng-template #lightPreview>
-  <div class="theme_light tw-px-5 tw-py-10 tw-border-2 tw-border-solid tw-border-secondary-300 tw-bg-[#ffffff]">${story}</div>
-</ng-template>
-<ng-template #darkPreview>
-  <div class="theme_dark tw-mt-5 tw-px-5 tw-py-10 tw-bg-[#1f242e]">${story}</div>
-</ng-template>
-
-<ng-container *ngTemplateOutlet="lightPreview"></ng-container>
-<ng-container *ngTemplateOutlet="darkPreview"></ng-container>
-`
-);
-
-addDecorator(decorator);
--- a/.storybook/preview.tsx
+++ b/.storybook/preview.tsx
@@ -0,0 +1,111 @@
+import { setCompodocJson } from "@storybook/addon-docs/angular";
+import { componentWrapperDecorator } from "@storybook/angular";
+import type { Preview } from "@storybook/angular";
+
+import docJson from "../documentation.json";
+setCompodocJson(docJson);
+
+const decorator = componentWrapperDecorator(
+  (story) => {
+    return `
+    <ng-template #lightPreview>
+      <div
+        class="theme_light tw-border-2 tw-border-solid tw-border-secondary-300 tw-bg-[#ffffff] tw-px-5 tw-py-10 tw-mb-5"
+        *ngIf="theme == 'both' || theme == 'light'"
+      >
+        ${story}
+      </div>
+    </ng-template>
+    <ng-template #darkPreview>
+      <div
+        class="theme_dark tw-border-2 tw-border-solid tw-bg-[#1f242e] tw-px-5 tw-py-10"
+        *ngIf="theme == 'both' || theme == 'dark'"
+      >
+        ${story}
+      </div>
+    </ng-template>
+    <ng-template #nordPreview>
+      <div
+        class="theme_nord tw-border-2 tw-border-solid tw-bg-[#434C5E] tw-px-5 tw-py-10"
+        *ngIf="theme == 'nord'">
+        ${story}
+      </div>
+    </ng-template>
+    <ng-template #solarizedPreview>
+      <div
+        class="theme_solarized tw-border-2 tw-border-solid tw-bg-[#002b36] tw-px-5 tw-py-10"
+        *ngIf="theme == 'solarized'"
+      >
+        ${story}
+      </div>
+    </ng-template>
+
+    <ng-container *ngTemplateOutlet="lightPreview"></ng-container>
+    <ng-container *ngTemplateOutlet="darkPreview"></ng-container>
+    <ng-container *ngTemplateOutlet="nordPreview"></ng-container>
+    <ng-container *ngTemplateOutlet="solarizedPreview"></ng-container>
+  `;
+  },
+  ({ globals }) => {
+    return { theme: `${globals["theme"]}` };
+  }
+);
+
+const preview: Preview = {
+  decorators: [decorator],
+  globalTypes: {
+    theme: {
+      description: "Global theme for components",
+      defaultValue: "both",
+      toolbar: {
+        title: "Theme",
+        icon: "circlehollow",
+        items: [
+          {
+            title: "Light & Dark",
+            value: "both",
+            icon: "sidebyside",
+          },
+          {
+            title: "Light",
+            value: "light",
+            icon: "sun",
+          },
+          {
+            title: "Dark",
+            value: "dark",
+            icon: "moon",
+          },
+          {
+            title: "Nord",
+            value: "nord",
+            left: "⛰",
+          },
+          {
+            title: "Solarized",
+            value: "solarized",
+            left: "☯",
+          },
+        ],
+        dynamicTitle: true,
+      },
+    },
+  },
+  parameters: {
+    actions: { argTypesRegex: "^on[A-Z].*" },
+    controls: {
+      matchers: {
+        color: /(background|color)$/i,
+        date: /Date$/,
+      },
+    },
+    options: {
+      storySort: {
+        order: ["Documentation", ["Introduction", "Colors", "Icons"], "Component Library"],
+      },
+    },
+    docs: { source: { type: "dynamic", excludeDecorators: true } },
+  },
+};
+
+export default preview;
--- a/.storybook/tsconfig.json
+++ b/.storybook/tsconfig.json
@@ -7,6 +7,7 @@
  "exclude": ["../src/test.setup.ts", "../apps/src/**/*.spec.ts", "../libs/**/*.spec.ts"],
  "files": [
    "./typings.d.ts",
+    "./preview.tsx",
    "../libs/components/src/main.ts",
    "../libs/components/src/polyfills.ts"
  ]
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-  "cSpell.words": ["Csprng", "Popout", "Reprompt", "takeuntil"]
+  "cSpell.words": ["Csprng", "decryptable", "Popout", "Reprompt", "takeuntil"]
 }
--- a/angular.json
+++ b/angular.json
@@ -135,20 +135,25 @@
            }
          },
          "defaultConfiguration": "development"
-        }
-      }
-    },
-    "storybook": {
-      "projectType": "application",
-      "root": "libs/components",
-      "sourceRoot": "libs/components/src",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+        },
+        "storybook": {
+          "builder": "@storybook/angular:start-storybook",
          "options": {
-            "tsConfig": ".storybook/tsconfig.json",
-            "styles": ["libs/components/src/styles.scss", "libs/components/src/styles.css"],
-            "scripts": []
+            "configDir": ".storybook",
+            "browserTarget": "components:build",
+            "compodoc": true,
+            "compodocArgs": ["-p", "./tsconfig.json", "-e", "json", "-d", "."],
+            "port": 6006
+          }
+        },
+        "build-storybook": {
+          "builder": "@storybook/angular:build-storybook",
+          "options": {
+            "configDir": ".storybook",
+            "browserTarget": "components:build",
+            "compodoc": true,
+            "compodocArgs": ["-e", "json", "-d", "."],
+            "outputDir": "storybook-static"
          }
        }
      }
--- a/apps/browser/package.json
+++ b/apps/browser/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@bitwarden/browser",
-  "version": "2023.4.0",
+  "version": "2023.5.0",
  "scripts": {
    "build": "webpack",
    "build:mv3": "cross-env MANIFEST_VERSION=3 webpack",
--- a/apps/browser/src/_locales/ca/messages.json
+++ b/apps/browser/src/_locales/ca/messages.json
@@ -2222,17 +2222,17 @@
    }
  },
  "region": {
-    "message": "Region"
+    "message": "Regió"
  },
  "opensInANewWindow": {
    "message": "S'obri en una finestra nova"
  },
  "eu": {
-    "message": "EU",
+    "message": "UE",
    "description": "European Union"
  },
  "us": {
-    "message": "US",
+    "message": "EUA",
    "description": "United States"
  }
 }
--- a/apps/browser/src/_locales/el/messages.json
+++ b/apps/browser/src/_locales/el/messages.json
@@ -1462,13 +1462,13 @@
    "message": "Αυτόματη συμπλήρωση αντικειμένου"
  },
  "insecurePageWarning": {
-    "message": "Warning: This is an unsecured HTTP page, and any information you submit can potentially be seen and changed by others. This Login was originally saved on a secure (HTTPS) page."
+    "message": "Προειδοποίηση: Αυτή είναι μια μη ασφαλή σελίδα HTTP και οποιαδήποτε πληροφορία υποβάλλετε μπορεί να γίνει ορατή και επεμβάσιμη από άλλους. Αυτή η σύνδεση αποθηκεύτηκε αρχικά σε μια ασφαλή (HTTPS) σελίδα."
  },
  "insecurePageWarningFillPrompt": {
    "message": "Do you still wish to fill this login?"
  },
  "autofillIframeWarning": {
-    "message": "The form is hosted by a different domain than the URI of your saved login. Choose OK to auto-fill anyway, or Cancel to stop."
+    "message": "Η φόρμα φιλοξενείται από διαφορετικό τομέα (domain) από το λινκ (uri) της αποθηκευμένης σύνδεσης σας (login). Επιλέξτε OK για αυτόματη συμπλήρωση, ή Ακύρωση για να σταματήσετε."
  },
  "autofillIframeWarningTip": {
    "message": "To prevent this warning in the future, save this URI, $HOSTNAME$, to your Bitwarden login item for this site.",
--- a/apps/browser/src/_locales/nl/messages.json
+++ b/apps/browser/src/_locales/nl/messages.json
@@ -2225,7 +2225,7 @@
    "message": "Regio"
  },
  "opensInANewWindow": {
-    "message": "Opens in a new window"
+    "message": "Opent in een nieuw venster"
  },
  "eu": {
    "message": "EU",
--- a/apps/browser/src/_locales/pl/messages.json
+++ b/apps/browser/src/_locales/pl/messages.json
@@ -1471,7 +1471,7 @@
    "message": "Formularz jest hostowany przez inną domenę niż zapisany adres URI dla tego loginu. Wybierz OK, aby i tak automatycznie wypełnić lub anuluj aby zatrzymać."
  },
  "autofillIframeWarningTip": {
-    "message": "To prevent this warning in the future, save this URI, $HOSTNAME$, to your Bitwarden login item for this site.",
+    "message": "Aby zapobiec temu ostrzeżeniu w przyszłości, zapisz ten URI, $HOSTNAME$, dla tej witryny.",
    "placeholders": {
      "hostname": {
        "content": "$1",
--- a/apps/browser/src/_locales/pt_PT/messages.json
+++ b/apps/browser/src/_locales/pt_PT/messages.json
--- a/apps/browser/src/_locales/sl/messages.json
+++ b/apps/browser/src/_locales/sl/messages.json
@@ -11,7 +11,7 @@
    "description": "Extension description"
  },
  "loginOrCreateNewAccount": {
-    "message": "Prijavite se ali ustvarite nov račun za dostop do vašega varnega trezorja."
+    "message": "Prijavite se ali ustvarite nov račun za dostop do svojega varnega trezorja."
  },
  "createAccount": {
    "message": "Ustvari račun"
@@ -38,10 +38,10 @@
    "message": "Glavno geslo"
  },
  "masterPassDesc": {
-    "message": "Glavno geslo je geslo, ki ga uporabljate za dostop do vašega trezorja. Zelo pomembno je, da ne pozabite vaše glavno geslo. Gesla ni mogoče obnoviti v primeru, če ga pozabite."
+    "message": "Glavno geslo je geslo, ki ga uporabljate za dostop do svojega trezorja. Zelo pomembno je, da ga ne pozabite. Če pozabite glavno geslo, ga ne bo mogoče obnoviti."
  },
  "masterPassHintDesc": {
-    "message": "Namig glavnega gesla vam lahko pomaga, da se spomnite vašega gesla, če ga pozabite."
+    "message": "Če pozabite glavno geslo, boste prejeli ta namig, da bi se gesla laže spomnili."
  },
  "reTypeMasterPass": {
    "message": "Ponovno vnesite glavno geslo"
@@ -678,13 +678,13 @@
    "message": "Ta datoteka z izvoženimi podatki vsebuje podatke iz vašega trezorja v nešifrirani obliki. Ne shranjujte in ne pošiljajte je po nezavarovanih kanalih, kot je elektronska pošta. Po uporabi jo takoj izbrišite."
  },
  "encExportKeyWarningDesc": {
-    "message": "Ta izvoz šifrira vaše podatke z uporabo ključa za šifriranje. Če boste kdaj zamenjali ključ za šifriranje, je potrebno, da ponovno naredite izvoz, ker ne boste mogli dešifrirati to izvoženo datoteko."
+    "message": "Ta izvoz šifrira vaše podatke z uporabo ključa za šifriranje. Če boste kdaj zamenjali ključ za šifriranje, boste morali podatke izvoziti ponovno, saj pričujočega izvoza ne boste mogli več dešifrirati."
  },
  "encExportAccountWarningDesc": {
    "message": "Ključ za šifriranje je edinstven za vsak Bitwarden račun, zato ni mogoče da se uvozi šifrirana datoteka v drugi račun."
  },
  "exportMasterPassword": {
-    "message": "Vnesite vaše glavno geslo za izvoz podatkov iz vašega trezorja."
+    "message": "Za izvoz podatkov iz trezorja vnesite svoje glavno geslo."
  },
  "shared": {
    "message": "V skupni rabi"
@@ -763,7 +763,7 @@
    "message": "Funkcija ni na voljo."
  },
  "updateKey": {
-    "message": "Ne morete koristiti to funkcijo dokler ne posodobite vaš ključ za šifriranje."
+    "message": "To funkcijo lahko uporabite šele, ko posodobite svoj šifrirni ključ."
  },
  "premiumMembership": {
    "message": "Premium članstvo"
@@ -841,7 +841,7 @@
    "message": "Premium članstvo je potrebno za uporabo te funkcije."
  },
  "enterVerificationCodeApp": {
-    "message": "Vnesite 6-mestno verifikacijsko kodo iz vaše verifikacijske aplikacije."
+    "message": "Vnesite 6-mestno verifikacijsko kodo iz svoje aplikacije za avtentikacijo."
  },
  "enterVerificationCodeEmail": {
    "message": "Vnesite 6-mestno verifikacijsko kodo, ki vam je bila poslana na $EMAIL$.",
@@ -898,7 +898,7 @@
    "message": "Možnosti dvostopenjske prijave"
  },
  "recoveryCodeDesc": {
-    "message": "Ste izgubili dostop do vseh vaših ponudnikov dvostopenjske prijave? Uporabite svojo kodo za obnovitev in tako onemogočite dvostopenjsko prijavo v svoj račun."
+    "message": "Ste izgubili dostop do vseh ponudnikov dvostopenjske prijave? Uporabite svojo kodo za obnovitev in tako onemogočite dvostopenjsko prijavo v svoj račun."
  },
  "recoveryCodeTitle": {
    "message": "Koda za obnovitev"
@@ -1050,7 +1050,7 @@
    "description": "This describes a value that is 'linked' (tied) to another value."
  },
  "popup2faCloseMessage": {
-    "message": "Če kliknete izven pojavnega okna, da preverite vašo epošto za vašo verifikacijsko kodo, bo to povročilo, da se je pojavno okno zapre. Želite odpreti to pojavno okno v novem oknu, tako, da se ne bo zaprlo?"
+    "message": "Če kliknete izven tega pojavnega okna, da bi preverili pošto, se to pojavno okno zaprlo. Želite odpreti to pojavno okno v novem oknu, da se ne bo zaprlo?"
  },
  "popupU2fCloseMessage": {
    "message": "Ta spletni brskalnik ne more obdelati U2F zahteve v tem pojavnem oknu. Želite odpreti to pojavno okno v novem oknu, tako, da se lahko prijavite z U2F?"
--- a/apps/browser/src/_locales/zh_CN/messages.json
+++ b/apps/browser/src/_locales/zh_CN/messages.json
@@ -1462,7 +1462,7 @@
    "message": "项目已自动填充 "
  },
  "insecurePageWarning": {
-    "message": "警告：这是一个不安全的 HTTP 页面，您提交的任何信息都可能被其他人看到和更改。此登录最初保存在安全 (HTTPS) 页面上。"
+    "message": "警告：这是一个不安全的 HTTP 页面，您提交的任何信息都可能被其他人看到和更改。此登录信息最初保存在安全 (HTTPS) 页面上。"
  },
  "insecurePageWarningFillPrompt": {
    "message": "您仍然想要填充此登录信息吗？"
@@ -1471,7 +1471,7 @@
    "message": "该表单由不同于您保存的登录的 URI 域名托管。选择「确定」以自动填充，或选择「取消」停止填充。"
  },
  "autofillIframeWarningTip": {
-    "message": "要防止以后再次出现此警告，请将此站点的 URI $HOSTNAME$ 保存到您的 Bitwarden 登录项目中。",
+    "message": "要防止以后出现此警告，请将此站点的 URI $HOSTNAME$ 保存到您的 Bitwarden 登录项目中。",
    "placeholders": {
      "hostname": {
        "content": "$1",
--- a/apps/browser/src/admin-console/background/service-factories/collection-service.factory.ts
+++ b/apps/browser/src/admin-console/background/service-factories/collection-service.factory.ts
@@ -4,20 +4,20 @@ import { CollectionService } from "@bitwarden/common/admin-console/services/coll
 import {
  cryptoServiceFactory,
  CryptoServiceInitOptions,
-} from "../../../background/service_factories/crypto-service.factory";
+} from "../../../platform/background/service-factories/crypto-service.factory";
 import {
  CachedServices,
  factory,
  FactoryOptions,
-} from "../../../background/service_factories/factory-options";
+} from "../../../platform/background/service-factories/factory-options";
 import {
  i18nServiceFactory,
  I18nServiceInitOptions,
-} from "../../../background/service_factories/i18n-service.factory";
+} from "../../../platform/background/service-factories/i18n-service.factory";
 import {
  stateServiceFactory as stateServiceFactory,
  StateServiceInitOptions,
-} from "../../../background/service_factories/state-service.factory";
+} from "../../../platform/background/service-factories/state-service.factory";

 type CollectionServiceFactoryOptions = FactoryOptions;

--- a/apps/browser/src/admin-console/background/service-factories/organization-service.factory.ts
+++ b/apps/browser/src/admin-console/background/service-factories/organization-service.factory.ts
@@ -4,11 +4,11 @@ import {
  FactoryOptions,
  CachedServices,
  factory,
-} from "../../../background/service_factories/factory-options";
+} from "../../../platform/background/service-factories/factory-options";
 import {
  stateServiceFactory,
  StateServiceInitOptions,
-} from "../../../background/service_factories/state-service.factory";
+} from "../../../platform/background/service-factories/state-service.factory";
 import { BrowserOrganizationService } from "../../services/browser-organization.service";

 type OrganizationServiceFactoryOptions = FactoryOptions;
--- a/apps/browser/src/admin-console/background/service-factories/policy-service.factory.ts
+++ b/apps/browser/src/admin-console/background/service-factories/policy-service.factory.ts
@@ -4,11 +4,11 @@ import {
  CachedServices,
  factory,
  FactoryOptions,
-} from "../../../background/service_factories/factory-options";
+} from "../../../platform/background/service-factories/factory-options";
 import {
  stateServiceFactory as stateServiceFactory,
  StateServiceInitOptions,
-} from "../../../background/service_factories/state-service.factory";
+} from "../../../platform/background/service-factories/state-service.factory";
 import { BrowserPolicyService } from "../../services/browser-policy.service";

 import {
--- a/apps/browser/src/admin-console/services/browser-organization.service.ts
+++ b/apps/browser/src/admin-console/services/browser-organization.service.ts
@@ -3,7 +3,7 @@ import { BehaviorSubject } from "rxjs";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { OrganizationService } from "@bitwarden/common/admin-console/services/organization/organization.service";

-import { browserSession, sessionSync } from "../../decorators/session-sync-observable";
+import { browserSession, sessionSync } from "../../platform/decorators/session-sync-observable";

@browserSession
 export class BrowserOrganizationService extends OrganizationService {
--- a/apps/browser/src/admin-console/services/browser-policy.service.ts
+++ b/apps/browser/src/admin-console/services/browser-policy.service.ts
@@ -1,13 +1,13 @@
 import { BehaviorSubject, filter, map, Observable, switchMap, tap } from "rxjs";
 import { Jsonify } from "type-fest";

-import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";

-import { browserSession, sessionSync } from "../../decorators/session-sync-observable";
+import { browserSession, sessionSync } from "../../platform/decorators/session-sync-observable";

@browserSession
 export class BrowserPolicyService extends PolicyService {
--- a/apps/browser/src/auth/background/service-factories/auth-service.factory.ts
+++ b/apps/browser/src/auth/background/service-factories/auth-service.factory.ts
@@ -5,52 +5,52 @@ import {
  policyServiceFactory,
  PolicyServiceInitOptions,
 } from "../../../admin-console/background/service-factories/policy-service.factory";
+import {
+  passwordGenerationServiceFactory,
+  PasswordGenerationServiceInitOptions,
+} from "../../../background/service-factories/password-generation-service.factory";
 import {
  apiServiceFactory,
  ApiServiceInitOptions,
-} from "../../../background/service_factories/api-service.factory";
-import { appIdServiceFactory } from "../../../background/service_factories/app-id-service.factory";
+} from "../../../platform/background/service-factories/api-service.factory";
+import { appIdServiceFactory } from "../../../platform/background/service-factories/app-id-service.factory";
 import {
-  cryptoServiceFactory,
  CryptoServiceInitOptions,
-} from "../../../background/service_factories/crypto-service.factory";
+  cryptoServiceFactory,
+} from "../../../platform/background/service-factories/crypto-service.factory";
 import {
-  encryptServiceFactory,
  EncryptServiceInitOptions,
-} from "../../../background/service_factories/encrypt-service.factory";
+  encryptServiceFactory,
+} from "../../../platform/background/service-factories/encrypt-service.factory";
 import {
  environmentServiceFactory,
  EnvironmentServiceInitOptions,
-} from "../../../background/service_factories/environment-service.factory";
+} from "../../../platform/background/service-factories/environment-service.factory";
 import {
  CachedServices,
  factory,
  FactoryOptions,
-} from "../../../background/service_factories/factory-options";
+} from "../../../platform/background/service-factories/factory-options";
 import {
  i18nServiceFactory,
  I18nServiceInitOptions,
-} from "../../../background/service_factories/i18n-service.factory";
+} from "../../../platform/background/service-factories/i18n-service.factory";
 import {
  logServiceFactory,
  LogServiceInitOptions,
-} from "../../../background/service_factories/log-service.factory";
+} from "../../../platform/background/service-factories/log-service.factory";
 import {
  messagingServiceFactory,
  MessagingServiceInitOptions,
-} from "../../../background/service_factories/messaging-service.factory";
-import {
-  passwordGenerationServiceFactory,
-  PasswordGenerationServiceInitOptions,
-} from "../../../background/service_factories/password-generation-service.factory";
+} from "../../../platform/background/service-factories/messaging-service.factory";
 import {
  platformUtilsServiceFactory,
  PlatformUtilsServiceInitOptions,
-} from "../../../background/service_factories/platform-utils-service.factory";
+} from "../../../platform/background/service-factories/platform-utils-service.factory";
 import {
  stateServiceFactory,
  StateServiceInitOptions,
-} from "../../../background/service_factories/state-service.factory";
+} from "../../../platform/background/service-factories/state-service.factory";

 import {
  keyConnectorServiceFactory,
--- a/apps/browser/src/auth/background/service-factories/key-connector-service.factory.ts
+++ b/apps/browser/src/auth/background/service-factories/key-connector-service.factory.ts
@@ -8,28 +8,28 @@ import {
 import {
  apiServiceFactory,
  ApiServiceInitOptions,
-} from "../../../background/service_factories/api-service.factory";
+} from "../../../platform/background/service-factories/api-service.factory";
 import {
-  cryptoFunctionServiceFactory,
  CryptoFunctionServiceInitOptions,
-} from "../../../background/service_factories/crypto-function-service.factory";
+  cryptoFunctionServiceFactory,
+} from "../../../platform/background/service-factories/crypto-function-service.factory";
 import {
  CryptoServiceInitOptions,
  cryptoServiceFactory,
-} from "../../../background/service_factories/crypto-service.factory";
+} from "../../../platform/background/service-factories/crypto-service.factory";
 import {
  FactoryOptions,
  CachedServices,
  factory,
-} from "../../../background/service_factories/factory-options";
+} from "../../../platform/background/service-factories/factory-options";
 import {
  logServiceFactory,
  LogServiceInitOptions,
-} from "../../../background/service_factories/log-service.factory";
+} from "../../../platform/background/service-factories/log-service.factory";
 import {
  stateServiceFactory,
  StateServiceInitOptions,
-} from "../../../background/service_factories/state-service.factory";
+} from "../../../platform/background/service-factories/state-service.factory";

 import { TokenServiceInitOptions, tokenServiceFactory } from "./token-service.factory";

--- a/apps/browser/src/auth/background/service-factories/token-service.factory.ts
+++ b/apps/browser/src/auth/background/service-factories/token-service.factory.ts
@@ -5,11 +5,11 @@ import {
  FactoryOptions,
  CachedServices,
  factory,
-} from "../../../background/service_factories/factory-options";
+} from "../../../platform/background/service-factories/factory-options";
 import {
  stateServiceFactory,
  StateServiceInitOptions,
-} from "../../../background/service_factories/state-service.factory";
+} from "../../../platform/background/service-factories/state-service.factory";

 type TokenServiceFactoryOptions = FactoryOptions;

--- a/apps/browser/src/auth/background/service-factories/totp-service.factory.ts
+++ b/apps/browser/src/auth/background/service-factories/totp-service.factory.ts
@@ -4,16 +4,16 @@ import { TotpService } from "@bitwarden/common/services/totp.service";
 import {
  CryptoFunctionServiceInitOptions,
  cryptoFunctionServiceFactory,
-} from "../../../background/service_factories/crypto-function-service.factory";
+} from "../../../platform/background/service-factories/crypto-function-service.factory";
 import {
  FactoryOptions,
  CachedServices,
  factory,
-} from "../../../background/service_factories/factory-options";
+} from "../../../platform/background/service-factories/factory-options";
 import {
  LogServiceInitOptions,
  logServiceFactory,
-} from "../../../background/service_factories/log-service.factory";
+} from "../../../platform/background/service-factories/log-service.factory";

 type TotpServiceOptions = FactoryOptions;

--- a/apps/browser/src/auth/background/service-factories/two-factor-service.factory.ts
+++ b/apps/browser/src/auth/background/service-factories/two-factor-service.factory.ts
@@ -5,15 +5,15 @@ import {
  FactoryOptions,
  CachedServices,
  factory,
-} from "../../../background/service_factories/factory-options";
+} from "../../../platform/background/service-factories/factory-options";
 import {
  I18nServiceInitOptions,
  i18nServiceFactory,
-} from "../../../background/service_factories/i18n-service.factory";
+} from "../../../platform/background/service-factories/i18n-service.factory";
 import {
  PlatformUtilsServiceInitOptions,
  platformUtilsServiceFactory,
-} from "../../../background/service_factories/platform-utils-service.factory";
+} from "../../../platform/background/service-factories/platform-utils-service.factory";

 type TwoFactorServiceFactoryOptions = FactoryOptions;

--- a/apps/browser/src/auth/popup/environment.component.ts
+++ b/apps/browser/src/auth/popup/environment.component.ts
@@ -3,10 +3,10 @@ import { Router } from "@angular/router";

 import { EnvironmentComponent as BaseEnvironmentComponent } from "@bitwarden/angular/components/environment.component";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";

-import { BrowserEnvironmentService } from "../../services/browser-environment.service";
+import { BrowserEnvironmentService } from "../../platform/services/browser-environment.service";

@Component({
  selector: "app-environment",
--- a/apps/browser/src/auth/popup/hint.component.ts
+++ b/apps/browser/src/auth/popup/hint.component.ts
@@ -3,10 +3,10 @@ import { ActivatedRoute, Router } from "@angular/router";

 import { HintComponent as BaseHintComponent } from "@bitwarden/angular/auth/components/hint.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { LoginService } from "@bitwarden/common/auth/abstractions/login.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";

@Component({
  selector: "app-hint",
--- a/apps/browser/src/auth/popup/home.component.ts
+++ b/apps/browser/src/auth/popup/home.component.ts
@@ -4,11 +4,11 @@ import { Router } from "@angular/router";
 import { Subject, takeUntil } from "rxjs";

 import { EnvironmentSelectorComponent } from "@bitwarden/angular/auth/components/environment-selector.component";
-import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { LoginService } from "@bitwarden/common/auth/abstractions/login.service";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+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";

@Component({
  selector: "app-home",
--- a/apps/browser/src/auth/popup/lock.component.ts
+++ b/apps/browser/src/auth/popup/lock.component.ts
@@ -4,13 +4,6 @@ import { Router } from "@angular/router";
 import { LockComponent as BaseLockComponent } from "@bitwarden/angular/auth/components/lock.component";
 import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
@@ -18,6 +11,13 @@ import { InternalPolicyService } from "@bitwarden/common/admin-console/abstracti
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.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 { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";

 import { BiometricErrors, BiometricErrorTypes } from "../../models/biometricErrors";
--- a/apps/browser/src/auth/popup/login-with-device.component.ts
+++ b/apps/browser/src/auth/popup/login-with-device.component.ts
@@ -4,17 +4,17 @@ import { Router } from "@angular/router";
 import { LoginWithDeviceComponent as BaseLoginWithDeviceComponent } from "@bitwarden/angular/auth/components/login-with-device.component";
 import { AnonymousHubService } from "@bitwarden/common/abstractions/anonymousHub.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
-import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
-import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { ValidationService } from "@bitwarden/common/abstractions/validation.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { LoginService } from "@bitwarden/common/auth/abstractions/login.service";
+import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+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 { 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 { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";

--- a/apps/browser/src/auth/popup/login.component.ts
+++ b/apps/browser/src/auth/popup/login.component.ts
@@ -3,22 +3,22 @@ import { FormBuilder } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";

 import { LoginComponent as BaseLoginComponent } from "@bitwarden/angular/auth/components/login.component";
-import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
-import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
 import { DevicesApiServiceAbstraction } from "@bitwarden/common/abstractions/devices/devices-api.service.abstraction";
-import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
-import { FormValidationErrorsService } from "@bitwarden/common/abstractions/formValidationErrors.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { LoginService } from "@bitwarden/common/auth/abstractions/login.service";
-import { Utils } from "@bitwarden/common/misc/utils";
+import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+import { FormValidationErrorsService } from "@bitwarden/common/platform/abstractions/form-validation-errors.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 { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";

-import { flagEnabled } from "../../flags";
+import { flagEnabled } from "../../platform/flags";

@Component({
  selector: "app-login",
--- a/apps/browser/src/auth/popup/register.component.ts
+++ b/apps/browser/src/auth/popup/register.component.ts
@@ -6,14 +6,14 @@ import { RegisterComponent as BaseRegisterComponent } from "@bitwarden/angular/c
 import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
-import { FormValidationErrorsService } from "@bitwarden/common/abstractions/formValidationErrors.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+import { FormValidationErrorsService } from "@bitwarden/common/platform/abstractions/form-validation-errors.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 { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";

@Component({
--- a/apps/browser/src/auth/popup/set-password.component.ts
+++ b/apps/browser/src/auth/popup/set-password.component.ts
@@ -4,15 +4,15 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { SetPasswordComponent as BaseSetPasswordComponent } from "@bitwarden/angular/components/set-password.component";
 import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+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 { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";

--- a/apps/browser/src/auth/popup/sso.component.ts
+++ b/apps/browser/src/auth/popup/sso.component.ts
@@ -3,19 +3,19 @@ import { ActivatedRoute, Router } from "@angular/router";

 import { SsoComponent as BaseSsoComponent } from "@bitwarden/angular/auth/components/sso.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
-import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.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 { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";

-import { BrowserApi } from "../../browser/browserApi";
+import { BrowserApi } from "../../platform/browser/browser-api";

@Component({
  selector: "app-sso",
--- a/apps/browser/src/auth/popup/two-factor-options.component.html
+++ b/apps/browser/src/auth/popup/two-factor-options.component.html
@@ -1,6 +1,6 @@
 <header>
  <div class="left">
-    <button type="button" routerLink="/2fa">{{ "close" | i18n }}</button>
+    <button type="button" (click)="close()">{{ "close" | i18n }}</button>
  </div>
  <h1 class="center">
    <span class="title">{{ "twoStepOptions" | i18n }}</span>
--- a/apps/browser/src/auth/popup/two-factor-options.component.ts
+++ b/apps/browser/src/auth/popup/two-factor-options.component.ts
@@ -1,10 +1,10 @@
 import { Component } from "@angular/core";
-import { Router } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";

 import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "@bitwarden/angular/auth/components/two-factor-options.component";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";

@Component({
  selector: "app-two-factor-options",
@@ -15,14 +15,33 @@ export class TwoFactorOptionsComponent extends BaseTwoFactorOptionsComponent {
    twoFactorService: TwoFactorService,
    router: Router,
    i18nService: I18nService,
-    platformUtilsService: PlatformUtilsService
+    platformUtilsService: PlatformUtilsService,
+    private activatedRoute: ActivatedRoute
  ) {
    super(twoFactorService, router, i18nService, platformUtilsService, window);
  }

+  close() {
+    this.navigateTo2FA();
+  }
+
  choose(p: any) {
    super.choose(p);
    this.twoFactorService.setSelectedProvider(p.type);
-    this.router.navigate(["2fa"]);
+
+    this.navigateTo2FA();
+  }
+
+  navigateTo2FA() {
+    const sso = this.activatedRoute.snapshot.queryParamMap.get("sso") === "true";
+
+    if (sso) {
+      // Persist SSO flag back to the 2FA comp if it exists
+      // in order for successful login logic to work properly for
+      // SSO + 2FA in browser extension
+      this.router.navigate(["2fa"], { queryParams: { sso: true } });
+    } else {
+      this.router.navigate(["2fa"]);
+    }
  }
 }
--- a/apps/browser/src/auth/popup/two-factor.component.ts
+++ b/apps/browser/src/auth/popup/two-factor.component.ts
@@ -5,21 +5,21 @@ import { first } from "rxjs/operators";
 import { TwoFactorComponent as BaseTwoFactorComponent } from "@bitwarden/angular/auth/components/two-factor.component";
 import { DialogServiceAbstraction, SimpleDialogType } from "@bitwarden/angular/services/dialog";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
-import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
-import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { LoginService } from "@bitwarden/common/auth/abstractions/login.service";
 import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
+import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.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 { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";

-import { BrowserApi } from "../../browser/browserApi";
+import { BrowserApi } from "../../platform/browser/browser-api";
 import { PopupUtilsService } from "../../popup/services/popup-utils.service";

 const BroadcasterSubscriptionId = "TwoFactorComponent";
@@ -118,10 +118,20 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
    this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
      if (qParams.sso === "true") {
        super.onSuccessfulLogin = () => {
-          BrowserApi.reloadOpenWindows();
-          const thisWindow = window.open("", "_self");
-          thisWindow.close();
-          return this.syncService.fullSync(true);
+          // This is not awaited so we don't pause the application while the sync is happening.
+          // This call is executed by the service that lives in the background script so it will continue
+          // the sync even if this tab closes.
+          const syncPromise = this.syncService.fullSync(true);
+
+          // Force sidebars (FF && Opera) to reload while exempting current window
+          // because we are just going to close the current window.
+          BrowserApi.reloadOpenWindows(true);
+
+          // We don't need this window anymore because the intent is for the user to be left
+          // on the web vault screen which tells them to continue in the browser extension (sidebar or popup)
+          BrowserApi.closeBitwardenExtensionTab();
+
+          return syncPromise;
        };
      }
    });
@@ -137,7 +147,15 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
  }

  anotherMethod() {
-    this.router.navigate(["2fa-options"]);
+    const sso = this.route.snapshot.queryParamMap.get("sso") === "true";
+
+    if (sso) {
+      // We must persist this so when the user returns to the 2FA comp, the
+      // proper onSuccessfulLogin logic is executed.
+      this.router.navigate(["2fa-options"], { queryParams: { sso: true } });
+    } else {
+      this.router.navigate(["2fa-options"]);
+    }
  }

  async isLinux() {
--- a/apps/browser/src/autofill/background/context-menus.background.ts
+++ b/apps/browser/src/autofill/background/context-menus.background.ts
@@ -1,5 +1,5 @@
 import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem";
-import { BrowserApi } from "../../browser/browserApi";
+import { BrowserApi } from "../../platform/browser/browser-api";
 import { ContextMenuClickedHandler } from "../browser/context-menu-clicked-handler";

 export default class ContextMenusBackground {
--- a/apps/browser/src/autofill/background/notification.background.ts
+++ b/apps/browser/src/autofill/background/notification.background.ts
@@ -5,7 +5,7 @@ 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 { Utils } from "@bitwarden/common/misc/utils";
+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";
@@ -17,8 +17,8 @@ import AddLoginRuntimeMessage from "../../background/models/addLoginRuntimeMessa
 import ChangePasswordRuntimeMessage from "../../background/models/changePasswordRuntimeMessage";
 import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem";
 import { NotificationQueueMessageType } from "../../background/models/notificationQueueMessageType";
-import { BrowserApi } from "../../browser/browserApi";
-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
+import { BrowserApi } from "../../platform/browser/browser-api";
+import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";
 import { AutofillService } from "../services/abstractions/autofill.service";

 export default class NotificationBackground {
--- a/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts
+++ b/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts
@@ -5,24 +5,24 @@ import {
 import {
  EventCollectionServiceInitOptions,
  eventCollectionServiceFactory,
-} from "../../../background/service_factories/event-collection-service.factory";
+} from "../../../background/service-factories/event-collection-service.factory";
+import {
+  settingsServiceFactory,
+  SettingsServiceInitOptions,
+} from "../../../background/service-factories/settings-service.factory";
 import {
  CachedServices,
  factory,
  FactoryOptions,
-} from "../../../background/service_factories/factory-options";
+} from "../../../platform/background/service-factories/factory-options";
 import {
  logServiceFactory,
  LogServiceInitOptions,
-} from "../../../background/service_factories/log-service.factory";
-import {
-  settingsServiceFactory,
-  SettingsServiceInitOptions,
-} from "../../../background/service_factories/settings-service.factory";
+} from "../../../platform/background/service-factories/log-service.factory";
 import {
  stateServiceFactory,
  StateServiceInitOptions,
-} from "../../../background/service_factories/state-service.factory";
+} from "../../../platform/background/service-factories/state-service.factory";
 import {
  cipherServiceFactory,
  CipherServiceInitOptions,
--- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
+++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
@@ -1,8 +1,8 @@
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-import { StateFactory } from "@bitwarden/common/factories/stateFactory";
-import { Utils } from "@bitwarden/common/misc/utils";
-import { GlobalState } from "@bitwarden/common/models/domain/global-state";
+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 { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
@@ -12,9 +12,9 @@ import {
  authServiceFactory,
  AuthServiceInitOptions,
 } from "../../auth/background/service-factories/auth-service.factory";
-import { CachedServices } from "../../background/service_factories/factory-options";
-import { BrowserApi } from "../../browser/browserApi";
 import { Account } from "../../models/account";
+import { CachedServices } from "../../platform/background/service-factories/factory-options";
+import { BrowserApi } from "../../platform/browser/browser-api";
 import {
  cipherServiceFactory,
  CipherServiceInitOptions,
--- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
+++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
@@ -3,8 +3,8 @@ import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { EventType } from "@bitwarden/common/enums";
-import { StateFactory } from "@bitwarden/common/factories/stateFactory";
-import { GlobalState } from "@bitwarden/common/models/domain/global-state";
+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 { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -15,12 +15,12 @@ import {
 } from "../../auth/background/service-factories/auth-service.factory";
 import { totpServiceFactory } from "../../auth/background/service-factories/totp-service.factory";
 import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem";
-import { eventCollectionServiceFactory } from "../../background/service_factories/event-collection-service.factory";
-import { CachedServices } from "../../background/service_factories/factory-options";
-import { passwordGenerationServiceFactory } from "../../background/service_factories/password-generation-service.factory";
-import { stateServiceFactory } from "../../background/service_factories/state-service.factory";
-import { BrowserApi } from "../../browser/browserApi";
+import { eventCollectionServiceFactory } from "../../background/service-factories/event-collection-service.factory";
+import { passwordGenerationServiceFactory } from "../../background/service-factories/password-generation-service.factory";
 import { Account } from "../../models/account";
+import { CachedServices } from "../../platform/background/service-factories/factory-options";
+import { stateServiceFactory } from "../../platform/background/service-factories/state-service.factory";
+import { BrowserApi } from "../../platform/browser/browser-api";
 import {
  cipherServiceFactory,
  CipherServiceInitOptions,
--- a/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
+++ b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
@@ -1,12 +1,12 @@
 import { mock, MockProxy } from "jest-mock-extended";

-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
+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 { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";

-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
+import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";

 import { MainContextMenuHandler } from "./main-context-menu-handler";

--- a/apps/browser/src/autofill/browser/main-context-menu-handler.ts
+++ b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
@@ -1,26 +1,26 @@
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { StateFactory } from "@bitwarden/common/factories/stateFactory";
-import { Utils } from "@bitwarden/common/misc/utils";
-import { GlobalState } from "@bitwarden/common/models/domain/global-state";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+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 { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";

-import { CachedServices } from "../../background/service_factories/factory-options";
+import { Account } from "../../models/account";
+import { CachedServices } from "../../platform/background/service-factories/factory-options";
 import {
  i18nServiceFactory,
  I18nServiceInitOptions,
-} from "../../background/service_factories/i18n-service.factory";
+} from "../../platform/background/service-factories/i18n-service.factory";
 import {
  logServiceFactory,
  LogServiceInitOptions,
-} from "../../background/service_factories/log-service.factory";
+} from "../../platform/background/service-factories/log-service.factory";
 import {
  stateServiceFactory,
  StateServiceInitOptions,
-} from "../../background/service_factories/state-service.factory";
-import { Account } from "../../models/account";
-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
+} from "../../platform/background/service-factories/state-service.factory";
+import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";

 export const ROOT_ID = "root";

--- a/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts
+++ b/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts
@@ -1,4 +1,4 @@
-import { BrowserApi } from "../../browser/browserApi";
+import { BrowserApi } from "../../platform/browser/browser-api";

 import { ClearClipboard } from "./clear-clipboard";

--- a/apps/browser/src/autofill/clipboard/clear-clipboard.ts
+++ b/apps/browser/src/autofill/clipboard/clear-clipboard.ts
@@ -1,4 +1,4 @@
-import { BrowserApi } from "../../browser/browserApi";
+import { BrowserApi } from "../../platform/browser/browser-api";

 export const clearClipboardAlarmName = "clearClipboard";

--- a/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts
+++ b/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts
@@ -1,4 +1,4 @@
-import { BrowserApi } from "../../browser/browserApi";
+import { BrowserApi } from "../../platform/browser/browser-api";

 /**
 * Copies text to the clipboard in a MV3 safe way.
--- a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts
+++ b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts
@@ -2,14 +2,14 @@ import { mock, MockProxy } from "jest-mock-extended";

 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";

-import { setAlarmTime } from "../../alarms/alarm-state";
-import { BrowserApi } from "../../browser/browserApi";
-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
+import { setAlarmTime } from "../../platform/alarms/alarm-state";
+import { BrowserApi } from "../../platform/browser/browser-api";
+import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";

 import { clearClipboardAlarmName } from "./clear-clipboard";
 import { GeneratePasswordToClipboardCommand } from "./generate-password-to-clipboard-command";

-jest.mock("../../alarms/alarm-state", () => {
+jest.mock("../../platform/alarms/alarm-state", () => {
  return {
    setAlarmTime: jest.fn(),
  };
--- a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts
+++ b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts
@@ -1,7 +1,7 @@
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";

-import { setAlarmTime } from "../../alarms/alarm-state";
-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
+import { setAlarmTime } from "../../platform/alarms/alarm-state";
+import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";

 import { clearClipboardAlarmName } from "./clear-clipboard";
 import { copyToClipboard } from "./copy-to-clipboard-command";
--- a/apps/browser/src/autofill/services/autofill.service.ts
+++ b/apps/browser/src/autofill/services/autofill.service.ts
@@ -1,16 +1,16 @@
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { SettingsService } from "@bitwarden/common/abstractions/settings.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { EventType, FieldType, UriMatchType } from "@bitwarden/common/enums";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";

-import { BrowserApi } from "../../browser/browserApi";
-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
+import { BrowserApi } from "../../platform/browser/browser-api";
+import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";
 import AutofillField from "../models/autofill-field";
 import AutofillPageDetails from "../models/autofill-page-details";
 import AutofillScript from "../models/autofill-script";
--- a/apps/browser/src/background/commands.background.ts
+++ b/apps/browser/src/background/commands.background.ts
@@ -1,10 +1,10 @@
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";

-import { BrowserApi } from "../browser/browserApi";
+import { BrowserApi } from "../platform/browser/browser-api";

 import MainBackground from "./main.background";
 import LockedVaultPendingNotificationsItem from "./models/lockedVaultPendingNotificationsItem";
--- a/apps/browser/src/background/idle.background.ts
+++ b/apps/browser/src/background/idle.background.ts
@@ -2,7 +2,7 @@ import { NotificationsService } from "@bitwarden/common/abstractions/notificatio
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum";

-import { BrowserStateService } from "../services/abstractions/browser-state.service";
+import { BrowserStateService } from "../platform/services/abstractions/browser-state.service";

 const IdleInterval = 60 * 5; // 5 minutes

--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -1,27 +1,11 @@
 import { AvatarUpdateService as AvatarUpdateServiceAbstraction } from "@bitwarden/common/abstractions/account/avatar-update.service";
 import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstractions/api.service";
-import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/abstractions/appId.service";
 import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.service";
-import { ConfigApiServiceAbstraction } from "@bitwarden/common/abstractions/config/config-api.service.abstraction";
-import { ConfigServiceAbstraction } from "@bitwarden/common/abstractions/config/config.service.abstraction";
-import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service";
-import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/abstractions/cryptoFunction.service";
-import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service";
 import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
-import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/file-upload/file-upload.service";
-import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service";
-import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service";
 import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
-import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service";
 import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service";
 import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common/abstractions/settings.service";
-import {
-  AbstractMemoryStorageService,
-  AbstractStorageService,
-} from "@bitwarden/common/abstractions/storage.service";
-import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/abstractions/system.service";
 import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/abstractions/totp.service";
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service";
@@ -45,28 +29,44 @@ 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 { StateFactory } from "@bitwarden/common/factories/stateFactory";
-import { GlobalState } from "@bitwarden/common/models/domain/global-state";
+import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { ConfigApiServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config-api.service.abstraction";
+import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
+import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto-function.service";
+import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto.service";
+import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/platform/abstractions/file-upload/file-upload.service";
+import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService as LogServiceAbstraction } from "@bitwarden/common/platform/abstractions/log.service";
+import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import {
+  AbstractMemoryStorageService,
+  AbstractStorageService,
+} from "@bitwarden/common/platform/abstractions/storage.service";
+import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/platform/abstractions/system.service";
+import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
+import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
+import { AppIdService } from "@bitwarden/common/platform/services/app-id.service";
+import { ConfigService } from "@bitwarden/common/platform/services/config/config.service";
+import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
+import { ContainerService } from "@bitwarden/common/platform/services/container.service";
+import { EncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/encrypt.service.implementation";
+import { MultithreadEncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/multithread-encrypt.service.implementation";
+import { FileUploadService } from "@bitwarden/common/platform/services/file-upload/file-upload.service";
+import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service";
+import { StateMigrationService } from "@bitwarden/common/platform/services/state-migration.service";
+import { SystemService } from "@bitwarden/common/platform/services/system.service";
+import { WebCryptoFunctionService } from "@bitwarden/common/platform/services/web-crypto-function.service";
 import { AvatarUpdateService } from "@bitwarden/common/services/account/avatar-update.service";
 import { ApiService } from "@bitwarden/common/services/api.service";
-import { AppIdService } from "@bitwarden/common/services/appId.service";
 import { AuditService } from "@bitwarden/common/services/audit.service";
-import { ConfigService } from "@bitwarden/common/services/config/config.service";
-import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service";
-import { ContainerService } from "@bitwarden/common/services/container.service";
-import { EncryptServiceImplementation } from "@bitwarden/common/services/cryptography/encrypt.service.implementation";
-import { MultithreadEncryptServiceImplementation } from "@bitwarden/common/services/cryptography/multithread-encrypt.service.implementation";
 import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
-import { FileUploadService } from "@bitwarden/common/services/file-upload/file-upload.service";
-import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 import { NotificationsService } from "@bitwarden/common/services/notifications.service";
 import { SearchService } from "@bitwarden/common/services/search.service";
-import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service";
-import { SystemService } from "@bitwarden/common/services/system.service";
 import { TotpService } from "@bitwarden/common/services/totp.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vaultTimeout/vaultTimeoutSettings.service";
-import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service";
 import {
  PasswordGenerationService,
  PasswordGenerationServiceAbstraction,
@@ -105,24 +105,24 @@ import { ContextMenuClickedHandler } from "../autofill/browser/context-menu-clic
 import { MainContextMenuHandler } from "../autofill/browser/main-context-menu-handler";
 import { AutofillService as AutofillServiceAbstraction } from "../autofill/services/abstractions/autofill.service";
 import AutofillService from "../autofill/services/autofill.service";
-import { BrowserApi } from "../browser/browserApi";
 import { SafariApp } from "../browser/safariApp";
-import { flagEnabled } from "../flags";
-import { UpdateBadge } from "../listeners/update-badge";
 import { Account } from "../models/account";
-import { BrowserStateService as StateServiceAbstraction } from "../services/abstractions/browser-state.service";
-import { BrowserEnvironmentService } from "../services/browser-environment.service";
-import { BrowserI18nService } from "../services/browser-i18n.service";
+import { BrowserApi } from "../platform/browser/browser-api";
+import { flagEnabled } from "../platform/flags";
+import { UpdateBadge } from "../platform/listeners/update-badge";
+import { BrowserStateService as StateServiceAbstraction } from "../platform/services/abstractions/browser-state.service";
+import { BrowserCryptoService } from "../platform/services/browser-crypto.service";
+import { BrowserEnvironmentService } from "../platform/services/browser-environment.service";
+import { BrowserI18nService } from "../platform/services/browser-i18n.service";
+import BrowserLocalStorageService from "../platform/services/browser-local-storage.service";
+import BrowserMessagingPrivateModeBackgroundService from "../platform/services/browser-messaging-private-mode-background.service";
+import BrowserMessagingService from "../platform/services/browser-messaging.service";
+import BrowserPlatformUtilsService from "../platform/services/browser-platform-utils.service";
+import { BrowserStateService } from "../platform/services/browser-state.service";
+import { KeyGenerationService } from "../platform/services/key-generation.service";
+import { LocalBackedSessionStorageService } from "../platform/services/local-backed-session-storage.service";
 import { BrowserSendService } from "../services/browser-send.service";
 import { BrowserSettingsService } from "../services/browser-settings.service";
-import { BrowserStateService } from "../services/browser-state.service";
-import { BrowserCryptoService } from "../services/browserCrypto.service";
-import BrowserLocalStorageService from "../services/browserLocalStorage.service";
-import BrowserMessagingService from "../services/browserMessaging.service";
-import BrowserMessagingPrivateModeBackgroundService from "../services/browserMessagingPrivateModeBackground.service";
-import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service";
-import { KeyGenerationService } from "../services/keyGeneration.service";
-import { LocalBackedSessionStorageService } from "../services/localBackedSessionStorage.service";
 import VaultTimeoutService from "../services/vaultTimeout/vaultTimeout.service";
 import { BrowserFolderService } from "../vault/services/browser-folder.service";
 import { VaultFilterService } from "../vault/services/vault-filter.service";
--- a/apps/browser/src/background/models/addLoginQueueMessage.ts
+++ b/apps/browser/src/background/models/addLoginQueueMessage.ts
@@ -1,4 +1,4 @@
-import { Utils } from "@bitwarden/common/misc/utils";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
--- a/apps/browser/src/background/nativeMessaging.background.ts
+++ b/apps/browser/src/background/nativeMessaging.background.ts
@@ -1,18 +1,18 @@
-import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
-import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-import { Utils } from "@bitwarden/common/misc/utils";
-import { EncString } from "@bitwarden/common/models/domain/enc-string";
-import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
+import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+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";
+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 { 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";

-import { BrowserApi } from "../browser/browserApi";
+import { BrowserApi } from "../platform/browser/browser-api";

 import RuntimeBackground from "./runtime.background";

--- a/apps/browser/src/background/runtime.background.ts
+++ b/apps/browser/src/background/runtime.background.ts
@@ -1,15 +1,15 @@
-import { ConfigServiceAbstraction } from "@bitwarden/common/abstractions/config/config.service.abstraction";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service";
-import { SystemService } from "@bitwarden/common/abstractions/system.service";
-import { Utils } from "@bitwarden/common/misc/utils";
+import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
+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 { SystemService } from "@bitwarden/common/platform/abstractions/system.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";

 import { AutofillService } from "../autofill/services/abstractions/autofill.service";
-import { BrowserApi } from "../browser/browserApi";
-import { BrowserEnvironmentService } from "../services/browser-environment.service";
-import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service";
+import { BrowserApi } from "../platform/browser/browser-api";
+import { BrowserEnvironmentService } from "../platform/services/browser-environment.service";
+import BrowserPlatformUtilsService from "../platform/services/browser-platform-utils.service";

 import MainBackground from "./main.background";
 import LockedVaultPendingNotificationsItem from "./models/lockedVaultPendingNotificationsItem";
--- a/apps/browser/src/background/service-factories/cipher-file-upload-service.factory.ts
+++ b/apps/browser/src/background/service-factories/cipher-file-upload-service.factory.ts
@@ -1,12 +1,19 @@
 import { CipherFileUploadService as CipherFileUploadServiceAbstraction } from "@bitwarden/common/vault/abstractions/file-upload/cipher-file-upload.service";
 import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service";

-import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory";
-import { FactoryOptions, CachedServices, factory } from "./factory-options";
 import {
-  fileUploadServiceFactory,
+  ApiServiceInitOptions,
+  apiServiceFactory,
+} from "../../platform/background/service-factories/api-service.factory";
+import {
+  FactoryOptions,
+  CachedServices,
+  factory,
+} from "../../platform/background/service-factories/factory-options";
+import {
  FileUploadServiceInitOptions,
-} from "./file-upload-service.factory";
+  fileUploadServiceFactory,
+} from "../../platform/background/service-factories/file-upload-service.factory";

 type CipherFileUploadServiceFactoyOptions = FactoryOptions;

--- a/apps/browser/src/background/service-factories/cipher-file-upload.service.factory.ts
+++ b/apps/browser/src/background/service-factories/cipher-file-upload.service.factory.ts
@@ -1,12 +1,19 @@
 import { CipherFileUploadService as CipherFileUploadServiceAbstraction } from "@bitwarden/common/vault/abstractions/file-upload/cipher-file-upload.service";
 import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service";

-import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory";
-import { FactoryOptions, CachedServices, factory } from "./factory-options";
 import {
-  fileUploadServiceFactory,
+  ApiServiceInitOptions,
+  apiServiceFactory,
+} from "../../platform/background/service-factories/api-service.factory";
+import {
+  FactoryOptions,
+  CachedServices,
+  factory,
+} from "../../platform/background/service-factories/factory-options";
+import {
  FileUploadServiceInitOptions,
-} from "./file-upload-service.factory";
+  fileUploadServiceFactory,
+} from "../../platform/background/service-factories/file-upload-service.factory";

 type CipherFileUploadServiceFactoyOptions = FactoryOptions;

--- a/apps/browser/src/background/service-factories/event-collection-service.factory.ts
+++ b/apps/browser/src/background/service-factories/event-collection-service.factory.ts
@@ -5,6 +5,15 @@ import {
  organizationServiceFactory,
  OrganizationServiceInitOptions,
 } from "../../admin-console/background/service-factories/organization-service.factory";
+import {
+  FactoryOptions,
+  CachedServices,
+  factory,
+} from "../../platform/background/service-factories/factory-options";
+import {
+  stateServiceFactory,
+  StateServiceInitOptions,
+} from "../../platform/background/service-factories/state-service.factory";
 import {
  cipherServiceFactory,
  CipherServiceInitOptions,
@@ -14,8 +23,6 @@ import {
  eventUploadServiceFactory,
  EventUploadServiceInitOptions,
 } from "./event-upload-service.factory";
-import { FactoryOptions, CachedServices, factory } from "./factory-options";
-import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";

 type EventCollectionServiceOptions = FactoryOptions;

--- a/apps/browser/src/background/service-factories/event-upload-service.factory.ts
+++ b/apps/browser/src/background/service-factories/event-upload-service.factory.ts
@@ -1,10 +1,23 @@
 import { EventUploadService as AbstractEventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";

-import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory";
-import { FactoryOptions, CachedServices, factory } from "./factory-options";
-import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory";
-import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
+import {
+  ApiServiceInitOptions,
+  apiServiceFactory,
+} from "../../platform/background/service-factories/api-service.factory";
+import {
+  FactoryOptions,
+  CachedServices,
+  factory,
+} from "../../platform/background/service-factories/factory-options";
+import {
+  logServiceFactory,
+  LogServiceInitOptions,
+} from "../../platform/background/service-factories/log-service.factory";
+import {
+  stateServiceFactory,
+  StateServiceInitOptions,
+} from "../../platform/background/service-factories/state-service.factory";

 type EventUploadServiceOptions = FactoryOptions;

--- a/apps/browser/src/background/service-factories/password-generation-service.factory.ts
+++ b/apps/browser/src/background/service-factories/password-generation-service.factory.ts
@@ -7,10 +7,19 @@ import {
  policyServiceFactory,
  PolicyServiceInitOptions,
 } from "../../admin-console/background/service-factories/policy-service.factory";
-
-import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory";
-import { CachedServices, factory, FactoryOptions } from "./factory-options";
-import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
+import {
+  CryptoServiceInitOptions,
+  cryptoServiceFactory,
+} from "../../platform/background/service-factories/crypto-service.factory";
+import {
+  CachedServices,
+  factory,
+  FactoryOptions,
+} from "../../platform/background/service-factories/factory-options";
+import {
+  stateServiceFactory,
+  StateServiceInitOptions,
+} from "../../platform/background/service-factories/state-service.factory";

 type PasswordGenerationServiceFactoryOptions = FactoryOptions;

--- a/apps/browser/src/background/service-factories/search-service.factory.ts
+++ b/apps/browser/src/background/service-factories/search-service.factory.ts
@@ -1,9 +1,19 @@
 import { SearchService as AbstractSearchService } from "@bitwarden/common/abstractions/search.service";
 import { SearchService } from "@bitwarden/common/services/search.service";

-import { CachedServices, factory, FactoryOptions } from "./factory-options";
-import { i18nServiceFactory, I18nServiceInitOptions } from "./i18n-service.factory";
-import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory";
+import {
+  CachedServices,
+  factory,
+  FactoryOptions,
+} from "../../platform/background/service-factories/factory-options";
+import {
+  i18nServiceFactory,
+  I18nServiceInitOptions,
+} from "../../platform/background/service-factories/i18n-service.factory";
+import {
+  logServiceFactory,
+  LogServiceInitOptions,
+} from "../../platform/background/service-factories/log-service.factory";

 type SearchServiceFactoryOptions = FactoryOptions;

--- a/apps/browser/src/background/service-factories/send-service.factory.ts
+++ b/apps/browser/src/background/service-factories/send-service.factory.ts
@@ -1,13 +1,25 @@
 import { InternalSendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";

+import { cryptoFunctionServiceFactory } from "../../platform/background/service-factories/crypto-function-service.factory";
+import {
+  CryptoServiceInitOptions,
+  cryptoServiceFactory,
+} from "../../platform/background/service-factories/crypto-service.factory";
+import {
+  FactoryOptions,
+  CachedServices,
+  factory,
+} from "../../platform/background/service-factories/factory-options";
+import {
+  i18nServiceFactory,
+  I18nServiceInitOptions,
+} from "../../platform/background/service-factories/i18n-service.factory";
+import {
+  stateServiceFactory,
+  StateServiceInitOptions,
+} from "../../platform/background/service-factories/state-service.factory";
 import { BrowserSendService } from "../../services/browser-send.service";

-import { cryptoFunctionServiceFactory } from "./crypto-function-service.factory";
-import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory";
-import { FactoryOptions, CachedServices, factory } from "./factory-options";
-import { i18nServiceFactory, I18nServiceInitOptions } from "./i18n-service.factory";
-import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
-
 type SendServiceFactoryOptions = FactoryOptions;

 export type SendServiceInitOptions = SendServiceFactoryOptions &
--- a/apps/browser/src/background/service-factories/settings-service.factory.ts
+++ b/apps/browser/src/background/service-factories/settings-service.factory.ts
@@ -1,10 +1,16 @@
 import { SettingsService as AbstractSettingsService } from "@bitwarden/common/abstractions/settings.service";

+import {
+  FactoryOptions,
+  CachedServices,
+  factory,
+} from "../../platform/background/service-factories/factory-options";
+import {
+  stateServiceFactory,
+  StateServiceInitOptions,
+} from "../../platform/background/service-factories/state-service.factory";
 import { BrowserSettingsService } from "../../services/browser-settings.service";

-import { FactoryOptions, CachedServices, factory } from "./factory-options";
-import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
-
 type SettingsServiceFactoryOptions = FactoryOptions;

 export type SettingsServiceInitOptions = SettingsServiceFactoryOptions & StateServiceInitOptions;
--- a/apps/browser/src/background/service-factories/vault-timeout-service.factory.ts
+++ b/apps/browser/src/background/service-factories/vault-timeout-service.factory.ts
@@ -12,6 +12,27 @@ import {
  keyConnectorServiceFactory,
  KeyConnectorServiceInitOptions,
 } from "../../auth/background/service-factories/key-connector-service.factory";
+import {
+  CryptoServiceInitOptions,
+  cryptoServiceFactory,
+} from "../../platform/background/service-factories/crypto-service.factory";
+import {
+  CachedServices,
+  factory,
+  FactoryOptions,
+} from "../../platform/background/service-factories/factory-options";
+import {
+  messagingServiceFactory,
+  MessagingServiceInitOptions,
+} from "../../platform/background/service-factories/messaging-service.factory";
+import {
+  platformUtilsServiceFactory,
+  PlatformUtilsServiceInitOptions,
+} from "../../platform/background/service-factories/platform-utils-service.factory";
+import {
+  StateServiceInitOptions,
+  stateServiceFactory,
+} from "../../platform/background/service-factories/state-service.factory";
 import VaultTimeoutService from "../../services/vaultTimeout/vaultTimeout.service";
 import {
  cipherServiceFactory,
@@ -22,18 +43,7 @@ import {
  FolderServiceInitOptions,
 } from "../../vault/background/service_factories/folder-service.factory";

-import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory";
-import { CachedServices, factory, FactoryOptions } from "./factory-options";
-import { messagingServiceFactory, MessagingServiceInitOptions } from "./messaging-service.factory";
-import {
-  platformUtilsServiceFactory,
-  PlatformUtilsServiceInitOptions,
-} from "./platform-utils-service.factory";
 import { searchServiceFactory, SearchServiceInitOptions } from "./search-service.factory";
-import {
-  stateServiceFactory as stateServiceFactory,
-  StateServiceInitOptions,
-} from "./state-service.factory";
 import {
  vaultTimeoutSettingsServiceFactory,
  VaultTimeoutSettingsServiceInitOptions,
--- a/apps/browser/src/background/service-factories/vault-timeout-settings-service.factory.ts
+++ b/apps/browser/src/background/service-factories/vault-timeout-settings-service.factory.ts
@@ -9,13 +9,19 @@ import {
  tokenServiceFactory,
  TokenServiceInitOptions,
 } from "../../auth/background/service-factories/token-service.factory";
-
-import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory";
-import { CachedServices, factory, FactoryOptions } from "./factory-options";
 import {
-  stateServiceFactory as stateServiceFactory,
+  CryptoServiceInitOptions,
+  cryptoServiceFactory,
+} from "../../platform/background/service-factories/crypto-service.factory";
+import {
+  CachedServices,
+  factory,
+  FactoryOptions,
+} from "../../platform/background/service-factories/factory-options";
+import {
  StateServiceInitOptions,
-} from "./state-service.factory";
+  stateServiceFactory,
+} from "../../platform/background/service-factories/state-service.factory";

 type VaultTimeoutSettingsServiceFactoryOptions = FactoryOptions;

--- a/apps/browser/src/background/webRequest.background.ts
+++ b/apps/browser/src/background/webRequest.background.ts
@@ -1,10 +1,10 @@
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 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 { BrowserApi } from "../browser/browserApi";
+import { BrowserApi } from "../platform/browser/browser-api";

 export default class WebRequestBackground {
  private pendingAuthRequests: any[] = [];
--- a/apps/browser/src/browser/safariApp.ts
+++ b/apps/browser/src/browser/safariApp.ts
@@ -1,4 +1,4 @@
-import { BrowserApi } from "./browserApi";
+import { BrowserApi } from "../platform/browser/browser-api";

 export class SafariApp {
  static sendMessageToApp(command: string, data: any = null, resolveNow = false): Promise<any> {
--- a/apps/browser/src/manifest.json
+++ b/apps/browser/src/manifest.json
@@ -2,7 +2,7 @@
  "manifest_version": 2,
  "name": "__MSG_extName__",
  "short_name": "__MSG_appName__",
-  "version": "2023.4.0",
+  "version": "2023.5.0",
  "description": "__MSG_extDesc__",
  "default_locale": "en",
  "author": "Bitwarden Inc.",
--- a/apps/browser/src/manifest.v3.json
+++ b/apps/browser/src/manifest.v3.json
@@ -3,7 +3,7 @@
  "minimum_chrome_version": "102.0",
  "name": "__MSG_extName__",
  "short_name": "__MSG_appName__",
-  "version": "2023.4.0",
+  "version": "2023.5.0",
  "description": "__MSG_extDesc__",
  "default_locale": "en",
  "author": "Bitwarden Inc.",
--- a/apps/browser/src/models/account.ts
+++ b/apps/browser/src/models/account.ts
@@ -3,7 +3,7 @@ import { Jsonify } from "type-fest";
 import {
  Account as BaseAccount,
  AccountSettings as BaseAccountSettings,
-} from "@bitwarden/common/models/domain/account";
+} from "@bitwarden/common/platform/models/domain/account";

 import { BrowserComponentState } from "./browserComponentState";
 import { BrowserGroupingsComponentState } from "./browserGroupingsComponentState";
--- a/apps/browser/src/models/browserGroupingsComponentState.ts
+++ b/apps/browser/src/models/browserGroupingsComponentState.ts
@@ -1,5 +1,5 @@
 import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
-import { Utils } from "@bitwarden/common/misc/utils";
+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 { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
--- a/apps/browser/src/models/browserSendComponentState.ts
+++ b/apps/browser/src/models/browserSendComponentState.ts
@@ -1,4 +1,4 @@
-import { Utils } from "@bitwarden/common/misc/utils";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { DeepJsonify } from "@bitwarden/common/types/deep-jsonify";
--- a/apps/browser/src/platform/alarms/alarm-state.ts
+++ b/apps/browser/src/platform/alarms/alarm-state.ts
@@ -1,5 +1,5 @@
-import { clearClipboardAlarmName } from "../autofill/clipboard";
-import { BrowserApi } from "../browser/browserApi";
+import { clearClipboardAlarmName } from "../../autofill/clipboard";
+import { BrowserApi } from "../browser/browser-api";

 export const alarmKeys = [clearClipboardAlarmName] as const;
 export type AlarmKeys = (typeof alarmKeys)[number];
--- a/apps/browser/src/platform/alarms/on-alarm-listener.ts
+++ b/apps/browser/src/platform/alarms/on-alarm-listener.ts
@@ -1,4 +1,4 @@
-import { ClearClipboard, clearClipboardAlarmName } from "../autofill/clipboard";
+import { ClearClipboard, clearClipboardAlarmName } from "../../autofill/clipboard";

 import { alarmKeys, clearAlarmTime, getAlarmTime } from "./alarm-state";

--- a/apps/browser/src/platform/alarms/register-alarms.ts
+++ b/apps/browser/src/platform/alarms/register-alarms.ts
--- a/apps/browser/src/platform/background.html
+++ b/apps/browser/src/platform/background.html
--- a/apps/browser/src/platform/background.ts
+++ b/apps/browser/src/platform/background.ts
@@ -1,7 +1,8 @@
+import MainBackground from "../background/main.background";
+
 import { onAlarmListener } from "./alarms/on-alarm-listener";
 import { registerAlarms } from "./alarms/register-alarms";
-import MainBackground from "./background/main.background";
-import { BrowserApi } from "./browser/browserApi";
+import { BrowserApi } from "./browser/browser-api";
 import {
  contextMenusClickedListener,
  onCommandListener,
--- a/apps/browser/src/platform/background/service-factories/api-service.factory.ts
+++ b/apps/browser/src/platform/background/service-factories/api-service.factory.ts
@@ -4,14 +4,18 @@ import { ApiService } from "@bitwarden/common/services/api.service";
 import {
  tokenServiceFactory,
  TokenServiceInitOptions,
-} from "../../auth/background/service-factories/token-service.factory";
+} from "../../../auth/background/service-factories/token-service.factory";
+import {
+  CachedServices,
+  factory,
+  FactoryOptions,
+} from "../../background/service-factories/factory-options";

 import { AppIdServiceInitOptions, appIdServiceFactory } from "./app-id-service.factory";
 import {
  environmentServiceFactory,
  EnvironmentServiceInitOptions,
 } from "./environment-service.factory";
-import { CachedServices, factory, FactoryOptions } from "./factory-options";
 import {
  PlatformUtilsServiceInitOptions,
  platformUtilsServiceFactory,
--- a/apps/browser/src/platform/background/service-factories/app-id-service.factory.ts
+++ b/apps/browser/src/platform/background/service-factories/app-id-service.factory.ts
@@ -1,7 +1,7 @@
 import { DiskStorageOptions } from "@koa/multer";

-import { AppIdService as AbstractAppIdService } from "@bitwarden/common/abstractions/appId.service";
-import { AppIdService } from "@bitwarden/common/services/appId.service";
+import { AppIdService as AbstractAppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { AppIdService } from "@bitwarden/common/platform/services/app-id.service";

 import { FactoryOptions, CachedServices, factory } from "./factory-options";
 import { diskStorageServiceFactory } from "./storage-service.factory";
--- a/Show More
+++ b/Show More