Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Refactor browser extension imports (#2159)

Leendert de Borst202654605f9c
diff --git a/.gitignore b/.gitignore
index 4223ccc8b..9b00db29b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -449,7 +449,7 @@ core/rust/dist/
core/rust/target/
# Browser extension WASM (built by: cd core/rust && ./build.sh --browser)
-apps/browser-extension/src/utils/dist/core/rust
+core/client/wasm
# Server .NET bindings (built by: cd core/rust && ./build.sh --server)
apps/server/Utilities/AliasVault.RustCore/
diff --git a/apps/browser-extension/.gitignore b/apps/browser-extension/.gitignore
index d582013ff..9ced10265 100644
--- a/apps/browser-extension/.gitignore
+++ b/apps/browser-extension/.gitignore
@@ -10,7 +10,6 @@ lerna-debug.log*
node_modules
.output
dist
-!src/utils/dist
stats.html
stats-*.json
.wxt
diff --git a/apps/browser-extension/eslint.config.js b/apps/browser-extension/eslint.config.js
index b267442f1..17a5a421d 100644
--- a/apps/browser-extension/eslint.config.js
+++ b/apps/browser-extension/eslint.config.js
@@ -12,7 +12,6 @@ export default [
ignores: [
"dist/**",
"node_modules/**",
- "src/utils/dist/**",
]
},
js.configs.recommended,
diff --git a/apps/browser-extension/src/entrypoints/background.ts b/apps/browser-extension/src/entrypoints/background.ts
index 98fff40d7..95a3b5692 100644
--- a/apps/browser-extension/src/entrypoints/background.ts
+++ b/apps/browser-extension/src/entrypoints/background.ts
@@ -2,6 +2,8 @@
* Background script entry point - handles messages from the content script
*/
+import '@/platform/ClientServices';
+
import { handleResetAutoLockTimer, handlePopupHeartbeat, handleSetAutoLockTimeout, initializeAutoLockAlarm, handleAutoLockAlarm } from '@/entrypoints/background/AutolockTimeoutHandler';
import { handleClipboardCopied, handleCancelClipboardClear, handleGetClipboardClearTimeout, handleSetClipboardClearTimeout, handleGetClipboardCountdownState } from '@/entrypoints/background/ClipboardClearHandler';
import { setupContextMenus } from '@/entrypoints/background/ContextMenu';
diff --git a/apps/browser-extension/src/entrypoints/background/ContextMenu.ts b/apps/browser-extension/src/entrypoints/background/ContextMenu.ts
index c9cd9bcdc..f47058fde 100644
--- a/apps/browser-extension/src/entrypoints/background/ContextMenu.ts
+++ b/apps/browser-extension/src/entrypoints/background/ContextMenu.ts
@@ -1,14 +1,15 @@
+import * as RustCore from '@aliasvault/client/rust/RustCore';
import { type Browser } from '@wxt-dev/browser';
import { handleGetPasswordSettings } from '@/entrypoints/background/VaultMessageHandler';
import { POPUP_TYPES, type PopupType, isPopupType } from '@/utils/autofill/PopupTypes';
-import type { PasswordSettings } from '@/utils/dist/core/models/vault';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
-import * as RustCore from '@/utils/RustCore';
import { t } from '@/i18n/StandaloneI18n';
+import type { PasswordSettings } from '@aliasvault/models/vault';
+
import { browser } from "#imports";
const MENU_ID_PREFIX = 'aliasvault-activate-form-';
diff --git a/apps/browser-extension/src/entrypoints/background/PasskeyHandler.ts b/apps/browser-extension/src/entrypoints/background/PasskeyHandler.ts
index 2b9c1fe56..8430e5b7b 100644
--- a/apps/browser-extension/src/entrypoints/background/PasskeyHandler.ts
+++ b/apps/browser-extension/src/entrypoints/background/PasskeyHandler.ts
@@ -3,6 +3,8 @@
*/
/* eslint-disable @typescript-eslint/no-explicit-any */
+import { extractDomain } from '@aliasvault/client/rust/RustCore';
+
import { createVaultSqliteClient, handleGetEncryptionKey, handleRecordItemUsage } from '@/entrypoints/background/VaultMessageHandler';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
@@ -22,7 +24,6 @@ import type {
MatchingPasskeysResponse,
WebAuthnAssertionResponse
} from '@/utils/passkey/types';
-import { extractDomain } from '@/utils/RustCore';
import { browser } from '#imports';
diff --git a/apps/browser-extension/src/entrypoints/background/TwoFactorStateHandler.ts b/apps/browser-extension/src/entrypoints/background/TwoFactorStateHandler.ts
index df58152e7..a87d6e0c7 100644
--- a/apps/browser-extension/src/entrypoints/background/TwoFactorStateHandler.ts
+++ b/apps/browser-extension/src/entrypoints/background/TwoFactorStateHandler.ts
@@ -9,7 +9,7 @@
* without re-entering credentials.
*/
-import type { LoginResponse } from '@/utils/dist/core/models/webapi';
+import type { LoginResponse } from '@aliasvault/models/webapi';
/**
* The 2FA state that is persisted in memory.
diff --git a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
index eaa78bacf..ff18cff72 100644
--- a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
+++ b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
@@ -1,42 +1,49 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
+
+import { ApiAuthError } from '@aliasvault/client/api/errors/ApiAuthError';
+import { ApiRequestError } from '@aliasvault/client/api/errors/ApiRequestError';
+import { AppErrorCode, formatErrorWithCode, hasErrorCode } from '@aliasvault/client/api/errors/AppErrorCodes';
+import { ClientUpgradeRequiredError } from '@aliasvault/client/api/errors/ClientUpgradeRequiredError';
+import { NetworkError } from '@aliasvault/client/api/errors/NetworkError';
+import { PayloadTooLargeError } from '@aliasvault/client/api/errors/PayloadTooLargeError';
+import { RequestTimeoutError } from '@aliasvault/client/api/errors/RequestTimeoutError';
+import { ServerUpdateRequiredError } from '@aliasvault/client/api/errors/ServerUpdateRequiredError';
+import { VaultVersionIncompatibleError } from '@aliasvault/client/api/errors/VaultVersionIncompatibleError';
+import { WebApiService } from '@aliasvault/client/api/WebApiService';
+import { MasterPasswordService, PasswordChangedElsewhereError } from '@aliasvault/client/auth/MasterPasswordService';
+import { VaultKeyService } from '@aliasvault/client/auth/VaultKeyService';
+import { TRASH_RETENTION_DAYS } from '@aliasvault/client/constants/Vault';
+import { EncryptionUtility } from '@aliasvault/client/crypto/EncryptionUtility';
+import { decryptVaultBlob, encryptVaultBlob } from '@aliasvault/client/crypto/VaultBlob';
+import { SqliteClient } from '@aliasvault/client/database/SqliteClient';
+import { generateTotpCode } from '@aliasvault/client/items/TotpUtility';
+import { filterItems, AutofillMatchingMode, extractRootDomain, isUrlAlreadyLinked, generatePassword, vaultCodecExtractBuckets, vaultCodecBucketLayout, vaultCodecOverflowTable } from '@aliasvault/client/rust/RustCore';
+import { multiManifestRendering } from '@aliasvault/client/sharing/MultiManifestRendering';
+import { SharingService } from '@aliasvault/client/sharing/SharingService';
+import { requiresLegacyAccountKeyMigration } from '@aliasvault/client/sync/LegacyStorageModelMigration';
+import { bucketsRequiringPull, getBucketRevisions, getManifestRevisions, manifestsRequiringPull, recordManifestRevisions, toBucketRevisionMap, toManifestRevisionMap } from '@aliasvault/client/sync/ManifestRevisions';
+import { PendingActionProcessor } from '@aliasvault/client/sync/PendingActionProcessor';
+import { VaultCodec } from '@aliasvault/client/sync/VaultCodec';
+import { clearDirtyScopes, getDirtyScopes } from '@aliasvault/client/sync/VaultDirtyState';
+import { vaultRequiresManifestMigration, VaultMigrationKind, type VaultMigrationStatus } from '@aliasvault/client/sync/VaultManifestMigration';
+import { type VaultMutationScope, DEFAULT_VAULT_MUTATION_SCOPE, hasUserVisibleScope, isManifestScope } from '@aliasvault/client/sync/VaultMutationScope';
+import { getVaultSyncHoldReason } from '@aliasvault/client/sync/VaultSyncHold';
+import { type PullAndMergeResult, invalidateCanonicalizeCache, primeCanonicalizeCache } from '@aliasvault/client/sync/VaultSyncService';
+import { base64ToBytes, bytesToBase64 } from '@aliasvault/client/utilities/Base64';
+import { FieldKey, ItemTypes, VaultDataBucketCategory, createSystemField, type Item, type PasswordSettings } from '@aliasvault/models/vault';
+import { VaultKeyAlgorithm, type VaultResponse, type StatusResponseV2 } from '@aliasvault/models/webapi';
import { storage } from 'wxt/utils/storage';
import { clearAllSavePromptState } from '@/entrypoints/background/SavePromptStateHandler';
import { handleClearTwoFactorState } from '@/entrypoints/background/TwoFactorStateHandler';
-import { MasterPasswordService, PasswordChangedElsewhereError } from '@/utils/auth/MasterPasswordService';
-import { base64ToBytes, bytesToBase64 } from '@/utils/Base64';
import { AUTH_STORAGE_KEYS, dirtyScopeStorageKey, SESSION_STORAGE_KEYS, StorageKeys, vaultDataStorageKeys, VAULT_LOCK_STORAGE_KEYS } from '@/utils/constants/storageKeys';
-import { TRASH_RETENTION_DAYS } from '@/utils/constants/vault';
-import type { ItemUsageAction } from '@/utils/db';
-import type { DraftItem } from '@/utils/db/ItemRef';
import { devError, devLog, devWarn } from '@/utils/devLogger/DevLogger';
-import type { EncryptionKeyDerivationParams } from '@/utils/dist/core/models/metadata';
-import { FieldKey, ItemTypes, VaultDataBucketCategory, createSystemField, type Item, type PasswordSettings } from '@/utils/dist/core/models/vault';
-import { VaultKeyAlgorithm, type VaultResponse, type StatusResponseV2 } from '@/utils/dist/core/models/webapi';
-import { EncryptionUtility } from '@/utils/EncryptionUtility';
-import { requiresLegacyAccountKeyMigration } from '@/utils/legacy/LegacyStorageModelMigration';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
-import { bucketsRequiringPull, getBucketRevisions, getManifestRevisions, manifestsRequiringPull, recordManifestRevisions, toBucketRevisionMap, toManifestRevisionMap } from '@/utils/ManifestRevisions';
import { sendMessage, type TotpSecret } from '@/utils/messaging/ExtensionMessaging';
-import { multiManifestRendering } from '@/utils/MultiManifestRendering';
-import { PendingActionProcessor } from '@/utils/PendingActionProcessor';
import { RecentlySelectedItemService } from '@/utils/RecentlySelectedItemService';
-import { filterItems, AutofillMatchingMode, extractRootDomain, isUrlAlreadyLinked, generatePassword, vaultCodecExtractBuckets, vaultCodecBucketLayout, vaultCodecOverflowTable } from '@/utils/RustCore';
import { ServiceDetectionUtility } from '@/utils/serviceDetection/ServiceDetectionUtility';
-import { SharingService } from '@/utils/SharingService';
-import { SqliteClient } from '@/utils/SqliteClient';
import { getStorageItem } from '@/utils/StorageUtility';
-import { generateTotpCode } from '@/utils/TotpUtility';
-import { ApiAuthError } from '@/utils/types/errors/ApiAuthError';
-import { ApiRequestError } from '@/utils/types/errors/ApiRequestError';
-import { AppErrorCode, formatErrorWithCode, hasErrorCode } from '@/utils/types/errors/AppErrorCodes';
-import { ClientUpgradeRequiredError } from '@/utils/types/errors/ClientUpgradeRequiredError';
-import { NetworkError } from '@/utils/types/errors/NetworkError';
-import { PayloadTooLargeError } from '@/utils/types/errors/PayloadTooLargeError';
-import { RequestTimeoutError } from '@/utils/types/errors/RequestTimeoutError';
-import { ServerUpdateRequiredError } from '@/utils/types/errors/ServerUpdateRequiredError';
-import { VaultVersionIncompatibleError } from '@/utils/types/errors/VaultVersionIncompatibleError';
import type { BoolResponse as messageBoolResponse } from '@/utils/types/messaging/BoolResponse';
import type { DuplicateCheckResponse } from '@/utils/types/messaging/DuplicateCheckResponse';
import type { IdentitySettingsResponse } from '@/utils/types/messaging/IdentitySettingsResponse';
@@ -46,18 +53,14 @@ import type { SaveLoginResponse } from '@/utils/types/messaging/SaveLoginRespons
import type { StringResponse as stringResponse } from '@/utils/types/messaging/StringResponse';
import type { VaultResponse as messageVaultResponse } from '@/utils/types/messaging/VaultResponse';
import type { VaultUploadResponse as messageVaultUploadResponse } from '@/utils/types/messaging/VaultUploadResponse';
-import { type VaultMutationScope, DEFAULT_VAULT_MUTATION_SCOPE, hasUserVisibleScope, isManifestScope } from '@/utils/types/VaultMutationScope';
-import { decryptVaultBlob, encryptVaultBlob } from '@/utils/VaultBlob';
-import { VaultCodec } from '@/utils/VaultCodec';
-import { clearDirtyScopes, getDirtyScopes } from '@/utils/VaultDirtyState';
-import { VaultKeyService } from '@/utils/VaultKeyService';
-import { vaultRequiresManifestMigration, VaultMigrationKind, type VaultMigrationStatus } from '@/utils/VaultManifestMigration';
-import { vaultMergeService, type MergeResult } from '@/utils/VaultMergeService';
-import { getVaultSyncHoldReason } from '@/utils/VaultSyncHold';
-import { type PullAndMergeResult, vaultSyncService, invalidateCanonicalizeCache, primeCanonicalizeCache } from '@/utils/VaultSyncService';
-import { WebApiService } from '@/utils/WebApiService';
import { t } from '@/i18n/StandaloneI18n';
+import { vaultMergeService, vaultSyncService } from '@/platform/ClientServices';
+
+import type { ItemUsageAction } from '@aliasvault/client/database';
+import type { DraftItem } from '@aliasvault/client/database/ItemRef';
+import type { MergeResult } from '@aliasvault/client/sync/VaultMergeService';
+import type { EncryptionKeyDerivationParams } from '@aliasvault/models/metadata';
/**
* Cache for the SqliteClient to avoid repeated decryption and initialization.
@@ -111,7 +114,9 @@ async function serverStateNeedsPull(statusResponse: StatusResponseV2): Promise<b
return false;
}
- // Log the manifests and buckets that need to be pulled.
+ /**
+ * Describe one manifest or bucket that needs a pull, with its local and server revision.
+ */
const describe = (server: Record<string, number>, local: Record<string, number>) => (key: string): string => `${key} (local ${local[key] ?? 'untracked'}, server ${server[key] ?? 'unlisted'})`;
if (manifestsToPull.length > 0) {
devLog(`[VaultSync] Pull needed for ${manifestsToPull.length} manifest(s): ${manifestsToPull.map(describe(serverManifestRevisions, localManifestRevisions)).join(', ')}.`);
diff --git a/apps/browser-extension/src/entrypoints/contentScript/Form.ts b/apps/browser-extension/src/entrypoints/contentScript/Form.ts
index ed7876c19..85118d9d2 100644
--- a/apps/browser-extension/src/entrypoints/contentScript/Form.ts
+++ b/apps/browser-extension/src/entrypoints/contentScript/Form.ts
@@ -1,17 +1,19 @@
+import { SqliteClient } from '@aliasvault/client/database/SqliteClient';
+import { itemToCredential, FieldKey } from '@aliasvault/models/vault';
+
import { openAutofillPopup, openTotpPopup, removeExistingPopup } from '@/entrypoints/contentScript/Popup';
import { LOGO_MARK_SVG } from '@/utils/constants/logo';
-import type { Item } from '@/utils/dist/core/models/vault';
-import { itemToCredential, FieldKey } from '@/utils/dist/core/models/vault';
import { FormDetector } from '@/utils/formDetector/FormDetector';
import { FormFiller } from '@/utils/formDetector/FormFiller';
import { DetectedFieldType } from '@/utils/formDetector/types/FormFields';
import type { LastAutofilledCredential } from '@/utils/loginDetector';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
import { ClickValidator } from '@/utils/security/ClickValidator';
-import { SqliteClient } from '@/utils/SqliteClient';
import { copyTotpToClipboardIfEnabled } from '@/utils/TotpClipboard';
+import type { Item } from '@aliasvault/models/vault';
+
/**
* Global timestamp to track popup debounce time.
* This is used to not show the popup again for a specific amount of time.
diff --git a/apps/browser-extension/src/entrypoints/contentScript/Popup.ts b/apps/browser-extension/src/entrypoints/contentScript/Popup.ts
index e2afa29e5..59f659c56 100644
--- a/apps/browser-extension/src/entrypoints/contentScript/Popup.ts
+++ b/apps/browser-extension/src/entrypoints/contentScript/Popup.ts
@@ -1,20 +1,22 @@
+import { SqliteClient } from '@aliasvault/client/database/SqliteClient';
+import { generateTotpCode, getTotpRemainingSeconds } from '@aliasvault/client/items/TotpUtility';
+import { ItemTypeIconSvgs } from '@aliasvault/models/icons';
+import { FieldKey, getFieldValue, normalizeTotpPeriod } from '@aliasvault/models/vault';
+
import { fillItem, fillTotpCode } from '@/entrypoints/contentScript/Form';
-import { ItemTypeIconSvgs } from '@/utils/dist/core/models/icons';
-import type { Item } from '@/utils/dist/core/models/vault';
-import { FieldKey, getFieldValue, normalizeTotpPeriod } from '@/utils/dist/core/models/vault';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
import { sendMessage, type TotpSecret } from '@/utils/messaging/ExtensionMessaging';
import { ClickValidator } from '@/utils/security/ClickValidator';
import { ServiceDetectionUtility } from '@/utils/serviceDetection/ServiceDetectionUtility';
-import { SqliteClient } from '@/utils/SqliteClient';
-import { generateTotpCode, getTotpRemainingSeconds } from '@/utils/TotpUtility';
import { t } from '@/i18n/StandaloneI18n';
import { getCurrentAutofillFrameUrl } from './AutofillFrameUrl';
import { completeConditionalWithPasskey, getConditionalPasskeyOptions, hasPendingConditionalRequest } from './ConditionalPasskey';
+import type { Item } from '@aliasvault/models/vault';
+
/**
* The input element the autofill popup was most recently shown for. Used as a fallback fill
* target when a credential is created in the full popup window and filled back into the page.
diff --git a/apps/browser-extension/src/entrypoints/popup/App.tsx b/apps/browser-extension/src/entrypoints/popup/App.tsx
index d70d51cf3..5a0326cc4 100644
--- a/apps/browser-extension/src/entrypoints/popup/App.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/App.tsx
@@ -1,3 +1,4 @@
+import { CapabilityKeys } from '@aliasvault/models/webapi';
import React, { useState, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { HashRouter as Router, Routes, Route, useLocation } from 'react-router-dom';
@@ -44,7 +45,6 @@ import SecuritySettings from '@/entrypoints/popup/pages/settings/security/Securi
import Settings from '@/entrypoints/popup/pages/settings/Settings';
import VaultUnlockSettings from '@/entrypoints/popup/pages/settings/VaultUnlockSettings';
-import { CapabilityKeys } from '@/utils/dist/core/models/webapi';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
import { useMinDurationLoading } from '@/hooks/useMinDurationLoading';
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/LogoutConfirmModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/LogoutConfirmModal.tsx
index be2b1231d..14ff82a84 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/LogoutConfirmModal.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/LogoutConfirmModal.tsx
@@ -1,10 +1,9 @@
+import { hasUnsyncedUserChanges } from '@aliasvault/client/sync/VaultDirtyState';
import React, { useState, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import ModalWrapper from '@/entrypoints/popup/components/Dialogs/ModalWrapper';
-import { hasUnsyncedUserChanges } from '@/utils/VaultDirtyState';
-
interface ILogoutConfirmModalProps {
isOpen: boolean;
onClose: () => void;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/MobileUnlockModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/MobileUnlockModal.tsx
index 93a6ad357..2687e477e 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/MobileUnlockModal.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/MobileUnlockModal.tsx
@@ -7,7 +7,8 @@ import { MobileLoginErrorCode } from '@/entrypoints/popup/types/MobileLoginError
import { MobileLoginUtility } from '@/entrypoints/popup/utils/MobileLoginUtility';
import type { MobileLoginResult } from '@/utils/types/messaging/MobileLoginResult';
-import type { WebApiService } from '@/utils/WebApiService';
+
+import type { WebApiService } from '@aliasvault/client/api/WebApiService';
interface IMobileUnlockModalProps {
isOpen: boolean;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/PasswordConfigDialog.tsx b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/PasswordConfigDialog.tsx
index 3dfcba470..3c665b7fd 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/PasswordConfigDialog.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/PasswordConfigDialog.tsx
@@ -5,7 +5,7 @@ import ModalWrapper from '@/entrypoints/popup/components/Dialogs/ModalWrapper';
import PasswordConfigForm from '@/entrypoints/popup/components/Forms/PasswordConfigForm';
import { usePasswordConfig } from '@/entrypoints/popup/hooks/usePasswordConfig';
-import type { PasswordSettings } from '@/utils/dist/core/models/vault';
+import type { PasswordSettings } from '@aliasvault/models/vault';
interface IPasswordConfigDialogProps {
isOpen: boolean;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx b/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx
index fa589ef3f..e9e4b218a 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx
@@ -1,3 +1,5 @@
+import { EncryptionUtility } from '@aliasvault/client/crypto/EncryptionUtility';
+import { AppInfo } from '@aliasvault/client/platform/AppInfo';
import React, { useState, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { Link, useLocation } from 'react-router-dom';
@@ -6,12 +8,11 @@ import { AttachmentIcon } from '@/entrypoints/popup/components/Icons/AttachmentI
import { useDb } from '@/entrypoints/popup/context/DbContext';
import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';
-import { AppInfo } from '@/utils/AppInfo';
import { StorageKeys } from '@/utils/constants/storageKeys';
-import type { ApiErrorResponse, MailboxEmail } from '@/utils/dist/core/models/webapi';
-import { EncryptionUtility } from '@/utils/EncryptionUtility';
import { getStorageItem } from '@/utils/StorageUtility';
+import type { ApiErrorResponse, MailboxEmail } from '@aliasvault/models/webapi';
+
type EmailPreviewProps = {
email: string;
}
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderBreadcrumb.tsx b/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderBreadcrumb.tsx
index 9d268709e..55ba3ce47 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderBreadcrumb.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderBreadcrumb.tsx
@@ -1,3 +1,4 @@
+import { getFolderPath, getFolderIdPath } from '@aliasvault/client/items/FolderUtils';
import React, { useMemo, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate, useLocation } from 'react-router-dom';
@@ -5,8 +6,6 @@ import { useNavigate, useLocation } from 'react-router-dom';
import { useDb } from '@/entrypoints/popup/context/DbContext';
import { useNavigationHistory } from '@/entrypoints/popup/hooks/useNavigationHistory';
-import { getFolderPath, getFolderIdPath } from '@/utils/FolderUtils';
-
type Breadcrumb = {
name: string;
id: string;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderModal.tsx
index 7937ca263..6222dc20b 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderModal.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Folders/FolderModal.tsx
@@ -1,10 +1,9 @@
+import { hasErrorCode, getErrorMessage } from '@aliasvault/client/api/errors/AppErrorCodes';
import React, { useState, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import ModalWrapper from '@/entrypoints/popup/components/Dialogs/ModalWrapper';
-import { hasErrorCode, getErrorMessage } from '@/utils/types/errors/AppErrorCodes';
-
type FolderModalProps = {
isOpen: boolean;
onClose: () => void;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Forms/AddFieldMenu.tsx b/apps/browser-extension/src/entrypoints/popup/components/Forms/AddFieldMenu.tsx
index c4c06f4e5..9e49b589b 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Forms/AddFieldMenu.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Forms/AddFieldMenu.tsx
@@ -1,11 +1,11 @@
+import { FieldCategories } from '@aliasvault/models/vault';
import React, { useState, useCallback, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
-import type { FieldType, SystemFieldDefinition } from '@/utils/dist/core/models/vault';
-import { FieldCategories } from '@/utils/dist/core/models/vault';
-
import CustomFieldModal from './CustomFieldModal';
+import type { FieldType, SystemFieldDefinition } from '@aliasvault/models/vault';
+
/**
* Configuration for an optional section (not field-based).
*/
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Forms/CustomFieldModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Forms/CustomFieldModal.tsx
index 44fd734ab..4397eda00 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Forms/CustomFieldModal.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Forms/CustomFieldModal.tsx
@@ -1,10 +1,10 @@
+import { FieldTypes } from '@aliasvault/models/vault';
import React, { useCallback, useLayoutEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import ModalWrapper from '@/entrypoints/popup/components/Dialogs/ModalWrapper';
-import type { FieldType } from '@/utils/dist/core/models/vault';
-import { FieldTypes } from '@/utils/dist/core/models/vault';
+import type { FieldType } from '@aliasvault/models/vault';
type CustomFieldModalProps = {
isOpen: boolean;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Forms/DraggableCustomFieldsList.tsx b/apps/browser-extension/src/entrypoints/popup/components/Forms/DraggableCustomFieldsList.tsx
index 23186ed79..3a9c97028 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Forms/DraggableCustomFieldsList.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Forms/DraggableCustomFieldsList.tsx
@@ -1,3 +1,4 @@
+import { FieldTypes } from '@aliasvault/models/vault';
import {
DndContext,
closestCenter,
@@ -17,15 +18,14 @@ import {
import { CSS } from '@dnd-kit/utilities';
import React, { useCallback, useMemo, useState } from 'react';
-import type { FieldType } from '@/utils/dist/core/models/vault';
-import { FieldTypes } from '@/utils/dist/core/models/vault';
-
import CustomFieldLabel from './CustomFieldLabel';
import CustomFieldModal from './CustomFieldModal';
import { FormInput } from './FormInput';
import HiddenField from './HiddenField';
import PasswordField from './PasswordField';
+import type { FieldType } from '@aliasvault/models/vault';
+
/**
* Custom field definition type
*/
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordConfigForm.tsx b/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordConfigForm.tsx
index 5c956164f..803124d48 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordConfigForm.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordConfigForm.tsx
@@ -1,15 +1,16 @@
+import { MIN_WORD_COUNT, MAX_WORD_COUNT, DEFAULT_WORD_COUNT, getLanguageInfo, resolveDefaultLanguage } from '@aliasvault/models/defaults';
import React from 'react';
import { useTranslation } from 'react-i18next';
-import { MIN_WORD_COUNT, MAX_WORD_COUNT, DEFAULT_WORD_COUNT, getLanguageInfo, resolveDefaultLanguage } from '@/utils/dist/core/models/defaults';
+import { sliderToLength, lengthToSlider, SLIDER_MIN, SLIDER_MAX } from '@/utils/PasswordLengthSlider';
+
import type {
PasswordSettings,
PasswordGeneratorType,
DicewareCapitalization,
DicewareSeparator,
DicewareSalt
-} from '@/utils/dist/core/models/vault';
-import { sliderToLength, lengthToSlider, SLIDER_MIN, SLIDER_MAX } from '@/utils/PasswordLengthSlider';
+} from '@aliasvault/models/vault';
const CAPITALIZATION_OPTIONS: DicewareCapitalization[] = ['Lowercase', 'TitleCase', 'Uppercase'];
const SEPARATOR_OPTIONS: DicewareSeparator[] = ['Dash', 'Space', 'Underscore', 'Dot', 'None'];
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordField.tsx b/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordField.tsx
index 92b422978..bb21c5044 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordField.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Forms/PasswordField.tsx
@@ -1,13 +1,14 @@
+import * as RustCore from '@aliasvault/client/rust/RustCore';
+import { MIN_WORD_COUNT, MAX_WORD_COUNT, DEFAULT_WORD_COUNT } from '@aliasvault/models/defaults';
import React, { useState, useEffect, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import PasswordConfigDialog from '@/entrypoints/popup/components/Dialogs/PasswordConfigDialog';
import { useDb } from '@/entrypoints/popup/context/DbContext';
-import { MIN_WORD_COUNT, MAX_WORD_COUNT, DEFAULT_WORD_COUNT } from '@/utils/dist/core/models/defaults';
-import type { PasswordSettings } from '@/utils/dist/core/models/vault';
import { sliderToLength, lengthToSlider, SLIDER_MIN, SLIDER_MAX } from '@/utils/PasswordLengthSlider';
-import * as RustCore from '@/utils/RustCore';
+
+import type { PasswordSettings } from '@aliasvault/models/vault';
interface IPasswordFieldProps {
id: string;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/AddItemDropdown.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/AddItemDropdown.tsx
index 7d72172f1..c59774e51 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/AddItemDropdown.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/AddItemDropdown.tsx
@@ -5,7 +5,7 @@ import HeaderButton from '@/entrypoints/popup/components/HeaderButton';
import { HeaderIconType } from '@/entrypoints/popup/components/Icons/HeaderIcons';
import { ITEM_TYPE_OPTIONS } from '@/entrypoints/popup/components/Items/ItemTypeSelector';
-import type { ItemType } from '@/utils/dist/core/models/vault';
+import type { ItemType } from '@aliasvault/models/vault';
type AddItemDropdownProps = {
onSelect: (type: ItemType) => void;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/CurrentSiteSuggestion.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/CurrentSiteSuggestion.tsx
index b3902b6b1..adf364e81 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/CurrentSiteSuggestion.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/CurrentSiteSuggestion.tsx
@@ -1,14 +1,14 @@
+import { applySearchFilter } from '@aliasvault/client/items/ItemFilters';
import React, { useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import useCurrentTabInfo from '@/entrypoints/popup/hooks/useCurrentTabInfo';
-import type { Item } from '@/utils/dist/core/models/vault';
-import { applySearchFilter } from '@/utils/ItemFilters';
-
import ItemIcon from './ItemIcon';
+import type { Item } from '@aliasvault/models/vault';
+
type CurrentSiteSuggestionProps = {
items: Item[];
onSearch: (domain: string) => void;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/AttachmentBlock.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/AttachmentBlock.tsx
index 7e479fdf1..4a1e21114 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/AttachmentBlock.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/AttachmentBlock.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
import { useDb } from '@/entrypoints/popup/context/DbContext';
-import type { Attachment } from '@/utils/dist/core/models/vault';
+import type { Attachment } from '@aliasvault/models/vault';
type AttachmentBlockProps = {
itemId: string;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/AttachmentUploader.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/AttachmentUploader.tsx
index d1a048c3b..1e30915b9 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/AttachmentUploader.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/AttachmentUploader.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';
-import type { Attachment } from '@/utils/dist/core/models/vault';
+import type { Attachment } from '@aliasvault/models/vault';
type AttachmentUploaderProps = {
attachments: Attachment[];
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/FieldBlock.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/FieldBlock.tsx
index fe826465c..9094dc986 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/FieldBlock.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/FieldBlock.tsx
@@ -1,14 +1,14 @@
+import { FieldTypes } from '@aliasvault/models/vault';
import React, { useState, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { FormInputCopyToClipboard } from '@/entrypoints/popup/components/Forms/FormInputCopyToClipboard';
import { useDb } from '@/entrypoints/popup/context/DbContext';
-import type { ItemField } from '@/utils/dist/core/models/vault';
-import { FieldTypes } from '@/utils/dist/core/models/vault';
-
import FieldHistoryModal from './FieldHistoryModal';
+import type { ItemField } from '@aliasvault/models/vault';
+
type FieldBlockProps = {
field: ItemField;
itemId?: string;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/FieldHistoryModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/FieldHistoryModal.tsx
index 9ad1e8b60..829679610 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/FieldHistoryModal.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/FieldHistoryModal.tsx
@@ -1,3 +1,4 @@
+import { FieldTypes } from '@aliasvault/models/vault';
import React, { useState, useEffect, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
@@ -6,8 +7,7 @@ import { FormInputCopyToClipboard } from '@/entrypoints/popup/components/Forms/F
import { useDb } from '@/entrypoints/popup/context/DbContext';
import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';
-import type { FieldHistory, FieldType } from '@/utils/dist/core/models/vault';
-import { FieldTypes } from '@/utils/dist/core/models/vault';
+import type { FieldHistory, FieldType } from '@aliasvault/models/vault';
type FieldHistoryModalProps = {
isOpen: boolean;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/PasskeyBlock.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/PasskeyBlock.tsx
index 38d76cd86..e3f93b10d 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/PasskeyBlock.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/PasskeyBlock.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
import LoadingSpinner from '@/entrypoints/popup/components/LoadingSpinner';
import { useDb } from '@/entrypoints/popup/context/DbContext';
-import type { Passkey } from '@/utils/dist/core/models/vault';
+import type { Passkey } from '@aliasvault/models/vault';
type PasskeyBlockProps = {
itemId: string;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/PasskeyEditor.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/PasskeyEditor.tsx
index 2b6cba5a2..fabb16702 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/PasskeyEditor.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/PasskeyEditor.tsx
@@ -4,10 +4,10 @@ import { useTranslation } from 'react-i18next';
import LoadingSpinner from '@/entrypoints/popup/components/LoadingSpinner';
import { useDb } from '@/entrypoints/popup/context/DbContext';
-import type { Passkey } from '@/utils/dist/core/models/vault';
-
import { PasskeyIcon } from './PasskeyBlock';
+import type { Passkey } from '@aliasvault/models/vault';
+
type PasskeyEditorProps = {
itemId: string;
passkeyIdsMarkedForDeletion: string[];
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpBlock.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpBlock.tsx
index 18c3429b0..9c509f7bb 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpBlock.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpBlock.tsx
@@ -1,11 +1,12 @@
+import { generateTotpCode, getTotpElapsedPercentage, getTotpRemainingSeconds } from '@aliasvault/client/items/TotpUtility';
import React, { useState, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { useDb } from '@/entrypoints/popup/context/DbContext';
-import type { TotpCode } from '@/utils/dist/core/models/vault';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
-import { generateTotpCode, getTotpElapsedPercentage, getTotpRemainingSeconds } from '@/utils/TotpUtility';
+
+import type { TotpCode } from '@aliasvault/models/vault';
/**
* Formats a TOTP code with a space in the middle for better readability, e.g. "XXX XXX" or "XXXX XXXX".
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpEditor.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpEditor.tsx
index ece3175e3..a20c96c87 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpEditor.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/TotpEditor.tsx
@@ -1,3 +1,5 @@
+import { buildOtpAuthUri } from '@aliasvault/client/items/TotpUtility';
+import { normalizeTotpAlgorithm, normalizeTotpDigits, normalizeTotpPeriod, TOTP_DEFAULT_ALGORITHM, TOTP_DEFAULT_DIGITS, TOTP_DEFAULT_PERIOD } from '@aliasvault/models/vault';
import * as OTPAuth from 'otpauth';
import QRCode from 'qrcode';
import React, { useState } from 'react';
@@ -6,9 +8,7 @@ import { useTranslation } from 'react-i18next';
import ConfirmDeleteModal from '@/entrypoints/popup/components/Dialogs/ConfirmDeleteModal';
import ModalWrapper from '@/entrypoints/popup/components/Dialogs/ModalWrapper';
-import type { TotpCode } from '@/utils/dist/core/models/vault';
-import { normalizeTotpAlgorithm, normalizeTotpDigits, normalizeTotpPeriod, TOTP_DEFAULT_ALGORITHM, TOTP_DEFAULT_DIGITS, TOTP_DEFAULT_PERIOD } from '@/utils/dist/core/models/vault';
-import { buildOtpAuthUri } from '@/utils/TotpUtility';
+import type { TotpCode } from '@aliasvault/models/vault';
type TotpFormData = {
name: string;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemCard.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemCard.tsx
index 76543cc55..9af95cd92 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemCard.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemCard.tsx
@@ -1,14 +1,14 @@
+import { truncateFolderPath } from '@aliasvault/client/items/FolderUtils';
+import { FieldKey } from '@aliasvault/models/vault';
import React, { useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
-import type { Item } from '@/utils/dist/core/models/vault';
-import { FieldKey } from '@/utils/dist/core/models/vault';
-import { truncateFolderPath } from '@/utils/FolderUtils';
-
import ItemContextMenu from './ItemContextMenu';
import ItemIcon from './ItemIcon';
+import type { Item } from '@aliasvault/models/vault';
+
type ItemCardProps = {
item: Item;
showFolderPath?: boolean;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemFilterDropdown.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemFilterDropdown.tsx
index b45369145..18ae70cf9 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemFilterDropdown.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemFilterDropdown.tsx
@@ -1,10 +1,9 @@
+import { isItemTypeFilter, type ItemFilterType } from '@aliasvault/client/items/ItemFilters';
import React, { useState } from 'react';
import { useTranslation } from 'react-i18next';
import { ITEM_TYPE_OPTIONS } from '@/entrypoints/popup/components/Items/ItemTypeSelector';
-import { isItemTypeFilter, type ItemFilterType } from '@/utils/ItemFilters';
-
/**
* Filter selection that includes the dedicated "deleted" page as an option too.
*/
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemIcon.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemIcon.tsx
index e6d874c71..0e6cdd3a0 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemIcon.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemIcon.tsx
@@ -1,14 +1,14 @@
-import React from 'react';
-
-import type { DraftItem } from '@/utils/db/ItemRef';
-import type { ItemTypeIconKey } from '@/utils/dist/core/models/icons';
-import { getAppIconSvg, ItemTypeIconSvgs } from '@/utils/dist/core/models/icons';
+import SqliteClient from '@aliasvault/client/database/SqliteClient';
+import { getAppIconSvg, ItemTypeIconSvgs } from '@aliasvault/models/icons';
import {
FieldKey,
LogoKinds,
ItemTypes,
-} from '@/utils/dist/core/models/vault';
-import SqliteClient from '@/utils/SqliteClient';
+} from '@aliasvault/models/vault';
+import React from 'react';
+
+import type { DraftItem } from '@aliasvault/client/database/ItemRef';
+import type { ItemTypeIconKey } from '@aliasvault/models/icons';
type ItemIconProps = {
item: DraftItem;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsx
index 832e5ea54..480fe50fd 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsx
@@ -1,14 +1,14 @@
+import { LogoKinds } from '@aliasvault/models/vault';
import React, { useState } from 'react';
import { useTranslation } from 'react-i18next';
import LogoPickerModal from '@/entrypoints/popup/components/Items/LogoPickerModal';
-import type { DraftItem } from '@/utils/db/ItemRef';
-import type { LogoSelection, ItemLogo } from '@/utils/dist/core/models/vault';
-import { LogoKinds } from '@/utils/dist/core/models/vault';
-
import ItemIconComponent from './ItemIcon';
+import type { DraftItem } from '@aliasvault/client/database/ItemRef';
+import type { LogoSelection, ItemLogo } from '@aliasvault/models/vault';
+
type ItemLogoPickerProps = {
item: DraftItem;
pendingSelection?: LogoSelection;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx
index 86ff65681..82af5f217 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemNameInput.tsx
@@ -1,11 +1,10 @@
+import { buildFolderTree, getFolderIdPath, isSharedFolder, type FolderTreeNode } from '@aliasvault/client/items/FolderUtils';
import React, { useState, useCallback, useMemo, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import FolderIcon from '@/entrypoints/popup/components/Folders/FolderIcon';
import { useDb } from '@/entrypoints/popup/context/DbContext';
-import { buildFolderTree, getFolderIdPath, isSharedFolder, type FolderTreeNode } from '@/utils/FolderUtils';
-
type Folder = {
Id: string;
Name: string;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemTypeSelector.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemTypeSelector.tsx
index 6b8ed06fb..3a8c0269c 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemTypeSelector.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemTypeSelector.tsx
@@ -1,8 +1,8 @@
+import { ItemTypes } from '@aliasvault/models/vault';
import React from 'react';
import { useTranslation } from 'react-i18next';
-import type { ItemType } from '@/utils/dist/core/models/vault';
-import { ItemTypes } from '@/utils/dist/core/models/vault';
+import type { ItemType } from '@aliasvault/models/vault';
/**
* Item type option configuration.
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/LogoPickerModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/LogoPickerModal.tsx
index 41f4b5bda..0df18eaba 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/LogoPickerModal.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/LogoPickerModal.tsx
@@ -1,11 +1,11 @@
+import { AppIconSvgs, getAllAppIconKeys } from '@aliasvault/models/icons';
+import { LogoKinds } from '@aliasvault/models/vault';
import React, { useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import ModalWrapper from '@/entrypoints/popup/components/Dialogs/ModalWrapper';
-import { AppIconSvgs, getAllAppIconKeys } from '@/utils/dist/core/models/icons';
-import type { LogoSelection, ItemLogo } from '@/utils/dist/core/models/vault';
-import { LogoKinds } from '@/utils/dist/core/models/vault';
+import type { LogoSelection, ItemLogo } from '@aliasvault/models/vault';
type LogoPickerModalProps = {
isOpen: boolean;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/VaultErrorReport.tsx b/apps/browser-extension/src/entrypoints/popup/components/VaultErrorReport.tsx
index cb7b6551c..c45c304c3 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/VaultErrorReport.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/VaultErrorReport.tsx
@@ -1,9 +1,8 @@
+import { VaultProcessingError } from '@aliasvault/client/api/errors/VaultProcessingError';
+import { AppInfo } from '@aliasvault/client/platform/AppInfo';
import React, { useState } from 'react';
import { useTranslation } from 'react-i18next';
-import { AppInfo } from '@/utils/AppInfo';
-import { VaultProcessingError } from '@/utils/types/errors/VaultProcessingError';
-
/**
* Vault error report props.
*/
diff --git a/apps/browser-extension/src/entrypoints/popup/context/AppContext.tsx b/apps/browser-extension/src/entrypoints/popup/context/AppContext.tsx
index b1b4ebed9..b2931b447 100644
--- a/apps/browser-extension/src/entrypoints/popup/context/AppContext.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/context/AppContext.tsx
@@ -1,10 +1,10 @@
+import { logoutEventEmitter } from '@aliasvault/client/api/LogoutEventEmitter';
import React, { createContext, useContext, useMemo, useCallback, useEffect, useState, useRef } from 'react';
import { useTranslation } from 'react-i18next';
import { useAuth } from '@/entrypoints/popup/context/AuthContext';
import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';
-import { logoutEventEmitter } from '@/events/LogoutEventEmitter';
import { vaultStateEvents } from '@/events/VaultStateEvents';
type AppContextType = {
diff --git a/apps/browser-extension/src/entrypoints/popup/context/CapabilityContext.tsx b/apps/browser-extension/src/entrypoints/popup/context/CapabilityContext.tsx
index 99cb75514..93300e0a6 100644
--- a/apps/browser-extension/src/entrypoints/popup/context/CapabilityContext.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/context/CapabilityContext.tsx
@@ -1,9 +1,8 @@
+import { type Capabilities, CapabilityService } from '@aliasvault/client/api/CapabilityService';
+import { type CapabilityKey, isCapabilityEnabled } from '@aliasvault/models/webapi';
import React, { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
import { Navigate } from 'react-router-dom';
-import { type Capabilities, CapabilityService } from '@/utils/CapabilityService';
-import { type CapabilityKey, isCapabilityEnabled } from '@/utils/dist/core/models/webapi';
-
type CapabilityContextType = {
isEnabled: (key: CapabilityKey) => boolean;
isLoaded: boolean;
diff --git a/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsx b/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsx
index 71d509050..daeb28140 100644
--- a/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsx
@@ -1,18 +1,19 @@
+import { AppErrorCode, formatErrorWithCode } from '@aliasvault/client/api/errors/AppErrorCodes';
+import EncryptionUtility from '@aliasvault/client/crypto/EncryptionUtility';
+import SqliteClient from '@aliasvault/client/database/SqliteClient';
+import { hasUnsyncedUserChanges as hasUnsyncedUserChangesInStorage } from '@aliasvault/client/sync/VaultDirtyState';
+import { vaultRequiresManifestMigration } from '@aliasvault/client/sync/VaultManifestMigration';
import React, { createContext, useContext, useState, useEffect, useCallback, useMemo, useRef } from 'react';
import { StorageKeys } from '@/utils/constants/storageKeys';
-import type { EncryptionKeyDerivationParams } from '@/utils/dist/core/models/metadata';
-import EncryptionUtility from '@/utils/EncryptionUtility';
import { onMessage, sendMessage } from '@/utils/messaging/ExtensionMessaging';
-import SqliteClient from '@/utils/SqliteClient';
import { getStorageItem } from '@/utils/StorageUtility';
-import { AppErrorCode, formatErrorWithCode } from '@/utils/types/errors/AppErrorCodes';
import type { VaultResponse as messageVaultResponse } from '@/utils/types/messaging/VaultResponse';
-import { hasUnsyncedUserChanges as hasUnsyncedUserChangesInStorage } from '@/utils/VaultDirtyState';
-import { vaultRequiresManifestMigration } from '@/utils/VaultManifestMigration';
import { markOwnEncryptionKey, vaultStateEvents } from '@/events/VaultStateEvents';
+import type { EncryptionKeyDerivationParams } from '@aliasvault/models/metadata';
+
import { storage } from '#imports';
/**
diff --git a/apps/browser-extension/src/entrypoints/popup/context/WebApiContext.tsx b/apps/browser-extension/src/entrypoints/popup/context/WebApiContext.tsx
index fc2cc41bf..601136b07 100644
--- a/apps/browser-extension/src/entrypoints/popup/context/WebApiContext.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/context/WebApiContext.tsx
@@ -1,7 +1,6 @@
+import { WebApiService } from '@aliasvault/client/api/WebApiService';
import React, { createContext, useContext, useEffect, useState } from 'react';
-import { WebApiService } from '@/utils/WebApiService';
-
const WebApiContext = createContext<WebApiService | null>(null);
/**
diff --git a/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.ts b/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.ts
index f6083e0ac..e4f600941 100644
--- a/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.ts
+++ b/apps/browser-extension/src/entrypoints/popup/hooks/useAliasGenerator.ts
@@ -1,9 +1,8 @@
+import * as RustCore from '@aliasvault/client/rust/RustCore';
import { useCallback, useState, type Dispatch, type SetStateAction } from 'react';
import { useDb } from '@/entrypoints/popup/context/DbContext';
-import * as RustCore from '@/utils/RustCore';
-
/**
* Generated alias data returned by the hook.
*/
diff --git a/apps/browser-extension/src/entrypoints/popup/hooks/useItemLogo.ts b/apps/browser-extension/src/entrypoints/popup/hooks/useItemLogo.ts
index 0d56d9624..e39a44c59 100644
--- a/apps/browser-extension/src/entrypoints/popup/hooks/useItemLogo.ts
+++ b/apps/browser-extension/src/entrypoints/popup/hooks/useItemLogo.ts
@@ -1,12 +1,13 @@
+import { LogoKinds } from '@aliasvault/models/vault';
import { useCallback, useEffect, useRef, useState } from 'react';
import { useDb } from '@/entrypoints/popup/context/DbContext';
import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';
-import type { LogoKind, LogoSelection } from '@/utils/dist/core/models/vault';
-import { LogoKinds } from '@/utils/dist/core/models/vault';
import { FaviconService } from '@/utils/FaviconService';
+import type { LogoKind, LogoSelection } from '@aliasvault/models/vault';
+
/**
* Debounce time for the URL field after typing before its favicon is looked up.
*/
diff --git a/apps/browser-extension/src/entrypoints/popup/hooks/usePasswordConfig.ts b/apps/browser-extension/src/entrypoints/popup/hooks/usePasswordConfig.ts
index 48549858d..87099cc1a 100644
--- a/apps/browser-extension/src/entrypoints/popup/hooks/usePasswordConfig.ts
+++ b/apps/browser-extension/src/entrypoints/popup/hooks/usePasswordConfig.ts
@@ -1,7 +1,7 @@
+import * as RustCore from '@aliasvault/client/rust/RustCore';
import { useState, useEffect, useCallback, useRef } from 'react';
-import type { PasswordSettings } from '@/utils/dist/core/models/vault';
-import * as RustCore from '@/utils/RustCore';
+import type { PasswordSettings } from '@aliasvault/models/vault';
/**
* Value returned by {@link usePasswordConfig}.
diff --git a/apps/browser-extension/src/entrypoints/popup/hooks/useVaultMutate.ts b/apps/browser-extension/src/entrypoints/popup/hooks/useVaultMutate.ts
index 94a37c477..0489a26a6 100644
--- a/apps/browser-extension/src/entrypoints/popup/hooks/useVaultMutate.ts
+++ b/apps/browser-extension/src/entrypoints/popup/hooks/useVaultMutate.ts
@@ -1,11 +1,11 @@
+import { encryptVaultBlob } from '@aliasvault/client/crypto/VaultBlob';
+import { isSilentScope, type VaultMutationOptions, type VaultMutationScope } from '@aliasvault/client/sync/VaultMutationScope';
import { useCallback, useRef } from 'react';
import { useDb } from '@/entrypoints/popup/context/DbContext';
import { devLog } from '@/utils/devLogger/DevLogger';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
-import { isSilentScope, type VaultMutationOptions, type VaultMutationScope } from '@/utils/types/VaultMutationScope';
-import { encryptVaultBlob } from '@/utils/VaultBlob';
/**
* Hook to execute a vault mutation.
diff --git a/apps/browser-extension/src/entrypoints/popup/main.tsx b/apps/browser-extension/src/entrypoints/popup/main.tsx
index 820d0aaee..9c5f45f0e 100644
--- a/apps/browser-extension/src/entrypoints/popup/main.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/main.tsx
@@ -1,3 +1,5 @@
+import '@/platform/ClientServices';
+
import ReactDOM from 'react-dom/client';
import App from '@/entrypoints/popup/App';
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/AuthSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/AuthSettings.tsx
index 747e213e2..35bd0ebf3 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/AuthSettings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/AuthSettings.tsx
@@ -1,3 +1,4 @@
+import { AppInfo } from '@aliasvault/client/platform/AppInfo';
import React, { useState, useEffect, useRef, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import * as Yup from 'yup';
@@ -5,7 +6,6 @@ import * as Yup from 'yup';
import LanguageSwitcher from '@/entrypoints/popup/components/LanguageSwitcher';
import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
-import { AppInfo } from '@/utils/AppInfo';
import { StorageKeys } from '@/utils/constants/storageKeys';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx
index f0a7a232c..6fa1bf15d 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx
@@ -1,3 +1,12 @@
+import { ApiAuthError } from '@aliasvault/client/api/errors/ApiAuthError';
+import { hasErrorCode, getErrorMessage } from '@aliasvault/client/api/errors/AppErrorCodes';
+import { ClientUpgradeRequiredError } from '@aliasvault/client/api/errors/ClientUpgradeRequiredError';
+import { ServerUpdateRequiredError } from '@aliasvault/client/api/errors/ServerUpdateRequiredError';
+import { VaultProcessingError } from '@aliasvault/client/api/errors/VaultProcessingError';
+import { SrpAuthService } from '@aliasvault/client/auth/SrpAuthService';
+import { VaultKeyService } from '@aliasvault/client/auth/VaultKeyService';
+import { decryptVaultBlob } from '@aliasvault/client/crypto/VaultBlob';
+import { AppInfo } from '@aliasvault/client/platform/AppInfo';
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
@@ -16,22 +25,14 @@ import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';
import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';
import SrpUtility from '@/entrypoints/popup/utils/SrpUtility';
-import { AppInfo } from '@/utils/AppInfo';
-import { SrpAuthService } from '@/utils/auth/SrpAuthService';
import { StorageKeys } from '@/utils/constants/storageKeys';
-import type { VaultResponse, LoginResponse } from '@/utils/dist/core/models/webapi';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
-import { ApiAuthError } from '@/utils/types/errors/ApiAuthError';
-import { hasErrorCode, getErrorMessage } from '@/utils/types/errors/AppErrorCodes';
-import { ClientUpgradeRequiredError } from '@/utils/types/errors/ClientUpgradeRequiredError';
-import { ServerUpdateRequiredError } from '@/utils/types/errors/ServerUpdateRequiredError';
-import { VaultProcessingError } from '@/utils/types/errors/VaultProcessingError';
import type { MobileLoginResult } from '@/utils/types/messaging/MobileLoginResult';
-import { decryptVaultBlob } from '@/utils/VaultBlob';
-import { VaultKeyService } from '@/utils/VaultKeyService';
-import { vaultSyncService } from '@/utils/VaultSyncService';
import { vaultStateEvents } from '@/events/VaultStateEvents';
+import { vaultSyncService } from '@/platform/ClientServices';
+
+import type { VaultResponse, LoginResponse } from '@aliasvault/models/webapi';
import { storage } from '#imports';
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx
index 72613e1cf..5916f4d38 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx
@@ -1,3 +1,8 @@
+import { hasErrorCode, getErrorMessage, extractErrorCode, AppErrorCode } from '@aliasvault/client/api/errors/AppErrorCodes';
+import { ClientUpgradeRequiredError } from '@aliasvault/client/api/errors/ClientUpgradeRequiredError';
+import { VaultVersionIncompatibleError } from '@aliasvault/client/api/errors/VaultVersionIncompatibleError';
+import { SrpAuthService } from '@aliasvault/client/auth/SrpAuthService';
+import { VaultKeyService } from '@aliasvault/client/auth/VaultKeyService';
import React, { useEffect, useState, useCallback, useRef } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
@@ -19,7 +24,6 @@ import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';
import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';
import SrpUtility from '@/entrypoints/popup/utils/SrpUtility';
-import { SrpAuthService } from '@/utils/auth/SrpAuthService';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
import {
@@ -32,11 +36,7 @@ import {
setupPin,
unlockWithPin
} from '@/utils/PinUnlockService';
-import { hasErrorCode, getErrorMessage, extractErrorCode, AppErrorCode } from '@/utils/types/errors/AppErrorCodes';
-import { ClientUpgradeRequiredError } from '@/utils/types/errors/ClientUpgradeRequiredError';
-import { VaultVersionIncompatibleError } from '@/utils/types/errors/VaultVersionIncompatibleError';
import type { MobileLoginResult } from '@/utils/types/messaging/MobileLoginResult';
-import { VaultKeyService } from '@/utils/VaultKeyService';
import { vaultStateEvents } from '@/events/VaultStateEvents';
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx
index 02f64b3f2..def8c7a22 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx
@@ -1,3 +1,6 @@
+import { AppInfo } from '@aliasvault/client/platform/AppInfo';
+import { VaultMigrationKind } from '@aliasvault/client/sync/VaultManifestMigration';
+import { VaultSqlGenerator } from '@aliasvault/vault';
import React, { useState, useEffect, useCallback, useRef } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
@@ -19,11 +22,9 @@ import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';
import { useVaultSync } from '@/entrypoints/popup/hooks/useVaultSync';
import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';
-import { AppInfo } from '@/utils/AppInfo';
-import type { VaultVersion } from '@/utils/dist/core/vault';
-import { VaultSqlGenerator } from '@/utils/dist/core/vault';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
-import { VaultMigrationKind } from '@/utils/VaultManifestMigration';
+
+import type { VaultVersion } from '@aliasvault/vault';
/** How long the success confirmation stays up before the vault opens by itself. */
const SUCCESS_COUNTDOWN_SECONDS = 5;
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsx b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsx
index abca2c818..7090e47cb 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsx
@@ -1,3 +1,5 @@
+import EncryptionUtility, { type DecryptedEmail } from '@aliasvault/client/crypto/EncryptionUtility';
+import { decodeEmailSource, extractEmailAttachment, type ParsedEmailAttachment } from '@aliasvault/client/rust/RustCore';
import React, { useEffect, useMemo, useRef, useState, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { Link, useParams, useNavigate, useSearchParams } from 'react-router-dom';
@@ -12,15 +14,13 @@ import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';
import ConversionUtility from '@/entrypoints/popup/utils/ConversionUtility';
import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';
-import type { Email } from '@/utils/dist/core/models/webapi';
-import EncryptionUtility, { type DecryptedEmail } from '@/utils/EncryptionUtility';
-import { decodeEmailSource, extractEmailAttachment, type ParsedEmailAttachment } from '@/utils/RustCore';
-
import { useMinDurationLoading } from '@/hooks/useMinDurationLoading';
import HeaderButton from '../../components/HeaderButton';
import { HeaderIconType } from '../../components/Icons/HeaderIcons';
+import type { Email } from '@aliasvault/models/webapi';
+
/**
* Email details page.
*/
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsx
index 5d7e2a65c..d0a28a7de 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsx
@@ -1,3 +1,4 @@
+import EncryptionUtility from '@aliasvault/client/crypto/EncryptionUtility';
import React, { useEffect, useState, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { Link } from 'react-router-dom';
@@ -15,12 +16,12 @@ import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';
import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';
import { StorageKeys } from '@/utils/constants/storageKeys';
-import type { MailboxBulkRequest, MailboxBulkResponse, MailboxEmail } from '@/utils/dist/core/models/webapi';
-import EncryptionUtility from '@/utils/EncryptionUtility';
import { getStorageItem } from '@/utils/StorageUtility';
import { useMinDurationLoading } from '@/hooks/useMinDurationLoading';
+import type { MailboxBulkRequest, MailboxBulkResponse, MailboxEmail } from '@aliasvault/models/webapi';
+
/**
* Emails list page.
*/
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx
index 6570d0a28..cf0639b62 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx
@@ -1,3 +1,5 @@
+import * as RustCore from '@aliasvault/client/rust/RustCore';
+import { FieldCategories, FieldTypes, LogoKinds, ItemTypes, getSystemFieldsForItemType, getOptionalFieldsForItemType, isFieldShownByDefault, getSystemField, fieldAppliesToType } from '@aliasvault/models/vault';
import React, { useState, useEffect, useCallback, useMemo, useRef } from 'react';
import { flushSync } from 'react-dom';
import { useTranslation } from 'react-i18next';
@@ -31,15 +33,14 @@ import useItemLogo from '@/entrypoints/popup/hooks/useItemLogo';
import useServiceDetection from '@/entrypoints/popup/hooks/useServiceDetection';
import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';
-import type { DraftItem } from '@/utils/db/ItemRef';
-import type { Folder } from '@/utils/db/repositories/FolderRepository';
-import type { ItemField, ItemType, FieldType, Attachment, TotpCode, PasswordSettings } from '@/utils/dist/core/models/vault';
-import { FieldCategories, FieldTypes, LogoKinds, ItemTypes, getSystemFieldsForItemType, getOptionalFieldsForItemType, isFieldShownByDefault, getSystemField, fieldAppliesToType } from '@/utils/dist/core/models/vault';
import { FaviconService } from '@/utils/FaviconService';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
import { NavigationStateService } from '@/utils/NavigationStateService';
-import * as RustCore from '@/utils/RustCore';
+
+import type { DraftItem } from '@aliasvault/client/database/ItemRef';
+import type { Folder } from '@aliasvault/client/database/repositories/FolderRepository';
+import type { ItemField, ItemType, FieldType, Attachment, TotpCode, PasswordSettings } from '@aliasvault/models/vault';
import { browser } from '#imports';
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemDetails.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemDetails.tsx
index 9b1a839fe..b5c6f516e 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemDetails.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemDetails.tsx
@@ -1,3 +1,5 @@
+import { FieldCategories, FieldTypes, ItemTypes } from '@aliasvault/models/vault';
+import { groupFieldsByCategory } from '@aliasvault/models/vault';
import React, { useState, useEffect, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate, useParams } from 'react-router-dom';
@@ -17,12 +19,10 @@ import { useHeaderButtons } from '@/entrypoints/popup/context/HeaderButtonsConte
import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';
-import type { Item } from '@/utils/dist/core/models/vault';
-import { FieldCategories, FieldTypes, ItemTypes } from '@/utils/dist/core/models/vault';
-import { groupFieldsByCategory } from '@/utils/dist/core/models/vault';
-
import { EmailPreview } from '../../components/EmailPreview';
+import type { Item } from '@aliasvault/models/vault';
+
/**
* Item details page with dynamic field rendering.
*/
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemTypeSelector.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemTypeSelector.tsx
index f908892c7..689da7edf 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemTypeSelector.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemTypeSelector.tsx
@@ -5,7 +5,7 @@ import { useNavigate } from 'react-router-dom';
import { FormInput } from '@/entrypoints/popup/components/Forms/FormInput';
import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
-import type { ItemType } from '@/utils/dist/core/models/vault';
+import type { ItemType } from '@aliasvault/models/vault';
/**
* Item type option configuration.
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
index b3f9650ea..56ede6bf1 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
@@ -1,3 +1,6 @@
+import { canHaveSubfolders, getDescendantFolderIds, getFolderPath, getRecursiveItemCount, isSharedFolder } from '@aliasvault/client/items/FolderUtils';
+import { applySearchFilter, applyTypeFilter, isItemTypeFilter, parseItemFilterType, type ItemFilterType } from '@aliasvault/client/items/ItemFilters';
+import { multiManifestRendering } from '@aliasvault/client/sharing/MultiManifestRendering';
import React, { useState, useEffect, useCallback, useMemo, useRef } from 'react';
import { useTranslation } from 'react-i18next';
import { useLocation, useNavigate, useParams, useSearchParams } from 'react-router-dom';
@@ -25,16 +28,14 @@ import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';
import { useVaultSync } from '@/entrypoints/popup/hooks/useVaultSync';
import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';
-import type { Folder } from '@/utils/db/repositories/FolderRepository';
-import type { CredentialSortOrder } from '@/utils/db/repositories/SettingsRepository';
-import type { Item, ItemType } from '@/utils/dist/core/models/vault';
-import { canHaveSubfolders, getDescendantFolderIds, getFolderPath, getRecursiveItemCount, isSharedFolder } from '@/utils/FolderUtils';
-import { applySearchFilter, applyTypeFilter, isItemTypeFilter, parseItemFilterType, type ItemFilterType } from '@/utils/ItemFilters';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
-import { multiManifestRendering } from '@/utils/MultiManifestRendering';
import { useMinDurationLoading } from '@/hooks/useMinDurationLoading';
+import type { Folder } from '@aliasvault/client/database/repositories/FolderRepository';
+import type { CredentialSortOrder } from '@aliasvault/client/database/repositories/SettingsRepository';
+import type { Item, ItemType } from '@aliasvault/models/vault';
+
const FILTER_STORAGE_KEY = 'items-filter';
const FILTER_EXPIRY_MS = 5 * 60 * 1000; // 5 minutes
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx
index a8190eb70..81c1eba76 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx
@@ -1,3 +1,4 @@
+import { TRASH_RETENTION_DAYS } from '@aliasvault/client/constants/Vault';
import React, { useState, useEffect, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
@@ -10,12 +11,11 @@ import { useDb } from '@/entrypoints/popup/context/DbContext';
import { useHeaderButtons } from '@/entrypoints/popup/context/HeaderButtonsContext';
import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';
-import { TRASH_RETENTION_DAYS } from '@/utils/constants/vault';
-import type { Item } from '@/utils/dist/core/models/vault';
-import type { ItemFilterType } from '@/utils/ItemFilters';
-
import { useMinDurationLoading } from '@/hooks/useMinDurationLoading';
+import type { ItemFilterType } from '@aliasvault/client/items/ItemFilters';
+import type { Item } from '@aliasvault/models/vault';
+
/**
* Calculate days remaining until permanent deletion.
* @param deletedAt - ISO timestamp when item was deleted
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyAuthenticate.tsx b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyAuthenticate.tsx
index 12884ade7..76ce38049 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyAuthenticate.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyAuthenticate.tsx
@@ -1,3 +1,4 @@
+import { extractDomain } from '@aliasvault/client/rust/RustCore';
import React, { useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useLocation } from 'react-router-dom';
@@ -14,7 +15,6 @@ import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
import { buildPasskeyAssertion } from '@/utils/passkey/PasskeyAssertionService';
import { PasskeyHelper } from '@/utils/passkey/PasskeyHelper';
import type { PendingPasskeyGetRequest } from '@/utils/passkey/types';
-import { extractDomain } from '@/utils/RustCore';
import { copyTotpToClipboardIfEnabled } from '@/utils/TotpClipboard';
/**
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx
index f076eabbd..521eb877c 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx
@@ -1,3 +1,5 @@
+import { extractDomain, filterItems, AutofillMatchingMode } from '@aliasvault/client/rust/RustCore';
+import { FieldKey, ItemTypes, getFieldValue, createSystemField } from '@aliasvault/models/vault';
import React, { useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useLocation } from 'react-router-dom';
@@ -13,15 +15,14 @@ import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';
import { useVaultLockRedirect } from '@/entrypoints/popup/hooks/useVaultLockRedirect';
import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';
-import type { DraftItem } from '@/utils/db/ItemRef';
-import type { Item, Passkey } from '@/utils/dist/core/models/vault';
-import { FieldKey, ItemTypes, getFieldValue, createSystemField } from '@/utils/dist/core/models/vault';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
import { PasskeyAuthenticator } from '@/utils/passkey/PasskeyAuthenticator';
import { PasskeyHelper } from '@/utils/passkey/PasskeyHelper';
import type { CreateRequest, PasskeyCreateCredentialResponse, PendingPasskeyCreateRequest } from '@/utils/passkey/types';
-import { extractDomain, filterItems, AutofillMatchingMode } from '@/utils/RustCore';
+
+import type { DraftItem } from '@aliasvault/client/database/ItemRef';
+import type { Item, Passkey } from '@aliasvault/models/vault';
/**
* PasskeyCreate
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/AutofillSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/AutofillSettings.tsx
index ae7cca022..7a107ada1 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/AutofillSettings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/AutofillSettings.tsx
@@ -1,3 +1,4 @@
+import { AutofillMatchingMode } from '@aliasvault/client/rust/RustCore';
import React, { useEffect, useState, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
@@ -5,7 +6,6 @@ import PageTitle from '@/entrypoints/popup/components/PageTitle';
import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
-import { AutofillMatchingMode } from '@/utils/RustCore';
/**
* Autofill settings type.
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx
index ff5cce97b..ad9ef61d4 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx
@@ -1,3 +1,6 @@
+import { ApiRequestError } from '@aliasvault/client/api/errors/ApiRequestError';
+import { multiManifestRendering } from '@aliasvault/client/sharing/MultiManifestRendering';
+import { SharingService } from '@aliasvault/client/sharing/SharingService';
import React, { useCallback, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
@@ -11,11 +14,9 @@ import { useDb } from '@/entrypoints/popup/context/DbContext';
import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';
-import type { GroupInfo, GroupMemberInfo, GroupOverviewResponse, SharedManifestInfo } from '@/utils/dist/core/models/webapi';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
-import { multiManifestRendering } from '@/utils/MultiManifestRendering';
-import { SharingService } from '@/utils/SharingService';
-import { ApiRequestError } from '@/utils/types/errors/ApiRequestError';
+
+import type { GroupInfo, GroupMemberInfo, GroupOverviewResponse, SharedManifestInfo } from '@aliasvault/models/webapi';
/**
* The access removal the confirmation dialog is about.
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsx
index df59c6587..f6832806a 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/IdentityGeneratorSettings.tsx
@@ -1,3 +1,5 @@
+import * as RustCore from '@aliasvault/client/rust/RustCore';
+import { getLanguageInfo } from '@aliasvault/models/defaults';
import React, { useEffect, useState, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
@@ -6,9 +8,6 @@ import { useDb } from '@/entrypoints/popup/context/DbContext';
import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';
-import { getLanguageInfo } from '@/utils/dist/core/models/defaults';
-import * as RustCore from '@/utils/RustCore';
-
/**
* Identity Generator Settings page component.
* Allows users to configure default language, gender, and age range for identity generation.
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/PasskeySettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/PasskeySettings.tsx
index 087b3fd12..cc8224772 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/PasskeySettings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/PasskeySettings.tsx
@@ -1,3 +1,4 @@
+import { extractDomain } from '@aliasvault/client/rust/RustCore';
import React, { useEffect, useState, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
@@ -5,7 +6,6 @@ import PageTitle from '@/entrypoints/popup/components/PageTitle';
import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
-import { extractDomain } from '@/utils/RustCore';
import { browser } from "#imports";
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/PasswordGeneratorSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/PasswordGeneratorSettings.tsx
index 0d7089c27..e71227054 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/PasswordGeneratorSettings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/PasswordGeneratorSettings.tsx
@@ -9,7 +9,7 @@ import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
import { usePasswordConfig } from '@/entrypoints/popup/hooks/usePasswordConfig';
import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';
-import type { PasswordSettings } from '@/utils/dist/core/models/vault';
+import type { PasswordSettings } from '@aliasvault/models/vault';
interface IPasswordSettingsModalProps {
isOpen: boolean;
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx
index 79305d323..caa94a039 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx
@@ -1,3 +1,5 @@
+import { AppInfo } from '@aliasvault/client/platform/AppInfo';
+import { CapabilityKeys } from '@aliasvault/models/webapi';
import React, { useEffect, useCallback, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
@@ -15,9 +17,7 @@ import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';
import { useApiUrl } from '@/entrypoints/popup/utils/ApiUrlUtility';
import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';
-import { AppInfo } from '@/utils/AppInfo';
import { StorageKeys } from '@/utils/constants/storageKeys';
-import { CapabilityKeys } from '@/utils/dist/core/models/webapi';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
import { browser, storage } from "#imports";
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ActiveSessionsSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ActiveSessionsSettings.tsx
index e59cba576..17ba95a7f 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ActiveSessionsSettings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ActiveSessionsSettings.tsx
@@ -1,3 +1,4 @@
+import { toLocalDisplayFormat } from '@aliasvault/client/utilities/DateFormatter';
import React, { useCallback, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
@@ -7,8 +8,7 @@ import PageTitle from '@/entrypoints/popup/components/PageTitle';
import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';
-import { toLocalDisplayFormat } from '@/utils/DateFormatter';
-import type { RefreshToken } from '@/utils/dist/core/models/webapi';
+import type { RefreshToken } from '@aliasvault/models/webapi';
/**
* Active sessions page which lists the devices that are currently logged in and allows revoking them.
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/security/AuthLogsSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/security/AuthLogsSettings.tsx
index dd7150e63..c8cd2976f 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/security/AuthLogsSettings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/security/AuthLogsSettings.tsx
@@ -1,3 +1,5 @@
+import { toLocalDisplayFormat } from '@aliasvault/client/utilities/DateFormatter';
+import { AuthEventType } from '@aliasvault/models/webapi';
import React, { useCallback, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
@@ -6,9 +8,7 @@ import PageTitle from '@/entrypoints/popup/components/PageTitle';
import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';
-import { toLocalDisplayFormat } from '@/utils/DateFormatter';
-import type { AuthLogModel } from '@/utils/dist/core/models/webapi';
-import { AuthEventType } from '@/utils/dist/core/models/webapi';
+import type { AuthLogModel } from '@aliasvault/models/webapi';
/**
* Recent auth logs page which lists the recent authentication attempts on the account.
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ChangePasswordSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ChangePasswordSettings.tsx
index b571094df..8d0e4bb36 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ChangePasswordSettings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/security/ChangePasswordSettings.tsx
@@ -1,3 +1,5 @@
+import { ApiRequestError } from '@aliasvault/client/api/errors/ApiRequestError';
+import { IncorrectPasswordError, MasterPasswordService, PasswordChangedElsewhereError } from '@aliasvault/client/auth/MasterPasswordService';
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
@@ -11,9 +13,6 @@ import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';
import { useVaultSync } from '@/entrypoints/popup/hooks/useVaultSync';
-import { IncorrectPasswordError, MasterPasswordService, PasswordChangedElsewhereError } from '@/utils/auth/MasterPasswordService';
-import { ApiRequestError } from '@/utils/types/errors/ApiRequestError';
-
type PasswordInputProps = {
id: string;
label: string;
diff --git a/apps/browser-extension/src/entrypoints/popup/utils/ApiUrlUtility.ts b/apps/browser-extension/src/entrypoints/popup/utils/ApiUrlUtility.ts
index 88036350c..6a6b50329 100644
--- a/apps/browser-extension/src/entrypoints/popup/utils/ApiUrlUtility.ts
+++ b/apps/browser-extension/src/entrypoints/popup/utils/ApiUrlUtility.ts
@@ -1,6 +1,6 @@
+import { AppInfo } from '@aliasvault/client/platform/AppInfo';
import { useState } from 'react';
-import { AppInfo } from '@/utils/AppInfo';
import { StorageKeys } from '@/utils/constants/storageKeys';
import { storage } from '#imports';
diff --git a/apps/browser-extension/src/entrypoints/popup/utils/MobileLoginUtility.ts b/apps/browser-extension/src/entrypoints/popup/utils/MobileLoginUtility.ts
index 53111723b..bf9a4a4ec 100644
--- a/apps/browser-extension/src/entrypoints/popup/utils/MobileLoginUtility.ts
+++ b/apps/browser-extension/src/entrypoints/popup/utils/MobileLoginUtility.ts
@@ -1,12 +1,14 @@
import { Buffer } from 'buffer';
+import EncryptionUtility from '@aliasvault/client/crypto/EncryptionUtility';
+import { serverPredatesV2Api } from '@aliasvault/client/sync/LegacyStorageModelMigration';
+
import { MobileLoginErrorCode } from '@/entrypoints/popup/types/MobileLoginErrorCode';
-import type { LoginResponse, MobileLoginInitiateResponse, MobileLoginPollResponse } from '@/utils/dist/core/models/webapi';
-import EncryptionUtility from '@/utils/EncryptionUtility';
-import { serverPredatesV2Api } from '@/utils/legacy/LegacyStorageModelMigration';
import type { MobileLoginResult } from '@/utils/types/messaging/MobileLoginResult';
-import type { WebApiService } from '@/utils/WebApiService';
+
+import type { WebApiService } from '@aliasvault/client/api/WebApiService';
+import type { LoginResponse, MobileLoginInitiateResponse, MobileLoginPollResponse } from '@aliasvault/models/webapi';
/**
* Utility class for mobile login operations
diff --git a/apps/browser-extension/src/entrypoints/popup/utils/SrpUtility.ts b/apps/browser-extension/src/entrypoints/popup/utils/SrpUtility.ts
index c54b4ddf2..4bd8b2fe2 100644
--- a/apps/browser-extension/src/entrypoints/popup/utils/SrpUtility.ts
+++ b/apps/browser-extension/src/entrypoints/popup/utils/SrpUtility.ts
@@ -1,8 +1,9 @@
-import { SrpAuthService } from '@/utils/auth/SrpAuthService';
-import type { LoginResponse, ValidateLoginResponse, ValidateLoginRequest, ValidateLoginRequest2Fa, BadRequestResponse } from '@/utils/dist/core/models/webapi';
-import { throwIfServerPredatesV2Api } from '@/utils/legacy/LegacyStorageModelMigration';
-import { ApiAuthError } from '@/utils/types/errors/ApiAuthError';
-import { WebApiService } from '@/utils/WebApiService';
+import { ApiAuthError } from '@aliasvault/client/api/errors/ApiAuthError';
+import { WebApiService } from '@aliasvault/client/api/WebApiService';
+import { SrpAuthService } from '@aliasvault/client/auth/SrpAuthService';
+import { throwIfServerPredatesV2Api } from '@aliasvault/client/sync/LegacyStorageModelMigration';
+
+import type { LoginResponse, ValidateLoginResponse, ValidateLoginRequest, ValidateLoginRequest2Fa, BadRequestResponse } from '@aliasvault/models/webapi';
/**
* Utility class for SRP authentication operations.
diff --git a/apps/browser-extension/src/i18n/config.ts b/apps/browser-extension/src/i18n/config.ts
index e090a9de5..cb359c84e 100644
--- a/apps/browser-extension/src/i18n/config.ts
+++ b/apps/browser-extension/src/i18n/config.ts
@@ -3,7 +3,7 @@
* Add new languages here to make them available throughout the application
*/
-import { getLanguageInfo } from '@/utils/dist/core/models/defaults';
+import { getLanguageInfo } from '@aliasvault/models/defaults';
import daTranslations from './locales/da.json';
import deTranslations from './locales/de.json';
diff --git a/apps/browser-extension/src/migrations/0.29.7-LegacyApiUrlMigration.ts b/apps/browser-extension/src/migrations/0.29.7-LegacyApiUrlMigration.ts
index 0ef31b08e..308b401bd 100644
--- a/apps/browser-extension/src/migrations/0.29.7-LegacyApiUrlMigration.ts
+++ b/apps/browser-extension/src/migrations/0.29.7-LegacyApiUrlMigration.ts
@@ -1,4 +1,5 @@
-import { AppInfo } from '@/utils/AppInfo';
+import { AppInfo } from '@aliasvault/client/platform/AppInfo';
+
import { StorageKeys } from '@/utils/constants/storageKeys';
import { storage } from '#imports';
diff --git a/apps/browser-extension/src/utils/FaviconService.ts b/apps/browser-extension/src/utils/FaviconService.ts
index 73dc56582..406fa5ed3 100644
--- a/apps/browser-extension/src/utils/FaviconService.ts
+++ b/apps/browser-extension/src/utils/FaviconService.ts
@@ -1,10 +1,11 @@
import { Buffer } from 'buffer';
-import type { DraftItem } from '@/utils/db/ItemRef';
-import type { FaviconTarget } from '@/utils/RustCore';
-import { selectFaviconTarget, toUrlList } from '@/utils/RustCore';
-import type { SqliteClient } from '@/utils/SqliteClient';
-import type { WebApiService } from '@/utils/WebApiService';
+import { selectFaviconTarget, toUrlList } from '@aliasvault/client/rust/RustCore';
+
+import type { WebApiService } from '@aliasvault/client/api/WebApiService';
+import type { DraftItem } from '@aliasvault/client/database/ItemRef';
+import type { SqliteClient } from '@aliasvault/client/database/SqliteClient';
+import type { FaviconTarget } from '@aliasvault/client/rust/RustCore';
/**
* Result of a favicon fetch operation.
diff --git a/apps/browser-extension/src/utils/LocalPreferencesService.ts b/apps/browser-extension/src/utils/LocalPreferencesService.ts
index 5cd0c0db6..dd6a9b507 100644
--- a/apps/browser-extension/src/utils/LocalPreferencesService.ts
+++ b/apps/browser-extension/src/utils/LocalPreferencesService.ts
@@ -1,5 +1,6 @@
+import { AutofillMatchingMode } from '@aliasvault/client/rust/RustCore';
+
import { LOCAL_PREFERENCE_STORAGE_KEYS, StorageKeys } from '@/utils/constants/storageKeys';
-import { AutofillMatchingMode } from '@/utils/RustCore';
import { storage } from '#imports';
diff --git a/apps/browser-extension/src/utils/PasswordLengthSlider.ts b/apps/browser-extension/src/utils/PasswordLengthSlider.ts
index ac422338a..cbdf7bf0b 100644
--- a/apps/browser-extension/src/utils/PasswordLengthSlider.ts
+++ b/apps/browser-extension/src/utils/PasswordLengthSlider.ts
@@ -8,7 +8,7 @@
* This makes it easy to select common password lengths while still allowing
* very long passwords when needed.
*/
-import { MIN_PASSWORD_LENGTH, MAX_PASSWORD_LENGTH } from '@/utils/dist/core/models/defaults';
+import { MIN_PASSWORD_LENGTH, MAX_PASSWORD_LENGTH } from '@aliasvault/models/defaults';
/** Slider minimum value (internal representation) */
export const SLIDER_MIN = 0;
diff --git a/apps/browser-extension/src/utils/PinUnlockService.ts b/apps/browser-extension/src/utils/PinUnlockService.ts
index b5e9312bc..a60bf93b9 100644
--- a/apps/browser-extension/src/utils/PinUnlockService.ts
+++ b/apps/browser-extension/src/utils/PinUnlockService.ts
@@ -1,8 +1,8 @@
+import { argon2DeriveKey } from '@aliasvault/client/rust/RustCore';
+import { base64ToBytes, bytesToBase64 } from '@aliasvault/client/utilities/Base64';
import { browser } from 'wxt/browser';
-import { base64ToBytes, bytesToBase64 } from '@/utils/Base64';
import { PIN_STORAGE_KEYS, StorageKeys } from '@/utils/constants/storageKeys';
-import { argon2DeriveKey } from '@/utils/RustCore';
import { storage } from '#imports';
diff --git a/apps/browser-extension/src/utils/formDetector/FormFiller.ts b/apps/browser-extension/src/utils/formDetector/FormFiller.ts
index b93ce3e1d..c3c38b44d 100644
--- a/apps/browser-extension/src/utils/formDetector/FormFiller.ts
+++ b/apps/browser-extension/src/utils/formDetector/FormFiller.ts
@@ -1,9 +1,11 @@
-import { Gender, IdentityHelperUtils } from "@/utils/dist/core/models/identity";
-import type { Credential } from "@/utils/dist/core/models/vault";
+import { Gender, IdentityHelperUtils } from "@aliasvault/models/identity";
+
import { CombinedDateOptionPatterns, CombinedGenderOptionPatterns } from "@/utils/formDetector/FieldPatterns";
import { type FormFields } from "@/utils/formDetector/types/FormFields";
import { ClickValidator } from "@/utils/security/ClickValidator";
import { composedContains } from "@/utils/ShadowDom";
+
+import type { Credential } from "@aliasvault/models/vault";
/**
* Class to fill the fields of a form with the given credential.
*/
diff --git a/apps/browser-extension/src/utils/formDetector/__tests__/FormFiller.en.test.ts b/apps/browser-extension/src/utils/formDetector/__tests__/FormFiller.en.test.ts
index 0ab3b606d..9c3b2b72f 100644
--- a/apps/browser-extension/src/utils/formDetector/__tests__/FormFiller.en.test.ts
+++ b/apps/browser-extension/src/utils/formDetector/__tests__/FormFiller.en.test.ts
@@ -1,14 +1,14 @@
import { JSDOM } from 'jsdom';
import { describe, it, expect, beforeEach, vi } from 'vitest';
-import type { Credential } from '@/utils/dist/core/models/vault';
-
import { FormDetector } from '../FormDetector';
import { FormFiller } from '../FormFiller';
import { type FormFields } from '../types/FormFields';
import { setupTestDOM, createMockFormFields, createMockCredential, wasTriggerCalledFor, createDateSelects, createTestDom } from './TestUtils';
+import type { Credential } from '@aliasvault/models/vault';
+
const { window } = new JSDOM('<!DOCTYPE html>');
global.HTMLSelectElement = window.HTMLSelectElement;
global.HTMLInputElement = window.HTMLInputElement;
diff --git a/apps/browser-extension/src/utils/formDetector/__tests__/FormFiller.generic.test.ts b/apps/browser-extension/src/utils/formDetector/__tests__/FormFiller.generic.test.ts
index 8f86fbf95..7d6e7202e 100644
--- a/apps/browser-extension/src/utils/formDetector/__tests__/FormFiller.generic.test.ts
+++ b/apps/browser-extension/src/utils/formDetector/__tests__/FormFiller.generic.test.ts
@@ -1,13 +1,13 @@
import { JSDOM } from 'jsdom';
import { describe, it, expect, beforeEach, vi } from 'vitest';
-import type { Credential } from '@/utils/dist/core/models/vault';
-
import { FormFiller } from '../FormFiller';
import { type FormFields } from '../types/FormFields';
import { setupTestDOM, createMockFormFields, createMockCredential, wasTriggerCalledFor, createDateSelects } from './TestUtils';
+import type { Credential } from '@aliasvault/models/vault';
+
const { window } = new JSDOM('<!DOCTYPE html>');
global.HTMLSelectElement = window.HTMLSelectElement;
global.HTMLInputElement = window.HTMLInputElement;
diff --git a/apps/browser-extension/src/utils/formDetector/__tests__/FormFiller.nl.test.ts b/apps/browser-extension/src/utils/formDetector/__tests__/FormFiller.nl.test.ts
index 804027b6d..b48efa5af 100644
--- a/apps/browser-extension/src/utils/formDetector/__tests__/FormFiller.nl.test.ts
+++ b/apps/browser-extension/src/utils/formDetector/__tests__/FormFiller.nl.test.ts
@@ -1,14 +1,14 @@
import { JSDOM } from 'jsdom';
import { describe, it, expect, beforeEach, vi } from 'vitest';
-import type { Credential } from '@/utils/dist/core/models/vault';
-
import { FormDetector } from '../FormDetector';
import { FormFiller } from '../FormFiller';
import { type FormFields } from '../types/FormFields';
import { setupTestDOM, createMockFormFields, createMockCredential, wasTriggerCalledFor, createDateSelects, createTestDom } from './TestUtils';
+import type { Credential } from '@aliasvault/models/vault';
+
const { window } = new JSDOM('<!DOCTYPE html>');
global.HTMLSelectElement = window.HTMLSelectElement;
global.HTMLInputElement = window.HTMLInputElement;
diff --git a/apps/browser-extension/src/utils/formDetector/__tests__/TestUtils.ts b/apps/browser-extension/src/utils/formDetector/__tests__/TestUtils.ts
index b58971ef8..2c0460e26 100644
--- a/apps/browser-extension/src/utils/formDetector/__tests__/TestUtils.ts
+++ b/apps/browser-extension/src/utils/formDetector/__tests__/TestUtils.ts
@@ -1,15 +1,16 @@
import { readFileSync } from 'fs';
import { join } from 'path';
+import { Gender } from '@aliasvault/models/identity';
import { JSDOM, type DOMWindow } from 'jsdom';
import { it, expect, vi } from 'vitest';
-import { Gender } from '@/utils/dist/core/models/identity';
-import type { Credential } from '@/utils/dist/core/models/vault';
import { FormDetector } from '@/utils/formDetector/FormDetector';
import { type FormFields } from '@/utils/formDetector/types/FormFields';
import { getDeepElementById } from '@/utils/ShadowDom';
+import type { Credential } from '@aliasvault/models/vault';
+
export enum FormField {
Username = 'username',
FirstName = 'firstName',
diff --git a/apps/browser-extension/src/utils/messaging/ExtensionMessaging.ts b/apps/browser-extension/src/utils/messaging/ExtensionMessaging.ts
index 0403ca120..5753f3a08 100644
--- a/apps/browser-extension/src/utils/messaging/ExtensionMessaging.ts
+++ b/apps/browser-extension/src/utils/messaging/ExtensionMessaging.ts
@@ -20,10 +20,6 @@ export type TotpSecret = {
import type { TwoFactorState } from '@/entrypoints/background/TwoFactorStateHandler';
import type { FullVaultSyncResult, VaultManifestMigrationResult, VaultSyncPhase } from '@/entrypoints/background/VaultMessageHandler';
-import type { ItemUsageAction } from '@/utils/db';
-import type { EncryptionKeyDerivationParams } from '@/utils/dist/core/models/metadata';
-import type { PasswordSettings } from '@/utils/dist/core/models/vault';
-import type { LoginResponse } from '@/utils/dist/core/models/webapi';
import type { SavePromptPersistedState, LastAutofilledCredential } from '@/utils/loginDetector';
import type { PendingPasskeyRequest, WebAuthnSettingsResponse, WebAuthnPublicKeyGetPayload, MatchingPasskeysResponse, WebAuthnAssertionResponse } from '@/utils/passkey/types';
import type { BoolResponse } from '@/utils/types/messaging/BoolResponse';
@@ -35,8 +31,13 @@ import type { SaveLoginResponse } from '@/utils/types/messaging/SaveLoginRespons
import type { StringResponse } from '@/utils/types/messaging/StringResponse';
import type { VaultResponse } from '@/utils/types/messaging/VaultResponse';
import type { VaultUploadResponse } from '@/utils/types/messaging/VaultUploadResponse';
-import type { VaultMutationScope } from '@/utils/types/VaultMutationScope';
-import type { VaultMigrationStatus } from '@/utils/VaultManifestMigration';
+
+import type { ItemUsageAction } from '@aliasvault/client/database';
+import type { VaultMigrationStatus } from '@aliasvault/client/sync/VaultManifestMigration';
+import type { VaultMutationScope } from '@aliasvault/client/sync/VaultMutationScope';
+import type { EncryptionKeyDerivationParams } from '@aliasvault/models/metadata';
+import type { PasswordSettings } from '@aliasvault/models/vault';
+import type { LoginResponse } from '@aliasvault/models/webapi';
/* eslint-disable @typescript-eslint/no-explicit-any */
/**
diff --git a/apps/browser-extension/src/utils/passkey/PasskeyAssertionService.ts b/apps/browser-extension/src/utils/passkey/PasskeyAssertionService.ts
index 6ccb72e9c..77e5e9f83 100644
--- a/apps/browser-extension/src/utils/passkey/PasskeyAssertionService.ts
+++ b/apps/browser-extension/src/utils/passkey/PasskeyAssertionService.ts
@@ -4,8 +4,6 @@
* Shared helper that turns a stored passkey into a WebAuthn assertion response.
*/
-import type { SqliteClient } from '@/utils/SqliteClient';
-
import { PasskeyAuthenticator } from './PasskeyAuthenticator';
import { PasskeyHelper } from './PasskeyHelper';
@@ -15,6 +13,7 @@ import type {
StoredPasskeyRecord,
WebAuthnPublicKeyGetPayload
} from './types';
+import type { SqliteClient } from '@aliasvault/client/database/SqliteClient';
/**
* A pending `get` request, narrowed to the fields needed to build an assertion.
diff --git a/apps/browser-extension/src/utils/types/messaging/ItemsResponse.ts b/apps/browser-extension/src/utils/types/messaging/ItemsResponse.ts
index 4dbe71a4a..bb080a388 100644
--- a/apps/browser-extension/src/utils/types/messaging/ItemsResponse.ts
+++ b/apps/browser-extension/src/utils/types/messaging/ItemsResponse.ts
@@ -1,4 +1,4 @@
-import type { Item } from "@/utils/dist/core/models/vault";
+import type { Item } from "@aliasvault/models/vault";
export type ItemsResponse = {
success: boolean,
diff --git a/apps/browser-extension/src/utils/types/messaging/PasswordSettingsResponse.ts b/apps/browser-extension/src/utils/types/messaging/PasswordSettingsResponse.ts
index ba8afbe05..a7fffa26d 100644
--- a/apps/browser-extension/src/utils/types/messaging/PasswordSettingsResponse.ts
+++ b/apps/browser-extension/src/utils/types/messaging/PasswordSettingsResponse.ts
@@ -1,4 +1,4 @@
-import type { PasswordSettings } from "@/utils/dist/core/models/vault";
+import type { PasswordSettings } from "@aliasvault/models/vault";
export type PasswordSettingsResponse = {
success: boolean,
diff --git a/apps/browser-extension/tests/helpers/manifest-v2-api.ts b/apps/browser-extension/tests/helpers/manifest-v2-api.ts
index 9238a181c..c482c56c9 100644
--- a/apps/browser-extension/tests/helpers/manifest-v2-api.ts
+++ b/apps/browser-extension/tests/helpers/manifest-v2-api.ts
@@ -10,7 +10,7 @@
import { createHash } from 'crypto';
-import { vaultCodecPackPayload, vaultCodecUnpackPayload } from '../../src/utils/dist/core/rust/aliasvault_core.js';
+import { vaultCodecPackPayload, vaultCodecUnpackPayload } from '@aliasvault/client/wasm/aliasvault_core.js';
import { ensureRustCore } from './rust-core';
import { normalizeUsername, symmetricDecryptBytes, symmetricEncryptBytes } from './test-api';
diff --git a/apps/browser-extension/tests/helpers/rust-core.ts b/apps/browser-extension/tests/helpers/rust-core.ts
index 702f75f36..a1aedd570 100644
--- a/apps/browser-extension/tests/helpers/rust-core.ts
+++ b/apps/browser-extension/tests/helpers/rust-core.ts
@@ -5,16 +5,16 @@
import { readFileSync } from 'fs';
import { join } from 'path';
-import { initSync } from '../../src/utils/dist/core/rust/aliasvault_core.js';
+import { initSync } from '@aliasvault/client/wasm/aliasvault_core.js';
let wasmInitialized = false;
/**
- * Initializes the Rust core WASM module from the extension's dist (idempotent).
+ * Initializes the Rust core WASM module from the linked client core package (idempotent).
*/
export function ensureRustCore(): void {
if (!wasmInitialized) {
- const wasmPath = join(process.cwd(), 'src/utils/dist/core/rust/aliasvault_core_bg.wasm');
+ const wasmPath = join(process.cwd(), 'node_modules/@aliasvault/client/wasm/aliasvault_core_bg.wasm');
initSync({ module: readFileSync(wasmPath) });
wasmInitialized = true;
}
diff --git a/apps/browser-extension/tests/helpers/test-api.ts b/apps/browser-extension/tests/helpers/test-api.ts
index b9276e1aa..093b0c5cb 100644
--- a/apps/browser-extension/tests/helpers/test-api.ts
+++ b/apps/browser-extension/tests/helpers/test-api.ts
@@ -13,9 +13,9 @@ import { join } from 'path';
import Database from 'better-sqlite3';
import * as OTPAuth from 'otpauth';
-import { argon2DeriveKey, srpDerivePrivateKey, srpDeriveVerifier, srpGenerateSalt } from '../../src/utils/dist/core/rust/aliasvault_core.js';
+import { argon2DeriveKey, srpDerivePrivateKey, srpDeriveVerifier, srpGenerateSalt } from '@aliasvault/client/wasm/aliasvault_core.js';
// Get the vault schema SQL from the core vault package
-import { COMPLETE_SCHEMA_SQL, VAULT_VERSIONS } from '../../src/utils/dist/core/vault/index.mjs';
+import { COMPLETE_SCHEMA_SQL, VAULT_VERSIONS } from '../../../../core/vault/dist/index.mjs';
import { ensureRustCore } from './rust-core';