From ae9c46f8f051f6a02707a1384eb960a1fb3a2c19 Mon Sep 17 00:00:00 2001
From: vorotamoroz <vrtmrz@gmail.com>
Date: Wed, 17 Jun 2026 04:39:39 +0100
Subject: [PATCH] Fix import paths

---
 src/apps/cli/commands/p2p.ts                  |   2 +-
 src/apps/cli/commands/types.ts                |   2 +-
 src/apps/cli/main.ts                          |   6 +-
 .../managers/CLIStorageEventManagerAdapter.ts |   4 +-
 ...CLIStorageEventManagerAdapter.unit.spec.ts |   2 +-
 .../cli/managers/StorageEventManagerCLI.ts    |   4 +-
 .../cli/serviceModules/CLIServiceModules.ts   |   6 +-
 src/apps/cli/serviceModules/FileAccessCLI.ts  |   2 +-
 .../serviceModules/ServiceFileAccessImpl.ts   |   2 +-
 src/apps/cli/services/NodeServiceHub.ts       |   2 +-
 src/apps/webapp/main.ts                       |   4 +-
 .../FSAPIStorageEventManagerAdapter.ts        |   2 +-
 .../serviceModules/FSAPIServiceModules.ts     |   2 +-
 .../webapp/serviceModules/FileAccessFSAPI.ts  |   2 +-
 .../serviceModules/ServiceFileAccessImpl.ts   |   2 +-
 src/apps/webapp/test/e2e.spec.ts              |   2 +-
 src/apps/webpeer/src/P2PReplicatorShim.ts     |   4 +-
 src/apps/webpeer/src/UITest.svelte            |   2 +-
 src/common/KeyValueDB.ts                      |   2 +-
 src/common/KeyValueDBv2.ts                    |   4 +-
 src/common/events.ts                          |   4 +-
 src/common/obsidianEvents.ts                  |   4 +-
 src/common/types.ts                           |  10 +-
 src/common/utils.ts                           |  16 +-
 src/features/ConfigSync/CmdConfigSync.ts      |  36 ++--
 src/features/ConfigSync/PluginCombo.svelte    |   8 +-
 src/features/ConfigSync/PluginDialogModal.ts  |   4 +-
 src/features/ConfigSync/PluginPane.svelte     |  10 +-
 .../HiddenFileCommon/JsonResolveModal.ts      |   6 +-
 .../HiddenFileCommon/JsonResolvePane.svelte   |   8 +-
 .../HiddenFileSync/CmdHiddenFileSync.ts       |  22 +--
 src/features/LiveSyncCommands.ts              |  12 +-
 .../CmdLocalDatabaseMainte.ts                 |  10 +-
 .../P2PReplicator/P2POpenReplicationModal.ts  |   2 +-
 .../P2POpenReplicationPane.svelte             |   2 +-
 .../P2PReplicator/P2PReplicatorPane.svelte    |   4 +-
 .../P2PReplicator/P2PReplicatorPaneView.ts    |   2 +-
 .../P2PReplicator/P2PServerStatusCard.svelte  |   6 +-
 .../P2PReplicator/P2PServerStatusPaneView.ts  |   2 +-
 .../P2PReplicator/PeerStatusRow.svelte        |   8 +-
 src/lib                                       |   2 +-
 src/modules/AbstractModule.ts                 |   2 +-
 src/modules/AbstractObsidianModule.ts         |   6 +-
 src/modules/ModuleTypes.ts                    |   4 +-
 src/modules/core/ModulePeriodicProcess.ts     |   4 +-
 src/modules/core/ModuleReplicator.ts          |  12 +-
 src/modules/core/ModuleReplicatorCouchDB.ts   |  10 +-
 src/modules/core/ModuleReplicatorMinIO.ts     |  10 +-
 src/modules/core/ReplicateResultProcessor.ts  |   2 +-
 .../coreFeatures/ModuleConflictChecker.ts     |   8 +-
 .../coreFeatures/ModuleConflictResolver.ts    |  12 +-
 .../ModuleResolveMismatchedTweaks.ts          |  12 +-
 src/modules/coreObsidian/UILib/dialogs.ts     |   4 +-
 .../coreObsidian/storageLib/utilObsidian.ts   |  12 +-
 src/modules/essential/ModuleBasicMenu.ts      |   2 +-
 src/modules/essential/ModuleMigration.ts      |  20 +-
 .../APILib/ObsHttpHandler.ts                  |   2 +-
 .../essentialObsidian/ModuleObsidianEvents.ts |  12 +-
 .../essentialObsidian/ModuleObsidianMenu.ts   |   2 +-
 src/modules/extras/ModuleDev.ts               |  10 +-
 src/modules/extras/devUtil/TestPane.svelte    |   8 +-
 src/modules/extras/devUtil/TestPaneView.ts    |   4 +-
 src/modules/extras/devUtil/testUtils.ts       |   4 +-
 src/modules/extras/devUtil/tests.ts           |   2 +-
 .../DocumentHistory/DocumentHistoryModal.ts   |  18 +-
 .../GlobalHistory/GlobalHistory.svelte        |  12 +-
 .../GlobalHistory/GlobalHistoryView.ts        |   6 +-
 .../ConflictResolveModal.ts                   |  10 +-
 src/modules/features/Log/LogPane.svelte       |   6 +-
 src/modules/features/Log/LogPaneView.ts       |   4 +-
 src/modules/features/ModuleGlobalHistory.ts   |   2 +-
 .../ModuleInteractiveConflictResolver.ts      |   8 +-
 src/modules/features/ModuleLog.ts             |  18 +-
 .../features/ModuleObsidianDocumentHistory.ts |   8 +-
 .../ModuleObsidianSettingAsMarkdown.ts        |   8 +-
 .../features/ModuleObsidianSettingTab.ts      |   4 +-
 .../MultipleRegExpControl.svelte              |   4 +-
 .../ObsidianLiveSyncSettingTab.ts             |  24 +--
 .../features/SettingDialogue/PaneAdvanced.ts  |   2 +-
 .../features/SettingDialogue/PaneChangeLog.ts |   6 +-
 .../SettingDialogue/PaneCustomisationSync.ts  |   2 +-
 .../features/SettingDialogue/PaneGeneral.ts   |   4 +-
 .../SettingDialogue/PaneMaintenance.ts        |   8 +-
 .../features/SettingDialogue/PanePatches.ts   |   8 +-
 .../SettingDialogue/PanePowerUsers.ts         |   2 +-
 .../SettingDialogue/PaneRemoteConfig.ts       |  24 +--
 .../features/SettingDialogue/PaneSelector.ts  |   4 +-
 .../features/SettingDialogue/PaneSetup.ts     |  10 +-
 .../SettingDialogue/PaneSyncSettings.ts       |  13 +-
 .../features/SettingDialogue/SettingPane.ts   |   4 +-
 .../remoteConfigBuffer.unit.spec.ts           |   2 +-
 .../features/SettingDialogue/settingUtils.ts  |   9 +-
 .../SettingDialogue/utilFixCouchDBSetting.ts  |  14 +-
 src/modules/features/SetupManager.ts          |   2 +-
 .../features/SetupManager.unit.spec.ts        |   8 +-
 .../dialogs/OutroAskUserMode.svelte           |  16 +-
 .../SetupWizard/dialogs/OutroNewUser.svelte   |  12 +-
 .../dialogs/RebuildEverything.svelte          |  22 +--
 .../SetupWizard/dialogs/ScanQRCode.svelte     |  10 +-
 .../dialogs/SelectMethodExisting.svelte       |  16 +-
 .../dialogs/SelectMethodNewUser.svelte        |  16 +-
 .../SetupWizard/dialogs/SetupRemote.svelte    |  14 +-
 .../dialogs/SetupRemoteBucket.svelte          |  16 +-
 .../dialogs/SetupRemoteCouchDB.svelte         |  16 +-
 .../dialogs/SetupRemoteE2EE.svelte            |  16 +-
 .../SetupWizard/dialogs/UseSetupURI.svelte    |  14 +-
 .../SetupWizard/dialogs/utilCheckCouchDB.ts   |  14 +-
 src/modules/main/ModuleLiveSyncMain.ts        |  12 +-
 src/modules/services/ObsidianAPIService.ts    |   4 +-
 .../services/ObsidianAppLifecycleService.ts   |   4 +-
 src/modules/services/ObsidianConfirm.ts       |   8 +-
 .../services/ObsidianDatabaseService.ts       |   2 +-
 src/modules/services/ObsidianPathService.ts   |   4 +-
 .../services/ObsidianSettingService.ts        |   2 +-
 src/modules/services/ObsidianUIService.ts     |   2 +-
 src/modules/services/ObsidianVaultService.ts  |   6 +-
 src/modules/services/SvelteDialogObsidian.ts  |   2 +-
 src/serviceFeatures/redFlag.ts                |   4 +-
 src/serviceFeatures/redFlag.unit.spec.ts      |   4 +-
 src/serviceFeatures/useP2PReplicatorUI.ts     |   4 +-
 .../ObsidianConversionAdapter.ts              |   4 +-
 .../ObsidianFileSystemAdapter.ts              |   4 +-
 .../ObsidianStorageAdapter.ts                 |   6 +-
 .../ObsidianTypeGuardAdapter.ts               |   2 +-
 .../ObsidianVaultAdapter.ts                   |   6 +-
 src/types.ts                                  |   8 +-
 utilsdeno/normalise-imports.ts                | 177 ++++++++++++++++++
 127 files changed, 634 insertions(+), 467 deletions(-)
 create mode 100644 utilsdeno/normalise-imports.ts

diff --git a/src/apps/cli/commands/p2p.ts b/src/apps/cli/commands/p2p.ts
index e3297ee..f7c78e2 100644
--- a/src/apps/cli/commands/p2p.ts
+++ b/src/apps/cli/commands/p2p.ts
@@ -1,4 +1,4 @@
-import type { LiveSyncBaseCore } from "../../../LiveSyncBaseCore";
+import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 import { P2P_DEFAULT_SETTINGS } from "@lib/common/types";
 import type { ServiceContext } from "@lib/services/base/ServiceBase";
 import { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
diff --git a/src/apps/cli/commands/types.ts b/src/apps/cli/commands/types.ts
index 88c6cde..8239646 100644
--- a/src/apps/cli/commands/types.ts
+++ b/src/apps/cli/commands/types.ts
@@ -1,4 +1,4 @@
-import { LiveSyncBaseCore } from "../../../LiveSyncBaseCore";
+import { LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 import { ServiceContext } from "@lib/services/base/ServiceBase";
 import type { ObsidianLiveSyncSettings } from "@lib/common/types";
 
diff --git a/src/apps/cli/main.ts b/src/apps/cli/main.ts
index ed4cb8b..e6d878f 100644
--- a/src/apps/cli/main.ts
+++ b/src/apps/cli/main.ts
@@ -7,11 +7,11 @@ import * as fs from "fs/promises";
 import * as path from "path";
 import { NodeServiceContext, NodeServiceHub } from "./services/NodeServiceHub";
 import { configureNodeLocalStorage, ensureGlobalNodeLocalStorage } from "./services/NodeLocalStorage";
-import { LiveSyncBaseCore } from "../../LiveSyncBaseCore";
+import { LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 import { initialiseServiceModulesCLI } from "./serviceModules/CLIServiceModules";
 import { DEFAULT_SETTINGS, LOG_LEVEL_VERBOSE, type LOG_LEVEL, type ObsidianLiveSyncSettings } from "@lib/common/types";
 import type { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub";
-import type { InjectableSettingService } from "@/lib/src/services/implements/injectable/InjectableSettingService";
+import type { InjectableSettingService } from "@lib/services/implements/injectable/InjectableSettingService";
 import {
     LOG_LEVEL_DEBUG,
     setGlobalLogFunction,
@@ -26,7 +26,7 @@ import type { CLICommand, CLIOptions } from "./commands/types";
 import { getPathFromUXFileInfo } from "@lib/common/typeUtils";
 import { stripAllPrefixes } from "@lib/string_and_binary/path";
 import { IgnoreRules } from "./serviceModules/IgnoreRules";
-import { useP2PReplicatorFeature } from "@/lib/src/replication/trystero/useP2PReplicatorFeature";
+import { useP2PReplicatorFeature } from "@lib/replication/trystero/useP2PReplicatorFeature";
 
 const SETTINGS_FILE = ".livesync/settings.json";
 ensureGlobalNodeLocalStorage();
diff --git a/src/apps/cli/managers/CLIStorageEventManagerAdapter.ts b/src/apps/cli/managers/CLIStorageEventManagerAdapter.ts
index f6bc9e0..64452a5 100644
--- a/src/apps/cli/managers/CLIStorageEventManagerAdapter.ts
+++ b/src/apps/cli/managers/CLIStorageEventManagerAdapter.ts
@@ -10,12 +10,12 @@ import type {
     IStorageEventWatchHandlers,
 } from "@lib/managers/adapters";
 import type { FileEventItemSentinel } from "@lib/managers/StorageEventManager";
-import type { NodeFile, NodeFolder } from "../adapters/NodeTypes";
+import type { NodeFile, NodeFolder } from "@/apps/cli/adapters/NodeTypes";
 import type { Stats } from "fs";
 import * as fs from "fs/promises";
 import * as path from "path";
 import { watch as chokidarWatch, type FSWatcher } from "chokidar";
-import type { IgnoreRules } from "../serviceModules/IgnoreRules";
+import type { IgnoreRules } from "@/apps/cli/serviceModules/IgnoreRules";
 
 /**
  * CLI-specific type guard adapter
diff --git a/src/apps/cli/managers/CLIStorageEventManagerAdapter.unit.spec.ts b/src/apps/cli/managers/CLIStorageEventManagerAdapter.unit.spec.ts
index 5af69a9..cd3e415 100644
--- a/src/apps/cli/managers/CLIStorageEventManagerAdapter.unit.spec.ts
+++ b/src/apps/cli/managers/CLIStorageEventManagerAdapter.unit.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it, vi, beforeEach } from "vitest";
 import type { IStorageEventWatchHandlers } from "@lib/managers/adapters";
-import type { NodeFile } from "../adapters/NodeTypes";
+import type { NodeFile } from "@/apps/cli/adapters/NodeTypes";
 
 // ── chokidar mock ──────────────────────────────────────────────────────────────
 // Must be hoisted before imports that pull in chokidar.
diff --git a/src/apps/cli/managers/StorageEventManagerCLI.ts b/src/apps/cli/managers/StorageEventManagerCLI.ts
index 7838ef3..10c65ca 100644
--- a/src/apps/cli/managers/StorageEventManagerCLI.ts
+++ b/src/apps/cli/managers/StorageEventManagerCLI.ts
@@ -1,8 +1,8 @@
 import { StorageEventManagerBase, type StorageEventManagerBaseDependencies } from "@lib/managers/StorageEventManager";
 import { CLIStorageEventManagerAdapter } from "./CLIStorageEventManagerAdapter";
-import type { IMinimumLiveSyncCommands, LiveSyncBaseCore } from "../../../LiveSyncBaseCore";
+import type { IMinimumLiveSyncCommands, LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 import type { ServiceContext } from "@lib/services/base/ServiceBase";
-import type { IgnoreRules } from "../serviceModules/IgnoreRules";
+import type { IgnoreRules } from "@/apps/cli/serviceModules/IgnoreRules";
 // import type { IMinimumLiveSyncCommands } from "@lib/services/base/IService";
 
 export class StorageEventManagerCLI extends StorageEventManagerBase<CLIStorageEventManagerAdapter> {
diff --git a/src/apps/cli/serviceModules/CLIServiceModules.ts b/src/apps/cli/serviceModules/CLIServiceModules.ts
index 50d185a..22e66b5 100644
--- a/src/apps/cli/serviceModules/CLIServiceModules.ts
+++ b/src/apps/cli/serviceModules/CLIServiceModules.ts
@@ -1,13 +1,13 @@
 import type { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub";
 import { ServiceRebuilder } from "@lib/serviceModules/Rebuilder";
-import { ServiceFileHandler } from "../../../serviceModules/FileHandler";
+import { ServiceFileHandler } from "@/serviceModules/FileHandler";
 import { StorageAccessManager } from "@lib/managers/StorageProcessingManager";
-import type { LiveSyncBaseCore } from "../../../LiveSyncBaseCore";
+import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 import type { ServiceContext } from "@lib/services/base/ServiceBase";
 import { FileAccessCLI } from "./FileAccessCLI";
 import { ServiceFileAccessCLI } from "./ServiceFileAccessImpl";
 import { ServiceDatabaseFileAccessCLI } from "./DatabaseFileAccess";
-import { StorageEventManagerCLI } from "../managers/StorageEventManagerCLI";
+import { StorageEventManagerCLI } from "@/apps/cli/managers/StorageEventManagerCLI";
 import type { ServiceModules } from "@lib/interfaces/ServiceModule";
 import type { IgnoreRules } from "./IgnoreRules";
 
diff --git a/src/apps/cli/serviceModules/FileAccessCLI.ts b/src/apps/cli/serviceModules/FileAccessCLI.ts
index 3aec6e0..bfdd691 100644
--- a/src/apps/cli/serviceModules/FileAccessCLI.ts
+++ b/src/apps/cli/serviceModules/FileAccessCLI.ts
@@ -1,5 +1,5 @@
 import { FileAccessBase, type FileAccessBaseDependencies } from "@lib/serviceModules/FileAccessBase";
-import { NodeFileSystemAdapter } from "../adapters/NodeFileSystemAdapter";
+import { NodeFileSystemAdapter } from "@/apps/cli/adapters/NodeFileSystemAdapter";
 
 /**
  * CLI-specific implementation of FileAccessBase
diff --git a/src/apps/cli/serviceModules/ServiceFileAccessImpl.ts b/src/apps/cli/serviceModules/ServiceFileAccessImpl.ts
index 718fc44..f0d307a 100644
--- a/src/apps/cli/serviceModules/ServiceFileAccessImpl.ts
+++ b/src/apps/cli/serviceModules/ServiceFileAccessImpl.ts
@@ -1,5 +1,5 @@
 import { ServiceFileAccessBase, type StorageAccessBaseDependencies } from "@lib/serviceModules/ServiceFileAccessBase";
-import { NodeFileSystemAdapter } from "../adapters/NodeFileSystemAdapter";
+import { NodeFileSystemAdapter } from "@/apps/cli/adapters/NodeFileSystemAdapter";
 
 /**
  * CLI-specific implementation of ServiceFileAccess
diff --git a/src/apps/cli/services/NodeServiceHub.ts b/src/apps/cli/services/NodeServiceHub.ts
index eb2ad69..2aaa093 100644
--- a/src/apps/cli/services/NodeServiceHub.ts
+++ b/src/apps/cli/services/NodeServiceHub.ts
@@ -24,7 +24,7 @@ import type { ServiceInstances } from "@lib/services/ServiceHub";
 import { NodeKeyValueDBService } from "./NodeKeyValueDBService";
 import { NodeSettingService } from "./NodeSettingService";
 import { DatabaseService } from "@lib/services/base/DatabaseService";
-import type { ObsidianLiveSyncSettings } from "@/lib/src/common/types";
+import type { ObsidianLiveSyncSettings } from "@lib/common/types";
 
 export class NodeServiceContext extends ServiceContext {
     databasePath: string;
diff --git a/src/apps/webapp/main.ts b/src/apps/webapp/main.ts
index 2d96c83..ea32268 100644
--- a/src/apps/webapp/main.ts
+++ b/src/apps/webapp/main.ts
@@ -17,8 +17,8 @@ import { useSetupURIFeature } from "@lib/serviceFeatures/setupObsidian/setupUri"
 import { useRemoteConfiguration } from "@lib/serviceFeatures/remoteConfig";
 import { SetupManager } from "@/modules/features/SetupManager";
 import { useSetupManagerHandlersFeature } from "@/serviceFeatures/setupObsidian/setupManagerHandlers";
-import { useP2PReplicatorCommands } from "@/lib/src/replication/trystero/useP2PReplicatorCommands";
-import { useP2PReplicatorFeature } from "@/lib/src/replication/trystero/useP2PReplicatorFeature";
+import { useP2PReplicatorCommands } from "@lib/replication/trystero/useP2PReplicatorCommands";
+import { useP2PReplicatorFeature } from "@lib/replication/trystero/useP2PReplicatorFeature";
 
 const SETTINGS_DIR = ".livesync";
 const SETTINGS_FILE = "settings.json";
diff --git a/src/apps/webapp/managers/FSAPIStorageEventManagerAdapter.ts b/src/apps/webapp/managers/FSAPIStorageEventManagerAdapter.ts
index e33f5e6..b17d69e 100644
--- a/src/apps/webapp/managers/FSAPIStorageEventManagerAdapter.ts
+++ b/src/apps/webapp/managers/FSAPIStorageEventManagerAdapter.ts
@@ -10,7 +10,7 @@ import type {
     IStorageEventWatchHandlers,
 } from "@lib/managers/adapters";
 import type { FileEventItemSentinel } from "@lib/managers/StorageEventManager";
-import type { FSAPIFile, FSAPIFolder } from "../adapters/FSAPITypes";
+import type { FSAPIFile, FSAPIFolder } from "@/apps/webapp/adapters/FSAPITypes";
 
 /**
  * FileSystem API-specific type guard adapter
diff --git a/src/apps/webapp/serviceModules/FSAPIServiceModules.ts b/src/apps/webapp/serviceModules/FSAPIServiceModules.ts
index 26a0a2f..6e99bd1 100644
--- a/src/apps/webapp/serviceModules/FSAPIServiceModules.ts
+++ b/src/apps/webapp/serviceModules/FSAPIServiceModules.ts
@@ -7,7 +7,7 @@ import type { ServiceContext } from "@lib/services/base/ServiceBase";
 import { FileAccessFSAPI } from "./FileAccessFSAPI";
 import { ServiceFileAccessFSAPI } from "./ServiceFileAccessImpl";
 import { ServiceDatabaseFileAccessFSAPI } from "./DatabaseFileAccess";
-import { StorageEventManagerFSAPI } from "../managers/StorageEventManagerFSAPI";
+import { StorageEventManagerFSAPI } from "@/apps/webapp/managers/StorageEventManagerFSAPI";
 import type { ServiceModules } from "@lib/interfaces/ServiceModule";
 import { ServiceFileHandler } from "@/serviceModules/FileHandler";
 
diff --git a/src/apps/webapp/serviceModules/FileAccessFSAPI.ts b/src/apps/webapp/serviceModules/FileAccessFSAPI.ts
index 9d1561e..0ae67a8 100644
--- a/src/apps/webapp/serviceModules/FileAccessFSAPI.ts
+++ b/src/apps/webapp/serviceModules/FileAccessFSAPI.ts
@@ -1,5 +1,5 @@
 import { FileAccessBase, type FileAccessBaseDependencies } from "@lib/serviceModules/FileAccessBase";
-import { FSAPIFileSystemAdapter } from "../adapters/FSAPIFileSystemAdapter";
+import { FSAPIFileSystemAdapter } from "@/apps/webapp/adapters/FSAPIFileSystemAdapter";
 
 /**
  * FileSystem API-specific implementation of FileAccessBase
diff --git a/src/apps/webapp/serviceModules/ServiceFileAccessImpl.ts b/src/apps/webapp/serviceModules/ServiceFileAccessImpl.ts
index f5396e2..62fea06 100644
--- a/src/apps/webapp/serviceModules/ServiceFileAccessImpl.ts
+++ b/src/apps/webapp/serviceModules/ServiceFileAccessImpl.ts
@@ -1,5 +1,5 @@
 import { ServiceFileAccessBase, type StorageAccessBaseDependencies } from "@lib/serviceModules/ServiceFileAccessBase";
-import { FSAPIFileSystemAdapter } from "../adapters/FSAPIFileSystemAdapter";
+import { FSAPIFileSystemAdapter } from "@/apps/webapp/adapters/FSAPIFileSystemAdapter";
 
 /**
  * FileSystem API-specific implementation of ServiceFileAccess
diff --git a/src/apps/webapp/test/e2e.spec.ts b/src/apps/webapp/test/e2e.spec.ts
index ac83045..72c8343 100644
--- a/src/apps/webapp/test/e2e.spec.ts
+++ b/src/apps/webapp/test/e2e.spec.ts
@@ -17,7 +17,7 @@
  */
 
 import { test, expect, type BrowserContext, type Page, type TestInfo } from "@playwright/test";
-import type { LiveSyncTestAPI } from "../test-entry";
+import type { LiveSyncTestAPI } from "@/apps/webapp/test-entry";
 import { mkdirSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
diff --git a/src/apps/webpeer/src/P2PReplicatorShim.ts b/src/apps/webpeer/src/P2PReplicatorShim.ts
index 45b7631..11c9a9c 100644
--- a/src/apps/webpeer/src/P2PReplicatorShim.ts
+++ b/src/apps/webpeer/src/P2PReplicatorShim.ts
@@ -28,8 +28,8 @@ import { ServiceContext } from "@lib/services/base/ServiceBase";
 import type { InjectableServiceHub } from "@lib/services/InjectableServices";
 import { Menu } from "@lib/services/implements/browser/Menu";
 import { SimpleStoreIDBv2 } from "octagonal-wheels/databases/SimpleStoreIDBv2";
-import type { BrowserAPIService } from "@/lib/src/services/implements/browser/BrowserAPIService";
-import type { InjectableSettingService } from "@/lib/src/services/implements/injectable/InjectableSettingService";
+import type { BrowserAPIService } from "@lib/services/implements/browser/BrowserAPIService";
+import type { InjectableSettingService } from "@lib/services/implements/injectable/InjectableSettingService";
 import { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
 
 function addToList(item: string, list: string) {
diff --git a/src/apps/webpeer/src/UITest.svelte b/src/apps/webpeer/src/UITest.svelte
index 8cd83fc..0e6af79 100644
--- a/src/apps/webpeer/src/UITest.svelte
+++ b/src/apps/webpeer/src/UITest.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Menu } from "@/lib/src/services/implements/browser/Menu";
+    import { Menu } from "@lib/services/implements/browser/Menu";
     import { getDialogContext } from "@lib/services/implements/base/SvelteDialog";
     let result = $state<string | boolean>("");
 
diff --git a/src/common/KeyValueDB.ts b/src/common/KeyValueDB.ts
index 3b02e07..64e8398 100644
--- a/src/common/KeyValueDB.ts
+++ b/src/common/KeyValueDB.ts
@@ -1,5 +1,5 @@
 import { deleteDB, type IDBPDatabase, openDB } from "idb";
-import type { KeyValueDatabase } from "../lib/src/interfaces/KeyValueDatabase.ts";
+import type { KeyValueDatabase } from "@lib/interfaces/KeyValueDatabase.ts";
 import { serialized } from "octagonal-wheels/concurrency/lock";
 import { Logger } from "octagonal-wheels/common/logger";
 const databaseCache: { [key: string]: IDBPDatabase<any> } = {};
diff --git a/src/common/KeyValueDBv2.ts b/src/common/KeyValueDBv2.ts
index 66f0d46..ef9d305 100644
--- a/src/common/KeyValueDBv2.ts
+++ b/src/common/KeyValueDBv2.ts
@@ -1,5 +1,5 @@
-import { LOG_LEVEL_VERBOSE, Logger } from "@/lib/src/common/logger";
-import type { KeyValueDatabase } from "@/lib/src/interfaces/KeyValueDatabase";
+import { LOG_LEVEL_VERBOSE, Logger } from "@lib/common/logger";
+import type { KeyValueDatabase } from "@lib/interfaces/KeyValueDatabase";
 import { deleteDB, openDB, type IDBPDatabase } from "idb";
 import { serialized } from "octagonal-wheels/concurrency/lock";
 
diff --git a/src/common/events.ts b/src/common/events.ts
index 985ae94..3716667 100644
--- a/src/common/events.ts
+++ b/src/common/events.ts
@@ -1,4 +1,4 @@
-import { eventHub } from "../lib/src/hub/hub";
+import { eventHub } from "@lib/hub/hub";
 // import type ObsidianLiveSyncPlugin from "../main";
 
 export const EVENT_PLUGIN_LOADED = "plugin-loaded";
@@ -43,5 +43,5 @@ declare global {
     }
 }
 
-export * from "../lib/src/events/coreEvents.ts";
+export * from "@lib/events/coreEvents.ts";
 export { eventHub };
diff --git a/src/common/obsidianEvents.ts b/src/common/obsidianEvents.ts
index 7b3b821..b3281c2 100644
--- a/src/common/obsidianEvents.ts
+++ b/src/common/obsidianEvents.ts
@@ -1,5 +1,5 @@
-import type { TFile } from "../deps";
-import type { FilePathWithPrefix, LoadedEntry } from "../lib/src/common/types";
+import type { TFile } from "@/deps";
+import type { FilePathWithPrefix, LoadedEntry } from "@lib/common/types";
 
 export const EVENT_REQUEST_SHOW_HISTORY = "show-history";
 
diff --git a/src/common/types.ts b/src/common/types.ts
index c7b903c..eea423c 100644
--- a/src/common/types.ts
+++ b/src/common/types.ts
@@ -1,6 +1,6 @@
-import { type PluginManifest, TFile } from "../deps.ts";
-import { type DatabaseEntry, type EntryBody, type FilePath } from "../lib/src/common/types.ts";
-export type { CacheData, FileEventItem } from "../lib/src/common/types.ts";
+import { type PluginManifest, TFile } from "@/deps.ts";
+import { type DatabaseEntry, type EntryBody, type FilePath } from "@lib/common/types.ts";
+export type { CacheData, FileEventItem } from "@lib/common/types.ts";
 
 export interface PluginDataEntry extends DatabaseEntry {
     deviceVaultName: string;
@@ -51,7 +51,7 @@ export type queueItem = {
 
 export const FileWatchEventQueueMax = 10;
 
-export { configURIBase, configURIBaseQR } from "../lib/src/common/types.ts";
+export { configURIBase, configURIBaseQR } from "@lib/common/types.ts";
 
 export {
     CHeader,
@@ -61,4 +61,4 @@ export {
     ICHeaderEnd,
     ICHeaderLength,
     ICXHeader,
-} from "../lib/src/common/models/fileaccess.const.ts";
+} from "@lib/common/models/fileaccess.const.ts";
diff --git a/src/common/utils.ts b/src/common/utils.ts
index 829d608..8987694 100644
--- a/src/common/utils.ts
+++ b/src/common/utils.ts
@@ -1,4 +1,4 @@
-import { normalizePath, Platform, TAbstractFile, type RequestUrlParam, requestUrl } from "../deps.ts";
+import { normalizePath, Platform, TAbstractFile, type RequestUrlParam, requestUrl } from "@/deps.ts";
 import {
     path2id_base,
     id2path_base,
@@ -7,9 +7,9 @@ import {
     isValidFilenameInWidows,
     isValidFilenameInAndroid,
     stripAllPrefixes,
-} from "../lib/src/string_and_binary/path.ts";
+} from "@lib/string_and_binary/path.ts";
 
-import { Logger } from "../lib/src/common/logger.ts";
+import { Logger } from "@lib/common/logger.ts";
 import {
     LOG_LEVEL_INFO,
     LOG_LEVEL_NOTICE,
@@ -22,14 +22,14 @@ import {
     type FilePathWithPrefix,
     type UXFileInfo,
     type UXFileInfoStub,
-} from "../lib/src/common/types.ts";
+} from "@lib/common/types.ts";
 export { ICHeader, ICXHeader } from "./types.ts";
-import { writeString } from "../lib/src/string_and_binary/convert.ts";
+import { writeString } from "@lib/string_and_binary/convert.ts";
 import { sameChangePairs } from "./stores.ts";
 
 import { scheduleTask } from "octagonal-wheels/concurrency/task";
-import { AuthorizationHeaderGenerator } from "../lib/src/replication/httplib.ts";
-import type { KeyValueDatabase } from "../lib/src/interfaces/KeyValueDatabase.ts";
+import { AuthorizationHeaderGenerator } from "@lib/replication/httplib.ts";
+import type { KeyValueDatabase } from "@lib/interfaces/KeyValueDatabase.ts";
 
 export { scheduleTask, cancelTask, cancelAllTasks } from "octagonal-wheels/concurrency/task";
 
@@ -214,7 +214,7 @@ import { BASE_IS_NEW, EVEN, TARGET_IS_NEW } from "@lib/common/models/shared.cons
 export { BASE_IS_NEW, EVEN, TARGET_IS_NEW };
 // Why 2000? : ZIP FILE Does not have enough resolution.
 import { compareMTime } from "@lib/common/utils.ts";
-import { _fetch } from "@/lib/src/common/coreEnvFunctions.ts";
+import { _fetch } from "@lib/common/coreEnvFunctions.ts";
 export { compareMTime };
 function getKey(file: AnyEntry | string | UXFileInfoStub) {
     const key = typeof file == "string" ? file : stripAllPrefixes(file.path);
diff --git a/src/features/ConfigSync/CmdConfigSync.ts b/src/features/ConfigSync/CmdConfigSync.ts
index 585ef5c..a07e1f4 100644
--- a/src/features/ConfigSync/CmdConfigSync.ts
+++ b/src/features/ConfigSync/CmdConfigSync.ts
@@ -8,7 +8,7 @@ import {
     diff_match_patch,
     Platform,
     addIcon,
-} from "../../deps.ts";
+} from "@/deps.ts";
 
 import type {
     EntryDoc,
@@ -19,7 +19,7 @@ import type {
     AnyEntry,
     SavingEntry,
     diff_result,
-} from "../../lib/src/common/types.ts";
+} from "@lib/common/types.ts";
 import {
     CANCELLED,
     LEAVE_TO_SUBSEQUENT,
@@ -29,8 +29,8 @@ import {
     LOG_LEVEL_VERBOSE,
     MODE_SELECTIVE,
     MODE_SHINY,
-} from "../../lib/src/common/types.ts";
-import { ICXHeader, PERIODIC_PLUGIN_SWEEP } from "../../common/types.ts";
+} from "@lib/common/types.ts";
+import { ICXHeader, PERIODIC_PLUGIN_SWEEP } from "@/common/types.ts";
 import {
     createBlob,
     createSavingEntryFromLoadedEntry,
@@ -42,12 +42,12 @@ import {
     isDocContentSame,
     isLoadedEntry,
     isObjectDifferent,
-} from "../../lib/src/common/utils.ts";
-import { digestHash } from "../../lib/src/string_and_binary/hash.ts";
-import { arrayBufferToBase64, decodeBinary, readString } from "../../lib/src/string_and_binary/convert.ts";
+} from "@lib/common/utils.ts";
+import { digestHash } from "@lib/string_and_binary/hash.ts";
+import { arrayBufferToBase64, decodeBinary, readString } from "@lib/string_and_binary/convert.ts";
 import { serialized, shareRunningResult } from "octagonal-wheels/concurrency/lock";
-import { LiveSyncCommands } from "../LiveSyncCommands.ts";
-import { stripAllPrefixes } from "../../lib/src/string_and_binary/path.ts";
+import { LiveSyncCommands } from "@/features/LiveSyncCommands.ts";
+import { stripAllPrefixes } from "@lib/string_and_binary/path.ts";
 import {
     EVEN,
     disposeMemoObject,
@@ -57,20 +57,20 @@ import {
     memoObject,
     retrieveMemoObject,
     scheduleTask,
-} from "../../common/utils.ts";
+} from "@/common/utils.ts";
 import { PeriodicProcessor } from "@/common/PeriodicProcessor.ts";
-import { JsonResolveModal } from "../HiddenFileCommon/JsonResolveModal.ts";
+import { JsonResolveModal } from "@/features/HiddenFileCommon/JsonResolveModal.ts";
 import { QueueProcessor } from "octagonal-wheels/concurrency/processor";
-import { pluginScanningCount } from "../../lib/src/mock_and_interop/stores.ts";
-import type ObsidianLiveSyncPlugin from "../../main.ts";
+import { pluginScanningCount } from "@lib/mock_and_interop/stores.ts";
+import type ObsidianLiveSyncPlugin from "@/main.ts";
 import { base64ToArrayBuffer, base64ToString } from "octagonal-wheels/binary/base64";
-import { ConflictResolveModal } from "../../modules/features/InteractiveConflictResolving/ConflictResolveModal.ts";
+import { ConflictResolveModal } from "@/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts";
 import { Semaphore } from "octagonal-wheels/concurrency/semaphore";
-import { EVENT_REQUEST_OPEN_PLUGIN_SYNC_DIALOG, eventHub } from "../../common/events.ts";
+import { EVENT_REQUEST_OPEN_PLUGIN_SYNC_DIALOG, eventHub } from "@/common/events.ts";
 import { PluginDialogModal } from "./PluginDialogModal.ts";
-import { $msg } from "@/lib/src/common/i18n.ts";
-import type { InjectableServiceHub } from "../../lib/src/services/InjectableServices.ts";
-import type { LiveSyncCore } from "../../main.ts";
+import { $msg } from "@lib/common/i18n.ts";
+import type { InjectableServiceHub } from "@lib/services/InjectableServices.ts";
+import type { LiveSyncCore } from "@/main.ts";
 import { LiveSyncError } from "@lib/common/LSError.ts";
 
 const d = "\u200b";
diff --git a/src/features/ConfigSync/PluginCombo.svelte b/src/features/ConfigSync/PluginCombo.svelte
index e2b7dc4..555a13b 100644
--- a/src/features/ConfigSync/PluginCombo.svelte
+++ b/src/features/ConfigSync/PluginCombo.svelte
@@ -5,10 +5,10 @@
         type IPluginDataExDisplay,
         type PluginDataExFile,
     } from "./CmdConfigSync.ts";
-    import { Logger } from "../../lib/src/common/logger";
-    import { type FilePath, LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "../../lib/src/common/types";
-    import { getDocData, timeDeltaToHumanReadable, unique } from "../../lib/src/common/utils";
-    import type ObsidianLiveSyncPlugin from "../../main";
+    import { Logger } from "@lib/common/logger";
+    import { type FilePath, LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/types";
+    import { getDocData, timeDeltaToHumanReadable, unique } from "@lib/common/utils";
+    import type ObsidianLiveSyncPlugin from "@/main";
     // import { askString } from "../../common/utils";
     import { Menu } from "@/deps.ts";
 
diff --git a/src/features/ConfigSync/PluginDialogModal.ts b/src/features/ConfigSync/PluginDialogModal.ts
index 08825ba..fd79981 100644
--- a/src/features/ConfigSync/PluginDialogModal.ts
+++ b/src/features/ConfigSync/PluginDialogModal.ts
@@ -1,6 +1,6 @@
 import { mount, unmount } from "svelte";
-import { App, Modal } from "../../deps.ts";
-import ObsidianLiveSyncPlugin from "../../main.ts";
+import { App, Modal } from "@/deps.ts";
+import ObsidianLiveSyncPlugin from "@/main.ts";
 import PluginPane from "./PluginPane.svelte";
 export class PluginDialogModal extends Modal {
     plugin: ObsidianLiveSyncPlugin;
diff --git a/src/features/ConfigSync/PluginPane.svelte b/src/features/ConfigSync/PluginPane.svelte
index 5b0a167..33d2b34 100644
--- a/src/features/ConfigSync/PluginPane.svelte
+++ b/src/features/ConfigSync/PluginPane.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { onMount } from "svelte";
-    import ObsidianLiveSyncPlugin from "../../main";
+    import ObsidianLiveSyncPlugin from "@/main";
     import {
         ConfigSync,
         type IPluginDataExDisplay,
@@ -11,16 +11,16 @@
     } from "./CmdConfigSync.ts";
     import PluginCombo from "./PluginCombo.svelte";
     import { Menu, type PluginManifest } from "@/deps.ts";
-    import { unique } from "../../lib/src/common/utils";
+    import { unique } from "@lib/common/utils";
     import {
         MODE_SELECTIVE,
         MODE_AUTOMATIC,
         MODE_PAUSED,
         type SYNC_MODE,
         MODE_SHINY,
-    } from "../../lib/src/common/types";
-    import { normalizePath } from "../../deps";
-    import { HiddenFileSync } from "../HiddenFileSync/CmdHiddenFileSync.ts";
+    } from "@lib/common/types";
+    import { normalizePath } from "@/deps";
+    import { HiddenFileSync } from "@/features/HiddenFileSync/CmdHiddenFileSync.ts";
     import { LOG_LEVEL_NOTICE, Logger } from "octagonal-wheels/common/logger";
     import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore.ts";
     export let plugin: ObsidianLiveSyncPlugin;
diff --git a/src/features/HiddenFileCommon/JsonResolveModal.ts b/src/features/HiddenFileCommon/JsonResolveModal.ts
index c10baab..e03b7ff 100644
--- a/src/features/HiddenFileCommon/JsonResolveModal.ts
+++ b/src/features/HiddenFileCommon/JsonResolveModal.ts
@@ -1,7 +1,7 @@
-import { App, Modal } from "../../deps.ts";
-import { type FilePath, type LoadedEntry } from "../../lib/src/common/types.ts";
+import { App, Modal } from "@/deps.ts";
+import { type FilePath, type LoadedEntry } from "@lib/common/types.ts";
 import JsonResolvePane from "./JsonResolvePane.svelte";
-import { waitForSignal } from "../../lib/src/common/utils.ts";
+import { waitForSignal } from "@lib/common/utils.ts";
 import { mount, unmount } from "svelte";
 
 export class JsonResolveModal extends Modal {
diff --git a/src/features/HiddenFileCommon/JsonResolvePane.svelte b/src/features/HiddenFileCommon/JsonResolvePane.svelte
index a950bf9..9149214 100644
--- a/src/features/HiddenFileCommon/JsonResolvePane.svelte
+++ b/src/features/HiddenFileCommon/JsonResolvePane.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-    import { type Diff, DIFF_DELETE, DIFF_INSERT, diff_match_patch } from "../../deps.ts";
-    import type { FilePath, LoadedEntry } from "../../lib/src/common/types.ts";
-    import { decodeBinary, readString } from "../../lib/src/string_and_binary/convert.ts";
-    import { getDocData, isObjectDifferent, mergeObject } from "../../lib/src/common/utils.ts";
+    import { type Diff, DIFF_DELETE, DIFF_INSERT, diff_match_patch } from "@/deps.ts";
+    import type { FilePath, LoadedEntry } from "@lib/common/types.ts";
+    import { decodeBinary, readString } from "@lib/string_and_binary/convert.ts";
+    import { getDocData, isObjectDifferent, mergeObject } from "@lib/common/utils.ts";
 
     interface Props {
         docs?: LoadedEntry[];
diff --git a/src/features/HiddenFileSync/CmdHiddenFileSync.ts b/src/features/HiddenFileSync/CmdHiddenFileSync.ts
index 3c086d6..20ef7c3 100644
--- a/src/features/HiddenFileSync/CmdHiddenFileSync.ts
+++ b/src/features/HiddenFileSync/CmdHiddenFileSync.ts
@@ -1,4 +1,4 @@
-import { type PluginManifest, type ListedFiles } from "../../deps.ts";
+import { type PluginManifest, type ListedFiles } from "@/deps.ts";
 import {
     type LoadedEntry,
     type FilePathWithPrefix,
@@ -15,8 +15,8 @@ import {
     LOG_LEVEL_DEBUG,
     type MetaEntry,
     type UXDataWriteOptions,
-} from "../../lib/src/common/types.ts";
-import { type InternalFileInfo, ICHeader, ICHeaderEnd } from "../../common/types.ts";
+} from "@lib/common/types.ts";
+import { type InternalFileInfo, ICHeader, ICHeaderEnd } from "@/common/types.ts";
 import {
     readAsBlob,
     isDocContentSame,
@@ -26,7 +26,7 @@ import {
     fireAndForget,
     type CustomRegExp,
     getFileRegExp,
-} from "../../lib/src/common/utils.ts";
+} from "@lib/common/utils.ts";
 import {
     compareMTime,
     isInternalMetadata,
@@ -39,17 +39,17 @@ import {
     BASE_IS_NEW,
     EVEN,
     displayRev,
-} from "../../common/utils.ts";
+} from "@/common/utils.ts";
 import { PeriodicProcessor } from "@/common/PeriodicProcessor.ts";
 import { serialized, skipIfDuplicated } from "octagonal-wheels/concurrency/lock";
-import { JsonResolveModal } from "../HiddenFileCommon/JsonResolveModal.ts";
-import { LiveSyncCommands } from "../LiveSyncCommands.ts";
-import { addPrefix, stripAllPrefixes } from "../../lib/src/string_and_binary/path.ts";
+import { JsonResolveModal } from "@/features/HiddenFileCommon/JsonResolveModal.ts";
+import { LiveSyncCommands } from "@/features/LiveSyncCommands.ts";
+import { addPrefix, stripAllPrefixes } from "@lib/string_and_binary/path.ts";
 import { QueueProcessor } from "octagonal-wheels/concurrency/processor";
-import { hiddenFilesEventCount, hiddenFilesProcessingCount } from "../../lib/src/mock_and_interop/stores.ts";
-import { EVENT_SETTING_SAVED, eventHub } from "../../common/events.ts";
+import { hiddenFilesEventCount, hiddenFilesProcessingCount } from "@lib/mock_and_interop/stores.ts";
+import { EVENT_SETTING_SAVED, eventHub } from "@/common/events.ts";
 import { Semaphore } from "octagonal-wheels/concurrency/semaphore";
-import type { LiveSyncCore } from "../../main.ts";
+import type { LiveSyncCore } from "@/main.ts";
 import { tryGetFilePath } from "@lib/common/utils.doc.ts";
 type SyncDirection = "push" | "pull" | "safe" | "pullForce" | "pushForce";
 
diff --git a/src/features/LiveSyncCommands.ts b/src/features/LiveSyncCommands.ts
index 2f79fc9..6eb163b 100644
--- a/src/features/LiveSyncCommands.ts
+++ b/src/features/LiveSyncCommands.ts
@@ -7,12 +7,12 @@ import {
     type FilePath,
     type FilePathWithPrefix,
     type LOG_LEVEL,
-} from "../lib/src/common/types.ts";
-import type ObsidianLiveSyncPlugin from "../main.ts";
-import { MARK_DONE } from "../modules/features/ModuleLog.ts";
-import type { LiveSyncCore } from "../main.ts";
-import { __$checkInstanceBinding } from "../lib/src/dev/checks.ts";
-import { createInstanceLogFunction } from "@/lib/src/services/lib/logUtils.ts";
+} from "@lib/common/types.ts";
+import type ObsidianLiveSyncPlugin from "@/main.ts";
+import { MARK_DONE } from "@/modules/features/ModuleLog.ts";
+import type { LiveSyncCore } from "@/main.ts";
+import { __$checkInstanceBinding } from "@lib/dev/checks.ts";
+import { createInstanceLogFunction } from "@lib/services/lib/logUtils.ts";
 
 let noticeIndex = 0;
 export abstract class LiveSyncCommands {
diff --git a/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts b/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts
index 54eb7aa..42e9096 100644
--- a/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts
+++ b/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts
@@ -9,14 +9,14 @@ import {
     type EntryLeaf,
     type FilePathWithPrefix,
     type MetaEntry,
-} from "../../lib/src/common/types";
-import { getNoFromRev } from "../../lib/src/pouchdb/LiveSyncLocalDB";
-import { LiveSyncCommands } from "../LiveSyncCommands";
+} from "@lib/common/types";
+import { getNoFromRev } from "@lib/pouchdb/LiveSyncLocalDB";
+import { LiveSyncCommands } from "@/features/LiveSyncCommands";
 import { serialized } from "octagonal-wheels/concurrency/lock_v2";
 import { arrayToChunkedArray } from "octagonal-wheels/collection";
 import { EVENT_ANALYSE_DB_USAGE, EVENT_REQUEST_PERFORM_GC_V3, eventHub } from "@/common/events";
-import type { LiveSyncCouchDBReplicator } from "@/lib/src/replication/couchdb/LiveSyncReplicator";
-import { delay } from "@/lib/src/common/utils";
+import type { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator";
+import { delay } from "@lib/common/utils";
 // import { _requestToCouchDB } from "@/common/utils";
 const DB_KEY_SEQ = "gc-seq";
 const DB_KEY_CHUNK_SET = "chunk-set";
diff --git a/src/features/P2PSync/P2PReplicator/P2POpenReplicationModal.ts b/src/features/P2PSync/P2PReplicator/P2POpenReplicationModal.ts
index aa2cd94..8c17c31 100644
--- a/src/features/P2PSync/P2PReplicator/P2POpenReplicationModal.ts
+++ b/src/features/P2PSync/P2PReplicator/P2POpenReplicationModal.ts
@@ -1,7 +1,7 @@
 import { App, Modal } from "@/deps.ts";
 import P2POpenReplicationPane from "./P2POpenReplicationPane.svelte";
 import { mount, unmount } from "svelte";
-import type { LiveSyncTrysteroReplicator } from "@/lib/src/replication/trystero/LiveSyncTrysteroReplicator";
+import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
 
 export type P2POpenReplicationModalCallback = {
     onSync: (peerId: string) => Promise<void>;
diff --git a/src/features/P2PSync/P2PReplicator/P2POpenReplicationPane.svelte b/src/features/P2PSync/P2PReplicator/P2POpenReplicationPane.svelte
index 58c7e99..159ad25 100644
--- a/src/features/P2PSync/P2PReplicator/P2POpenReplicationPane.svelte
+++ b/src/features/P2PSync/P2PReplicator/P2POpenReplicationPane.svelte
@@ -9,7 +9,7 @@
     // import type { TrysteroReplicator } from "@lib/replication/trystero/TrysteroReplicator";
     import { LOG_LEVEL_NOTICE, LOG_LEVEL_INFO } from "@lib/common/types";
     import { Logger } from "@lib/common/logger";
-    import type { LiveSyncTrysteroReplicator } from "@/lib/src/replication/trystero/LiveSyncTrysteroReplicator";
+    import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
     import { delay, fireAndForget } from "octagonal-wheels/promises";
     import P2PServerStatusCard from "./P2PServerStatusCard.svelte";
 
diff --git a/src/features/P2PSync/P2PReplicator/P2PReplicatorPane.svelte b/src/features/P2PSync/P2PReplicator/P2PReplicatorPane.svelte
index 948a20e..5987746 100644
--- a/src/features/P2PSync/P2PReplicator/P2PReplicatorPane.svelte
+++ b/src/features/P2PSync/P2PReplicator/P2PReplicatorPane.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
     import { onMount, setContext } from "svelte";
-    import { AutoAccepting, DEFAULT_SETTINGS, type P2PSyncSetting } from "../../../lib/src/common/types";
+    import { AutoAccepting, DEFAULT_SETTINGS, type P2PSyncSetting } from "@lib/common/types";
     import {
         AcceptedStatus,
         ConnectionStatus,
         type PeerStatus,
     } from "@lib/replication/trystero/P2PReplicatorPaneCommon";
     import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
-    import PeerStatusRow from "../P2PReplicator/PeerStatusRow.svelte";
+    import PeerStatusRow from "@/features/P2PSync/P2PReplicator/PeerStatusRow.svelte";
     import { EVENT_LAYOUT_READY, eventHub } from "@/common/events";
     import {
         type PeerInfo,
diff --git a/src/features/P2PSync/P2PReplicator/P2PReplicatorPaneView.ts b/src/features/P2PSync/P2PReplicator/P2PReplicatorPaneView.ts
index 30073ad..93a5837 100644
--- a/src/features/P2PSync/P2PReplicator/P2PReplicatorPaneView.ts
+++ b/src/features/P2PSync/P2PReplicator/P2PReplicatorPaneView.ts
@@ -9,7 +9,7 @@ import { LOG_LEVEL_NOTICE, REMOTE_P2P } from "@lib/common/types.ts";
 import { Logger } from "@lib/common/logger.ts";
 import { EVENT_P2P_PEER_SHOW_EXTRA_MENU, type PeerStatus } from "@lib/replication/trystero/P2PReplicatorPaneCommon.ts";
 import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore.ts";
-import type { P2PPaneParams } from "@/lib/src/replication/trystero/UseP2PReplicatorResult";
+import type { P2PPaneParams } from "@lib/replication/trystero/UseP2PReplicatorResult";
 export const VIEW_TYPE_P2P = "p2p-replicator";
 
 function addToList(item: string, list: string) {
diff --git a/src/features/P2PSync/P2PReplicator/P2PServerStatusCard.svelte b/src/features/P2PSync/P2PReplicator/P2PServerStatusCard.svelte
index 0d8aad6..2dc4592 100644
--- a/src/features/P2PSync/P2PReplicator/P2PServerStatusCard.svelte
+++ b/src/features/P2PSync/P2PReplicator/P2PServerStatusCard.svelte
@@ -9,9 +9,9 @@
         EVENT_P2P_REPLICATOR_STATUS,
     } from "@lib/replication/trystero/TrysteroReplicatorP2PServer";
     import { EVENT_SETTING_SAVED } from "@lib/events/coreEvents";
-    import type { LiveSyncTrysteroReplicator } from "@/lib/src/replication/trystero/LiveSyncTrysteroReplicator";
-    import type { P2PReplicatorStatus } from "@/lib/src/replication/trystero/TrysteroReplicator";
-    import { extractP2PRoomSuffix } from "@/lib/src/common/utils";
+    import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
+    import type { P2PReplicatorStatus } from "@lib/replication/trystero/TrysteroReplicator";
+    import { extractP2PRoomSuffix } from "@lib/common/utils";
     import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 
     interface Props {
diff --git a/src/features/P2PSync/P2PReplicator/P2PServerStatusPaneView.ts b/src/features/P2PSync/P2PReplicator/P2PServerStatusPaneView.ts
index a182b8a..e51cd7d 100644
--- a/src/features/P2PSync/P2PReplicator/P2PServerStatusPaneView.ts
+++ b/src/features/P2PSync/P2PReplicator/P2PServerStatusPaneView.ts
@@ -2,7 +2,7 @@ import { WorkspaceLeaf } from "@/deps.ts";
 import { mount } from "svelte";
 import { SvelteItemView } from "@/common/SvelteItemView.ts";
 import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore.ts";
-import type { P2PPaneParams } from "@/lib/src/replication/trystero/UseP2PReplicatorResult";
+import type { P2PPaneParams } from "@lib/replication/trystero/UseP2PReplicatorResult";
 import P2PServerStatusPane from "./P2PServerStatusPane.svelte";
 
 export const VIEW_TYPE_P2P_SERVER_STATUS = "p2p-server-status";
diff --git a/src/features/P2PSync/P2PReplicator/PeerStatusRow.svelte b/src/features/P2PSync/P2PReplicator/PeerStatusRow.svelte
index 144ec29..476fa27 100644
--- a/src/features/P2PSync/P2PReplicator/PeerStatusRow.svelte
+++ b/src/features/P2PSync/P2PReplicator/PeerStatusRow.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
     import { getContext } from "svelte";
-    import { AcceptedStatus, type PeerStatus } from "../../../lib/src/replication/trystero/P2PReplicatorPaneCommon";
-    import type { LiveSyncTrysteroReplicator } from "../../../lib/src/replication/trystero/LiveSyncTrysteroReplicator";
-    import { eventHub } from "../../../common/events";
-    import { EVENT_P2P_PEER_SHOW_EXTRA_MENU } from "../../../lib/src/replication/trystero/P2PReplicatorPaneCommon";
+    import { AcceptedStatus, type PeerStatus } from "@lib/replication/trystero/P2PReplicatorPaneCommon";
+    import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
+    import { eventHub } from "@/common/events";
+    import { EVENT_P2P_PEER_SHOW_EXTRA_MENU } from "@lib/replication/trystero/P2PReplicatorPaneCommon";
 
     interface Props {
         peerStatus: PeerStatus;
diff --git a/src/lib b/src/lib
index 25d23bf..2accfbc 160000
--- a/src/lib
+++ b/src/lib
@@ -1 +1 @@
-Subproject commit 25d23bf7388fa5fe0ac4eb259fe91d5b5a52c664
+Subproject commit 2accfbce497cf5cba06d59f083f594778b15486f
diff --git a/src/modules/AbstractModule.ts b/src/modules/AbstractModule.ts
index 7b550f2..547f301 100644
--- a/src/modules/AbstractModule.ts
+++ b/src/modules/AbstractModule.ts
@@ -3,7 +3,7 @@ import type { AnyEntry, FilePathWithPrefix } from "@lib/common/types";
 import type { IMinimumLiveSyncCommands, LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 import { stripAllPrefixes } from "@lib/string_and_binary/path";
 import { createInstanceLogFunction } from "@lib/services/lib/logUtils";
-import type { ServiceContext } from "@/lib/src/services/base/ServiceBase";
+import type { ServiceContext } from "@lib/services/base/ServiceBase";
 
 export abstract class AbstractModule<
     T extends LiveSyncBaseCore<ServiceContext, IMinimumLiveSyncCommands> = LiveSyncBaseCore<
diff --git a/src/modules/AbstractObsidianModule.ts b/src/modules/AbstractObsidianModule.ts
index 0d188a3..44a952c 100644
--- a/src/modules/AbstractObsidianModule.ts
+++ b/src/modules/AbstractObsidianModule.ts
@@ -1,6 +1,6 @@
-import { type Prettify } from "../lib/src/common/types";
-import type { LiveSyncCore } from "../main";
-import type ObsidianLiveSyncPlugin from "../main";
+import { type Prettify } from "@lib/common/types";
+import type { LiveSyncCore } from "@/main";
+import type ObsidianLiveSyncPlugin from "@/main";
 import { AbstractModule } from "./AbstractModule.ts";
 import type { ChainableExecuteFunction, OverridableFunctionsKeys } from "./ModuleTypes";
 
diff --git a/src/modules/ModuleTypes.ts b/src/modules/ModuleTypes.ts
index 3151b51..869acea 100644
--- a/src/modules/ModuleTypes.ts
+++ b/src/modules/ModuleTypes.ts
@@ -1,5 +1,5 @@
-import type { Prettify } from "../lib/src/common/types";
-import type { LiveSyncCore } from "../main";
+import type { Prettify } from "@lib/common/types";
+import type { LiveSyncCore } from "@/main";
 
 export type OverridableFunctionsKeys<T> = {
     [K in keyof T as K extends `$${string}` ? K : never]: T[K];
diff --git a/src/modules/core/ModulePeriodicProcess.ts b/src/modules/core/ModulePeriodicProcess.ts
index 2eef12f..9d8027b 100644
--- a/src/modules/core/ModulePeriodicProcess.ts
+++ b/src/modules/core/ModulePeriodicProcess.ts
@@ -1,6 +1,6 @@
 import { PeriodicProcessor } from "@/common/PeriodicProcessor";
-import type { LiveSyncCore } from "../../main";
-import { AbstractModule } from "../AbstractModule";
+import type { LiveSyncCore } from "@/main";
+import { AbstractModule } from "@/modules/AbstractModule";
 
 export class ModulePeriodicProcess extends AbstractModule {
     periodicSyncProcessor = new PeriodicProcessor(this.core, async () => await this.services.replication.replicate());
diff --git a/src/modules/core/ModuleReplicator.ts b/src/modules/core/ModuleReplicator.ts
index ddc59d0..3479369 100644
--- a/src/modules/core/ModuleReplicator.ts
+++ b/src/modules/core/ModuleReplicator.ts
@@ -1,18 +1,18 @@
 import type PouchDB from "pouchdb-core";
 import { fireAndForget } from "octagonal-wheels/promises";
-import { AbstractModule } from "../AbstractModule";
+import { AbstractModule } from "@/modules/AbstractModule";
 import { Logger, LOG_LEVEL_NOTICE, LOG_LEVEL_INFO } from "octagonal-wheels/common/logger";
 import { skipIfDuplicated } from "octagonal-wheels/concurrency/lock";
 import { balanceChunkPurgedDBs } from "@lib/pouchdb/chunks";
 import { purgeUnreferencedChunks } from "@lib/pouchdb/chunks";
-import { LiveSyncCouchDBReplicator } from "../../lib/src/replication/couchdb/LiveSyncReplicator";
-import { type EntryDoc, type RemoteType } from "../../lib/src/common/types";
+import { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator";
+import { type EntryDoc, type RemoteType } from "@lib/common/types";
 
 import { scheduleTask } from "octagonal-wheels/concurrency/task";
-import { EVENT_FILE_SAVED, EVENT_SETTING_SAVED, eventHub } from "../../common/events";
+import { EVENT_FILE_SAVED, EVENT_SETTING_SAVED, eventHub } from "@/common/events";
 
-import { $msg } from "../../lib/src/common/i18n";
-import type { LiveSyncCore } from "../../main";
+import { $msg } from "@lib/common/i18n";
+import type { LiveSyncCore } from "@/main";
 import { ReplicateResultProcessor } from "./ReplicateResultProcessor";
 import { UnresolvedErrorManager } from "@lib/services/base/UnresolvedErrorManager";
 import { clearHandlers } from "@lib/replication/SyncParamsHandler";
diff --git a/src/modules/core/ModuleReplicatorCouchDB.ts b/src/modules/core/ModuleReplicatorCouchDB.ts
index 9fdc6d7..680fc34 100644
--- a/src/modules/core/ModuleReplicatorCouchDB.ts
+++ b/src/modules/core/ModuleReplicatorCouchDB.ts
@@ -1,9 +1,9 @@
 import { fireAndForget } from "octagonal-wheels/promises";
-import { REMOTE_MINIO, REMOTE_P2P, type RemoteDBSettings } from "../../lib/src/common/types";
-import { LiveSyncCouchDBReplicator } from "../../lib/src/replication/couchdb/LiveSyncReplicator";
-import type { LiveSyncAbstractReplicator } from "../../lib/src/replication/LiveSyncAbstractReplicator";
-import { AbstractModule } from "../AbstractModule";
-import type { LiveSyncCore } from "../../main";
+import { REMOTE_MINIO, REMOTE_P2P, type RemoteDBSettings } from "@lib/common/types";
+import { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator";
+import type { LiveSyncAbstractReplicator } from "@lib/replication/LiveSyncAbstractReplicator";
+import { AbstractModule } from "@/modules/AbstractModule";
+import type { LiveSyncCore } from "@/main";
 
 export class ModuleReplicatorCouchDB extends AbstractModule {
     _anyNewReplicator(settingOverride: Partial<RemoteDBSettings> = {}): Promise<LiveSyncAbstractReplicator | false> {
diff --git a/src/modules/core/ModuleReplicatorMinIO.ts b/src/modules/core/ModuleReplicatorMinIO.ts
index ab6800e..1d552f0 100644
--- a/src/modules/core/ModuleReplicatorMinIO.ts
+++ b/src/modules/core/ModuleReplicatorMinIO.ts
@@ -1,8 +1,8 @@
-import { REMOTE_MINIO, type RemoteDBSettings } from "../../lib/src/common/types";
-import { LiveSyncJournalReplicator } from "../../lib/src/replication/journal/LiveSyncJournalReplicator";
-import type { LiveSyncAbstractReplicator } from "../../lib/src/replication/LiveSyncAbstractReplicator";
-import type { LiveSyncCore } from "../../main";
-import { AbstractModule } from "../AbstractModule";
+import { REMOTE_MINIO, type RemoteDBSettings } from "@lib/common/types";
+import { LiveSyncJournalReplicator } from "@lib/replication/journal/LiveSyncJournalReplicator";
+import type { LiveSyncAbstractReplicator } from "@lib/replication/LiveSyncAbstractReplicator";
+import type { LiveSyncCore } from "@/main";
+import { AbstractModule } from "@/modules/AbstractModule";
 
 export class ModuleReplicatorMinIO extends AbstractModule {
     _anyNewReplicator(settingOverride: Partial<RemoteDBSettings> = {}): Promise<LiveSyncAbstractReplicator | false> {
diff --git a/src/modules/core/ReplicateResultProcessor.ts b/src/modules/core/ReplicateResultProcessor.ts
index fb35a5b..013c297 100644
--- a/src/modules/core/ReplicateResultProcessor.ts
+++ b/src/modules/core/ReplicateResultProcessor.ts
@@ -8,7 +8,7 @@ import {
     type MetaEntry,
 } from "@lib/common/types";
 import type { ModuleReplicator } from "./ModuleReplicator";
-import { isChunk } from "@/lib/src/common/typeUtils";
+import { isChunk } from "@lib/common/typeUtils";
 import {
     LOG_LEVEL_DEBUG,
     LOG_LEVEL_INFO,
diff --git a/src/modules/coreFeatures/ModuleConflictChecker.ts b/src/modules/coreFeatures/ModuleConflictChecker.ts
index d81e40d..810914c 100644
--- a/src/modules/coreFeatures/ModuleConflictChecker.ts
+++ b/src/modules/coreFeatures/ModuleConflictChecker.ts
@@ -1,9 +1,9 @@
-import { AbstractModule } from "../AbstractModule.ts";
-import { LOG_LEVEL_NOTICE, type FilePathWithPrefix } from "../../lib/src/common/types";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
+import { LOG_LEVEL_NOTICE, type FilePathWithPrefix } from "@lib/common/types";
 import { QueueProcessor } from "octagonal-wheels/concurrency/processor";
 import { sendValue } from "octagonal-wheels/messagepassing/signal";
-import type { InjectableServiceHub } from "../../lib/src/services/InjectableServices.ts";
-import type { LiveSyncCore } from "../../main.ts";
+import type { InjectableServiceHub } from "@lib/services/InjectableServices.ts";
+import type { LiveSyncCore } from "@/main.ts";
 
 export class ModuleConflictChecker extends AbstractModule {
     async _queueConflictCheckIfOpen(file: FilePathWithPrefix): Promise<void> {
diff --git a/src/modules/coreFeatures/ModuleConflictResolver.ts b/src/modules/coreFeatures/ModuleConflictResolver.ts
index ebce9d4..80362a9 100644
--- a/src/modules/coreFeatures/ModuleConflictResolver.ts
+++ b/src/modules/coreFeatures/ModuleConflictResolver.ts
@@ -1,5 +1,5 @@
 import { serialized } from "octagonal-wheels/concurrency/lock";
-import { AbstractModule } from "../AbstractModule.ts";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
 import {
     AUTO_MERGED,
     CANCELLED,
@@ -10,15 +10,15 @@ import {
     NOT_CONFLICTED,
     type diff_check_result,
     type FilePathWithPrefix,
-} from "../../lib/src/common/types";
+} from "@lib/common/types";
 import { isCustomisationSyncMetadata, isPluginMetadata } from "@lib/common/typeUtils.ts";
 import { TARGET_IS_NEW } from "@lib/common/models/shared.const.symbols.ts";
 import { compareMTime, displayRev } from "@lib/common/utils.ts";
 import diff_match_patch from "diff-match-patch";
-import { stripAllPrefixes, isPlainText } from "../../lib/src/string_and_binary/path";
-import { eventHub } from "../../common/events.ts";
-import type { InjectableServiceHub } from "../../lib/src/services/InjectableServices.ts";
-import type { LiveSyncCore } from "../../main.ts";
+import { stripAllPrefixes, isPlainText } from "@lib/string_and_binary/path";
+import { eventHub } from "@/common/events.ts";
+import type { InjectableServiceHub } from "@lib/services/InjectableServices.ts";
+import type { LiveSyncCore } from "@/main.ts";
 
 declare global {
     interface LSEvents {
diff --git a/src/modules/coreFeatures/ModuleResolveMismatchedTweaks.ts b/src/modules/coreFeatures/ModuleResolveMismatchedTweaks.ts
index 4c95bbf..275703a 100644
--- a/src/modules/coreFeatures/ModuleResolveMismatchedTweaks.ts
+++ b/src/modules/coreFeatures/ModuleResolveMismatchedTweaks.ts
@@ -10,12 +10,12 @@ import {
     type RemoteDBSettings,
     IncompatibleChangesInSpecificPattern,
     CompatibleButLossyChanges,
-} from "../../lib/src/common/types.ts";
-import { escapeMarkdownValue } from "../../lib/src/common/utils.ts";
-import { AbstractModule } from "../AbstractModule.ts";
-import { $msg } from "../../lib/src/common/i18n.ts";
-import type { InjectableServiceHub } from "../../lib/src/services/InjectableServices.ts";
-import type { LiveSyncCore } from "../../main.ts";
+} from "@lib/common/types.ts";
+import { escapeMarkdownValue } from "@lib/common/utils.ts";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
+import { $msg } from "@lib/common/i18n.ts";
+import type { InjectableServiceHub } from "@lib/services/InjectableServices.ts";
+import type { LiveSyncCore } from "@/main.ts";
 import { REMOTE_P2P } from "@lib/common/models/setting.const.ts";
 
 function valueToString(value: any) {
diff --git a/src/modules/coreObsidian/UILib/dialogs.ts b/src/modules/coreObsidian/UILib/dialogs.ts
index d84bcab..4476c5f 100644
--- a/src/modules/coreObsidian/UILib/dialogs.ts
+++ b/src/modules/coreObsidian/UILib/dialogs.ts
@@ -1,6 +1,6 @@
 import { ButtonComponent } from "@/deps.ts";
-import { App, FuzzySuggestModal, MarkdownRenderer, Modal, Plugin, Setting } from "../../../deps.ts";
-import { EVENT_PLUGIN_UNLOADED, eventHub } from "../../../common/events.ts";
+import { App, FuzzySuggestModal, MarkdownRenderer, Modal, Plugin, Setting } from "@/deps.ts";
+import { EVENT_PLUGIN_UNLOADED, eventHub } from "@/common/events.ts";
 import { compatGlobal, type CompatIntervalHandle } from "@lib/common/coreEnvFunctions.ts";
 
 class AutoClosableModal extends Modal {
diff --git a/src/modules/coreObsidian/storageLib/utilObsidian.ts b/src/modules/coreObsidian/storageLib/utilObsidian.ts
index c4d4dfe..a83a4ac 100644
--- a/src/modules/coreObsidian/storageLib/utilObsidian.ts
+++ b/src/modules/coreObsidian/storageLib/utilObsidian.ts
@@ -1,10 +1,10 @@
 // Obsidian to LiveSync Utils
 
-import { TFile, type TAbstractFile, type TFolder } from "../../../deps.ts";
-import { ICHeader } from "../../../common/types.ts";
-import { addPrefix, isPlainText } from "../../../lib/src/string_and_binary/path.ts";
+import { TFile, type TAbstractFile, type TFolder } from "@/deps.ts";
+import { ICHeader } from "@/common/types.ts";
+import { addPrefix, isPlainText } from "@lib/string_and_binary/path.ts";
 import { LOG_LEVEL_VERBOSE, Logger } from "octagonal-wheels/common/logger";
-import { createBlob } from "../../../lib/src/common/utils.ts";
+import { createBlob } from "@lib/common/utils.ts";
 import type {
     FilePath,
     FilePathWithPrefix,
@@ -12,8 +12,8 @@ import type {
     UXFileInfoStub,
     UXFolderInfo,
     UXInternalFileInfoStub,
-} from "../../../lib/src/common/types.ts";
-import type { LiveSyncCore } from "../../../main.ts";
+} from "@lib/common/types.ts";
+import type { LiveSyncCore } from "@/main.ts";
 import type { FileAccessObsidian } from "@/serviceModules/FileAccessObsidian.ts";
 
 export async function TFileToUXFileInfo(
diff --git a/src/modules/essential/ModuleBasicMenu.ts b/src/modules/essential/ModuleBasicMenu.ts
index 5728be8..2c67ab3 100644
--- a/src/modules/essential/ModuleBasicMenu.ts
+++ b/src/modules/essential/ModuleBasicMenu.ts
@@ -1,7 +1,7 @@
 import type { LiveSyncCore } from "@/main";
 import { LOG_LEVEL_NOTICE } from "octagonal-wheels/common/logger";
 import { fireAndForget } from "octagonal-wheels/promises";
-import { AbstractModule } from "../AbstractModule";
+import { AbstractModule } from "@/modules/AbstractModule";
 // Separated Module for basic menu commands, which are not related to obsidian specific features. It is expected to be used in other platforms with minimal changes.
 // However, it is odd that it has here at all; it really ought to be in each respective feature. It will likely be moved eventually. Until now, addCommand pointed to Obsidian's version.
 export class ModuleBasicMenu extends AbstractModule {
diff --git a/src/modules/essential/ModuleMigration.ts b/src/modules/essential/ModuleMigration.ts
index e19dc39..0b1bda1 100644
--- a/src/modules/essential/ModuleMigration.ts
+++ b/src/modules/essential/ModuleMigration.ts
@@ -1,4 +1,4 @@
-import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, Logger } from "../../lib/src/common/logger.ts";
+import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, Logger } from "@lib/common/logger.ts";
 import {
     EVENT_REQUEST_OPEN_P2P,
     EVENT_REQUEST_OPEN_SETTING_WIZARD,
@@ -6,16 +6,16 @@ import {
     EVENT_REQUEST_RUN_DOCTOR,
     EVENT_REQUEST_RUN_FIX_INCOMPLETE,
     eventHub,
-} from "../../common/events.ts";
-import { AbstractModule } from "../AbstractModule.ts";
+} from "@/common/events.ts";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
 import { $msg } from "@lib/common/i18n.ts";
-import { performDoctorConsultation, RebuildOptions } from "../../lib/src/common/configForDoc.ts";
-import { isValidPath } from "../../common/utils.ts";
-import { isMetaEntry } from "../../lib/src/common/types.ts";
-import { isDeletedEntry, isDocContentSame, isLoadedEntry, readAsBlob } from "../../lib/src/common/utils.ts";
-import { countCompromisedChunks } from "../../lib/src/pouchdb/negotiation.ts";
-import type { LiveSyncCore } from "../../main.ts";
-import { SetupManager } from "../features/SetupManager.ts";
+import { performDoctorConsultation, RebuildOptions } from "@lib/common/configForDoc.ts";
+import { isValidPath } from "@/common/utils.ts";
+import { isMetaEntry } from "@lib/common/types.ts";
+import { isDeletedEntry, isDocContentSame, isLoadedEntry, readAsBlob } from "@lib/common/utils.ts";
+import { countCompromisedChunks } from "@lib/pouchdb/negotiation.ts";
+import type { LiveSyncCore } from "@/main.ts";
+import { SetupManager } from "@/modules/features/SetupManager.ts";
 
 type ErrorInfo = {
     path: string;
diff --git a/src/modules/essentialObsidian/APILib/ObsHttpHandler.ts b/src/modules/essentialObsidian/APILib/ObsHttpHandler.ts
index 9886255..9c1a504 100644
--- a/src/modules/essentialObsidian/APILib/ObsHttpHandler.ts
+++ b/src/modules/essentialObsidian/APILib/ObsHttpHandler.ts
@@ -6,7 +6,7 @@
 import { FetchHttpHandler, type FetchHttpHandlerOptions } from "@smithy/fetch-http-handler";
 import { HttpRequest, HttpResponse, type HttpHandlerOptions } from "@smithy/protocol-http";
 import { buildQueryString } from "@smithy/querystring-builder";
-import { requestUrl, type RequestUrlParam } from "../../../deps.ts";
+import { requestUrl, type RequestUrlParam } from "@/deps.ts";
 ////////////////////////////////////////////////////////////////////////////////
 // special handler using Obsidian requestUrl
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/modules/essentialObsidian/ModuleObsidianEvents.ts b/src/modules/essentialObsidian/ModuleObsidianEvents.ts
index 263e862..55849e5 100644
--- a/src/modules/essentialObsidian/ModuleObsidianEvents.ts
+++ b/src/modules/essentialObsidian/ModuleObsidianEvents.ts
@@ -1,18 +1,18 @@
-import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
-import { EVENT_FILE_RENAMED, EVENT_LEAF_ACTIVE_CHANGED, eventHub } from "../../common/events.js";
+import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
+import { EVENT_FILE_RENAMED, EVENT_LEAF_ACTIVE_CHANGED, eventHub } from "@/common/events.js";
 import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger";
 import { scheduleTask } from "octagonal-wheels/concurrency/task";
-import type { TFile } from "../../deps.ts";
+import type { TFile } from "@/deps.ts";
 import { fireAndForget } from "octagonal-wheels/promises";
-import { type FilePathWithPrefix } from "../../lib/src/common/types.ts";
+import { type FilePathWithPrefix } from "@lib/common/types.ts";
 import { reactive, reactiveSource, type ReactiveSource } from "octagonal-wheels/dataobject/reactive";
 import {
     collectingChunks,
     pluginScanningCount,
     hiddenFilesEventCount,
     hiddenFilesProcessingCount,
-} from "../../lib/src/mock_and_interop/stores.ts";
-import type { LiveSyncCore } from "../../main.ts";
+} from "@lib/mock_and_interop/stores.ts";
+import type { LiveSyncCore } from "@/main.ts";
 import { compatGlobal } from "@lib/common/coreEnvFunctions.ts";
 
 export class ModuleObsidianEvents extends AbstractObsidianModule {
diff --git a/src/modules/essentialObsidian/ModuleObsidianMenu.ts b/src/modules/essentialObsidian/ModuleObsidianMenu.ts
index 40597a0..afc5172 100644
--- a/src/modules/essentialObsidian/ModuleObsidianMenu.ts
+++ b/src/modules/essentialObsidian/ModuleObsidianMenu.ts
@@ -3,7 +3,7 @@ import { addIcon } from "@/deps.ts";
 import { type FilePathWithPrefix } from "@lib/common/types.ts";
 import { $msg } from "@lib/common/i18n.ts";
 import type { LiveSyncCore } from "@/main.ts";
-import { AbstractModule } from "../AbstractModule.ts";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
 // Obsidian specific menu commands.
 export class ModuleObsidianMenu extends AbstractModule {
     _everyOnloadStart(): Promise<boolean> {
diff --git a/src/modules/extras/ModuleDev.ts b/src/modules/extras/ModuleDev.ts
index 0395c9e..16994c4 100644
--- a/src/modules/extras/ModuleDev.ts
+++ b/src/modules/extras/ModuleDev.ts
@@ -1,13 +1,13 @@
 import { delay, fireAndForget } from "octagonal-wheels/promises";
-import { __onMissingTranslation } from "../../lib/src/common/i18n";
-import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
+import { __onMissingTranslation } from "@lib/common/i18n";
+import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
 import { LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger";
-import { eventHub } from "../../common/events";
+import { eventHub } from "@/common/events";
 import { enableTestFunction } from "./devUtil/testUtils.ts";
 import { TestPaneView, VIEW_TYPE_TEST } from "./devUtil/TestPaneView.ts";
 import { writable } from "svelte/store";
-import type { FilePathWithPrefix } from "../../lib/src/common/types.ts";
-import type { LiveSyncCore } from "../../main.ts";
+import type { FilePathWithPrefix } from "@lib/common/types.ts";
+import type { LiveSyncCore } from "@/main.ts";
 export class ModuleDev extends AbstractObsidianModule {
     _everyOnloadStart(): Promise<boolean> {
         __onMissingTranslation(() => {});
diff --git a/src/modules/extras/devUtil/TestPane.svelte b/src/modules/extras/devUtil/TestPane.svelte
index 2d8f378..0991840 100644
--- a/src/modules/extras/devUtil/TestPane.svelte
+++ b/src/modules/extras/devUtil/TestPane.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
     import { onMount } from "svelte";
-    import type ObsidianLiveSyncPlugin from "../../../main.ts";
+    import type ObsidianLiveSyncPlugin from "@/main.ts";
     import { perf_trench } from "./tests.ts";
-    import { MarkdownRenderer, Notice } from "../../../deps.ts";
-    import type { ModuleDev } from "../ModuleDev.ts";
+    import { MarkdownRenderer, Notice } from "@/deps.ts";
+    import type { ModuleDev } from "@/modules/extras/ModuleDev.ts";
     import { fireAndForget } from "octagonal-wheels/promises";
-    import { EVENT_LAYOUT_READY, eventHub } from "../../../common/events.ts";
+    import { EVENT_LAYOUT_READY, eventHub } from "@/common/events.ts";
     export let plugin: ObsidianLiveSyncPlugin;
     export let moduleDev: ModuleDev;
     $: core = plugin.core;
diff --git a/src/modules/extras/devUtil/TestPaneView.ts b/src/modules/extras/devUtil/TestPaneView.ts
index addbe88..56c8177 100644
--- a/src/modules/extras/devUtil/TestPaneView.ts
+++ b/src/modules/extras/devUtil/TestPaneView.ts
@@ -1,7 +1,7 @@
 import { ItemView, WorkspaceLeaf } from "@/deps.ts";
 import TestPaneComponent from "./TestPane.svelte";
-import type ObsidianLiveSyncPlugin from "../../../main.ts";
-import type { ModuleDev } from "../ModuleDev.ts";
+import type ObsidianLiveSyncPlugin from "@/main.ts";
+import type { ModuleDev } from "@/modules/extras/ModuleDev.ts";
 export const VIEW_TYPE_TEST = "ols-pane-test";
 declare global {
     interface LSEvents {
diff --git a/src/modules/extras/devUtil/testUtils.ts b/src/modules/extras/devUtil/testUtils.ts
index 6d1e86e..6d07265 100644
--- a/src/modules/extras/devUtil/testUtils.ts
+++ b/src/modules/extras/devUtil/testUtils.ts
@@ -1,6 +1,6 @@
-import { fireAndForget } from "../../../lib/src/common/utils.ts";
+import { fireAndForget } from "@lib/common/utils.ts";
 import { serialized } from "octagonal-wheels/concurrency/lock";
-import type ObsidianLiveSyncPlugin from "../../../main.ts";
+import type ObsidianLiveSyncPlugin from "@/main.ts";
 
 let plugin: ObsidianLiveSyncPlugin;
 export function enableTestFunction(plugin_: ObsidianLiveSyncPlugin) {
diff --git a/src/modules/extras/devUtil/tests.ts b/src/modules/extras/devUtil/tests.ts
index 207bf89..212091d 100644
--- a/src/modules/extras/devUtil/tests.ts
+++ b/src/modules/extras/devUtil/tests.ts
@@ -1,5 +1,5 @@
 import { Trench } from "octagonal-wheels/memory/memutil";
-import type ObsidianLiveSyncPlugin from "../../../main.ts";
+import type ObsidianLiveSyncPlugin from "@/main.ts";
 type MeasureResult = [times: number, spent: number];
 type NamedMeasureResult = [name: string, result: MeasureResult];
 const measures = new Map<string, MeasureResult>();
diff --git a/src/modules/features/DocumentHistory/DocumentHistoryModal.ts b/src/modules/features/DocumentHistory/DocumentHistoryModal.ts
index 5063fa7..1aa6fb7 100644
--- a/src/modules/features/DocumentHistory/DocumentHistoryModal.ts
+++ b/src/modules/features/DocumentHistory/DocumentHistoryModal.ts
@@ -1,7 +1,7 @@
-import { TFile, Modal, App, DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT, diff_match_patch } from "../../../deps.ts";
-import { getPathFromTFile, isValidPath } from "../../../common/utils.ts";
-import { decodeBinary, readString } from "../../../lib/src/string_and_binary/convert.ts";
-import ObsidianLiveSyncPlugin from "../../../main.ts";
+import { TFile, Modal, App, DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT, diff_match_patch } from "@/deps.ts";
+import { getPathFromTFile, isValidPath } from "@/common/utils.ts";
+import { decodeBinary, readString } from "@lib/string_and_binary/convert.ts";
+import ObsidianLiveSyncPlugin from "@/main.ts";
 import {
     type DocumentID,
     type FilePathWithPrefix,
@@ -9,11 +9,11 @@ import {
     LOG_LEVEL_INFO,
     LOG_LEVEL_NOTICE,
     LOG_LEVEL_VERBOSE,
-} from "../../../lib/src/common/types.ts";
-import { Logger } from "../../../lib/src/common/logger.ts";
-import { isErrorOfMissingDoc } from "../../../lib/src/pouchdb/utils_couchdb.ts";
-import { fireAndForget, getDocData, readContent } from "../../../lib/src/common/utils.ts";
-import { isPlainText, stripPrefix } from "../../../lib/src/string_and_binary/path.ts";
+} from "@lib/common/types.ts";
+import { Logger } from "@lib/common/logger.ts";
+import { isErrorOfMissingDoc } from "@lib/pouchdb/utils_couchdb.ts";
+import { fireAndForget, getDocData, readContent } from "@lib/common/utils.ts";
+import { isPlainText, stripPrefix } from "@lib/string_and_binary/path.ts";
 import { scheduleOnceIfDuplicated } from "octagonal-wheels/concurrency/lock";
 import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore.ts";
 import { compatGlobal } from "@lib/common/coreEnvFunctions.ts";
diff --git a/src/modules/features/GlobalHistory/GlobalHistory.svelte b/src/modules/features/GlobalHistory/GlobalHistory.svelte
index 4aeb0bf..48df830 100644
--- a/src/modules/features/GlobalHistory/GlobalHistory.svelte
+++ b/src/modules/features/GlobalHistory/GlobalHistory.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-    import ObsidianLiveSyncPlugin from "../../../main.ts";
+    import ObsidianLiveSyncPlugin from "@/main.ts";
     import { onDestroy, onMount } from "svelte";
-    import type { AnyEntry, FilePathWithPrefix } from "../../../lib/src/common/types.ts";
-    import { getDocData, isAnyNote, isDocContentSame, readAsBlob } from "../../../lib/src/common/utils.ts";
-    import { diff_match_patch } from "../../../deps.ts";
-    import { DocumentHistoryModal } from "../DocumentHistory/DocumentHistoryModal.ts";
-    import { isPlainText, stripAllPrefixes } from "../../../lib/src/string_and_binary/path.ts";
+    import type { AnyEntry, FilePathWithPrefix } from "@lib/common/types.ts";
+    import { getDocData, isAnyNote, isDocContentSame, readAsBlob } from "@lib/common/utils.ts";
+    import { diff_match_patch } from "@/deps.ts";
+    import { DocumentHistoryModal } from "@/modules/features/DocumentHistory/DocumentHistoryModal.ts";
+    import { isPlainText, stripAllPrefixes } from "@lib/string_and_binary/path.ts";
     import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore.ts";
     export let plugin: ObsidianLiveSyncPlugin;
     export let core: LiveSyncBaseCore;
diff --git a/src/modules/features/GlobalHistory/GlobalHistoryView.ts b/src/modules/features/GlobalHistory/GlobalHistoryView.ts
index 63ef474..9a404ed 100644
--- a/src/modules/features/GlobalHistory/GlobalHistoryView.ts
+++ b/src/modules/features/GlobalHistory/GlobalHistoryView.ts
@@ -1,7 +1,7 @@
-import { WorkspaceLeaf } from "../../../deps.ts";
+import { WorkspaceLeaf } from "@/deps.ts";
 import GlobalHistoryComponent from "./GlobalHistory.svelte";
-import type ObsidianLiveSyncPlugin from "../../../main.ts";
-import { SvelteItemView } from "../../../common/SvelteItemView.ts";
+import type ObsidianLiveSyncPlugin from "@/main.ts";
+import { SvelteItemView } from "@/common/SvelteItemView.ts";
 import { mount } from "svelte";
 
 export const VIEW_TYPE_GLOBAL_HISTORY = "global-history";
diff --git a/src/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts b/src/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts
index bc8faa3..40bfe1a 100644
--- a/src/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts
+++ b/src/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts
@@ -1,9 +1,9 @@
-import { App, Modal } from "../../../deps.ts";
+import { App, Modal } from "@/deps.ts";
 import { DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT } from "diff-match-patch";
-import { CANCELLED, LEAVE_TO_SUBSEQUENT, type diff_result } from "../../../lib/src/common/types.ts";
-import { delay } from "../../../lib/src/common/utils.ts";
-import { eventHub } from "../../../common/events.ts";
-import { globalSlipBoard } from "../../../lib/src/bureau/bureau.ts";
+import { CANCELLED, LEAVE_TO_SUBSEQUENT, type diff_result } from "@lib/common/types.ts";
+import { delay } from "@lib/common/utils.ts";
+import { eventHub } from "@/common/events.ts";
+import { globalSlipBoard } from "@lib/bureau/bureau.ts";
 
 export type MergeDialogResult = typeof CANCELLED | typeof LEAVE_TO_SUBSEQUENT | string;
 
diff --git a/src/modules/features/Log/LogPane.svelte b/src/modules/features/Log/LogPane.svelte
index b12669c..688c0e1 100644
--- a/src/modules/features/Log/LogPane.svelte
+++ b/src/modules/features/Log/LogPane.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
     import { onDestroy, onMount } from "svelte";
-    import { logMessages } from "../../../lib/src/mock_and_interop/stores";
+    import { logMessages } from "@lib/mock_and_interop/stores";
     import { reactive, type ReactiveInstance } from "octagonal-wheels/dataobject/reactive";
-    import { Logger } from "../../../lib/src/common/logger";
-    import { $msg as msg, currentLang as lang } from "../../../lib/src/common/i18n.ts";
+    import { Logger } from "@lib/common/logger";
+    import { $msg as msg, currentLang as lang } from "@lib/common/i18n.ts";
     import { compatGlobal } from "@lib/common/coreEnvFunctions.ts";
 
     let unsubscribe: () => void;
diff --git a/src/modules/features/Log/LogPaneView.ts b/src/modules/features/Log/LogPaneView.ts
index c032705..797846d 100644
--- a/src/modules/features/Log/LogPaneView.ts
+++ b/src/modules/features/Log/LogPaneView.ts
@@ -1,7 +1,7 @@
 import { WorkspaceLeaf } from "@/deps.ts";
 import LogPaneComponent from "./LogPane.svelte";
-import type ObsidianLiveSyncPlugin from "../../../main.ts";
-import { SvelteItemView } from "../../../common/SvelteItemView.ts";
+import type ObsidianLiveSyncPlugin from "@/main.ts";
+import { SvelteItemView } from "@/common/SvelteItemView.ts";
 import { $msg } from "@lib/common/i18n.ts";
 import { mount } from "svelte";
 export const VIEW_TYPE_LOG = "log-log";
diff --git a/src/modules/features/ModuleGlobalHistory.ts b/src/modules/features/ModuleGlobalHistory.ts
index 3e955c9..2133ba9 100644
--- a/src/modules/features/ModuleGlobalHistory.ts
+++ b/src/modules/features/ModuleGlobalHistory.ts
@@ -1,4 +1,4 @@
-import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
+import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
 import { VIEW_TYPE_GLOBAL_HISTORY, GlobalHistoryView } from "./GlobalHistory/GlobalHistoryView.ts";
 
 export class ModuleObsidianGlobalHistory extends AbstractObsidianModule {
diff --git a/src/modules/features/ModuleInteractiveConflictResolver.ts b/src/modules/features/ModuleInteractiveConflictResolver.ts
index 0ef7c12..2dd3caa 100644
--- a/src/modules/features/ModuleInteractiveConflictResolver.ts
+++ b/src/modules/features/ModuleInteractiveConflictResolver.ts
@@ -8,13 +8,13 @@ import {
     type DocumentID,
     type FilePathWithPrefix,
     type diff_result,
-} from "../../lib/src/common/types.ts";
+} from "@lib/common/types.ts";
 import { ConflictResolveModal } from "./InteractiveConflictResolving/ConflictResolveModal.ts";
-import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
-import { displayRev } from "../../common/utils.ts";
+import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
+import { displayRev } from "@/common/utils.ts";
 import { fireAndForget } from "octagonal-wheels/promises";
 import { serialized } from "octagonal-wheels/concurrency/lock";
-import type { LiveSyncCore } from "../../main.ts";
+import type { LiveSyncCore } from "@/main.ts";
 
 export class ModuleInteractiveConflictResolver extends AbstractObsidianModule {
     _everyOnloadStart(): Promise<boolean> {
diff --git a/src/modules/features/ModuleLog.ts b/src/modules/features/ModuleLog.ts
index 062549a..ff1fdc1 100644
--- a/src/modules/features/ModuleLog.ts
+++ b/src/modules/features/ModuleLog.ts
@@ -6,9 +6,9 @@ import {
     PREFIXMD_LOGFILE,
     type DatabaseConnectingStatus,
     type LOG_LEVEL,
-} from "../../lib/src/common/types.ts";
+} from "@lib/common/types.ts";
 import { cancelTask, scheduleTask } from "octagonal-wheels/concurrency/task";
-import { fireAndForget, isDirty, throttle } from "../../lib/src/common/utils.ts";
+import { fireAndForget, isDirty, throttle } from "@lib/common/utils.ts";
 import {
     collectingChunks,
     pluginScanningCount,
@@ -16,22 +16,22 @@ import {
     hiddenFilesProcessingCount,
     type LogEntry,
     logMessages,
-} from "../../lib/src/mock_and_interop/stores.ts";
-import { eventHub } from "../../lib/src/hub/hub.ts";
+} from "@lib/mock_and_interop/stores.ts";
+import { eventHub } from "@lib/hub/hub.ts";
 import {
     EVENT_FILE_RENAMED,
     EVENT_LAYOUT_READY,
     EVENT_LEAF_ACTIVE_CHANGED,
     EVENT_ON_UNRESOLVED_ERROR,
-} from "../../common/events.ts";
-import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
-import { addIcon, debounce, normalizePath, Notice, stringifyYaml, type WorkspaceLeaf } from "../../deps.ts";
+} from "@/common/events.ts";
+import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
+import { addIcon, debounce, normalizePath, Notice, stringifyYaml, type WorkspaceLeaf } from "@/deps.ts";
 import { LOG_LEVEL_NOTICE, setGlobalLogFunction } from "octagonal-wheels/common/logger";
 import { LogPaneView, VIEW_TYPE_LOG } from "./Log/LogPaneView.ts";
 import { serialized } from "octagonal-wheels/concurrency/lock";
 import { $msg } from "@lib/common/i18n.ts";
-import { P2PLogCollector } from "@/lib/src/replication/trystero/P2PLogCollector.ts";
-import type { LiveSyncCore } from "../../main.ts";
+import { P2PLogCollector } from "@lib/replication/trystero/P2PLogCollector.ts";
+import type { LiveSyncCore } from "@/main.ts";
 import { LiveSyncError } from "@lib/common/LSError.ts";
 import { isValidPath } from "@/common/utils.ts";
 import {
diff --git a/src/modules/features/ModuleObsidianDocumentHistory.ts b/src/modules/features/ModuleObsidianDocumentHistory.ts
index 1e6a8bb..cc3b323 100644
--- a/src/modules/features/ModuleObsidianDocumentHistory.ts
+++ b/src/modules/features/ModuleObsidianDocumentHistory.ts
@@ -1,8 +1,8 @@
 import { type TFile } from "@/deps.ts";
-import { eventHub } from "../../common/events.ts";
-import { EVENT_REQUEST_SHOW_HISTORY } from "../../common/obsidianEvents.ts";
-import type { FilePathWithPrefix, LoadedEntry, DocumentID } from "../../lib/src/common/types.ts";
-import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
+import { eventHub } from "@/common/events.ts";
+import { EVENT_REQUEST_SHOW_HISTORY } from "@/common/obsidianEvents.ts";
+import type { FilePathWithPrefix, LoadedEntry, DocumentID } from "@lib/common/types.ts";
+import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
 import { DocumentHistoryModal } from "./DocumentHistory/DocumentHistoryModal.ts";
 import { fireAndForget } from "octagonal-wheels/promises";
 
diff --git a/src/modules/features/ModuleObsidianSettingAsMarkdown.ts b/src/modules/features/ModuleObsidianSettingAsMarkdown.ts
index 154e43e..75488a7 100644
--- a/src/modules/features/ModuleObsidianSettingAsMarkdown.ts
+++ b/src/modules/features/ModuleObsidianSettingAsMarkdown.ts
@@ -1,11 +1,11 @@
 // import { PouchDB } from "../../lib/src/pouchdb/pouchdb-browser";
 import { isObjectDifferent } from "octagonal-wheels/object";
-import { EVENT_SETTING_SAVED, eventHub } from "../../common/events";
+import { EVENT_SETTING_SAVED, eventHub } from "@/common/events";
 import { fireAndForget } from "octagonal-wheels/promises";
-import { DEFAULT_SETTINGS, type FilePathWithPrefix, type ObsidianLiveSyncSettings } from "../../lib/src/common/types";
-import { parseYaml, stringifyYaml } from "../../deps";
+import { DEFAULT_SETTINGS, type FilePathWithPrefix, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { parseYaml, stringifyYaml } from "@/deps";
 import { LOG_LEVEL_DEBUG, LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger";
-import { AbstractModule } from "../AbstractModule.ts";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
 import type { ServiceContext } from "@lib/services/base/ServiceBase.ts";
 import type { InjectableServiceHub } from "@lib/services/InjectableServices.ts";
 import type { LiveSyncCore } from "@/main.ts";
diff --git a/src/modules/features/ModuleObsidianSettingTab.ts b/src/modules/features/ModuleObsidianSettingTab.ts
index 29c4862..04800d9 100644
--- a/src/modules/features/ModuleObsidianSettingTab.ts
+++ b/src/modules/features/ModuleObsidianSettingTab.ts
@@ -1,7 +1,7 @@
 import { ObsidianLiveSyncSettingTab } from "./SettingDialogue/ObsidianLiveSyncSettingTab.ts";
-import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
+import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
 // import { PouchDB } from "../../lib/src/pouchdb/pouchdb-browser";
-import { EVENT_REQUEST_OPEN_SETTING_WIZARD, EVENT_REQUEST_OPEN_SETTINGS, eventHub } from "../../common/events.ts";
+import { EVENT_REQUEST_OPEN_SETTING_WIZARD, EVENT_REQUEST_OPEN_SETTINGS, eventHub } from "@/common/events.ts";
 import type { LiveSyncCore } from "@/main.ts";
 
 export class ModuleObsidianSettingDialogue extends AbstractObsidianModule {
diff --git a/src/modules/features/SettingDialogue/MultipleRegExpControl.svelte b/src/modules/features/SettingDialogue/MultipleRegExpControl.svelte
index 90db1e8..f6de83a 100644
--- a/src/modules/features/SettingDialogue/MultipleRegExpControl.svelte
+++ b/src/modules/features/SettingDialogue/MultipleRegExpControl.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import type { CustomRegExpSource } from "../../../lib/src/common/types";
-    import { isInvertedRegExp, isValidRegExp } from "../../../lib/src/common/utils";
+    import type { CustomRegExpSource } from "@lib/common/types";
+    import { isInvertedRegExp, isValidRegExp } from "@lib/common/utils";
 
     export let patterns = [] as CustomRegExpSource[];
     export let originals = [] as CustomRegExpSource[];
diff --git a/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts b/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts
index c06dcfe..db02133 100644
--- a/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts
+++ b/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts
@@ -1,4 +1,4 @@
-import { App, PluginSettingTab } from "../../../deps.ts";
+import { App, PluginSettingTab } from "@/deps.ts";
 import {
     type ObsidianLiveSyncSettings,
     type RemoteDBSettings,
@@ -12,15 +12,15 @@ import {
     LEVEL_ADVANCED,
     LEVEL_EDGE_CASE,
     REMOTE_P2P,
-} from "../../../lib/src/common/types.ts";
-import { delay, isObjectDifferent, sizeToHumanReadable } from "../../../lib/src/common/utils.ts";
-import { versionNumberString2Number } from "../../../lib/src/string_and_binary/convert.ts";
-import { Logger } from "../../../lib/src/common/logger.ts";
+} from "@lib/common/types.ts";
+import { delay, isObjectDifferent, sizeToHumanReadable } from "@lib/common/utils.ts";
+import { versionNumberString2Number } from "@lib/string_and_binary/convert.ts";
+import { Logger } from "@lib/common/logger.ts";
 import { checkSyncInfo } from "@lib/pouchdb/negotiation.ts";
 import { testCrypt } from "octagonal-wheels/encryption/encryption";
-import ObsidianLiveSyncPlugin from "../../../main.ts";
-import { scheduleTask } from "../../../common/utils.ts";
-import { LiveSyncCouchDBReplicator } from "../../../lib/src/replication/couchdb/LiveSyncReplicator.ts";
+import ObsidianLiveSyncPlugin from "@/main.ts";
+import { scheduleTask } from "@/common/utils.ts";
+import { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator.ts";
 import {
     type AllSettingItemKey,
     type AllStringItemKey,
@@ -31,12 +31,12 @@ import {
     type OnDialogSettings,
     getConfName,
 } from "./settingConstants.ts";
-import { $msg } from "../../../lib/src/common/i18n.ts";
+import { $msg } from "@lib/common/i18n.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import { fireAndForget, yieldNextAnimationFrame } from "octagonal-wheels/promises";
-import { confirmWithMessage } from "../../coreObsidian/UILib/dialogs.ts";
-import { EVENT_REQUEST_RELOAD_SETTING_TAB, eventHub } from "../../../common/events.ts";
-import { JournalSyncMinio } from "../../../lib/src/replication/journal/objectstore/JournalSyncMinio.ts";
+import { confirmWithMessage } from "@/modules/coreObsidian/UILib/dialogs.ts";
+import { EVENT_REQUEST_RELOAD_SETTING_TAB, eventHub } from "@/common/events.ts";
+import { JournalSyncMinio } from "@lib/replication/journal/objectstore/JournalSyncMinio.ts";
 import { paneChangeLog } from "./PaneChangeLog.ts";
 import {
     enableOnly,
diff --git a/src/modules/features/SettingDialogue/PaneAdvanced.ts b/src/modules/features/SettingDialogue/PaneAdvanced.ts
index 34c58e8..0a4a73c 100644
--- a/src/modules/features/SettingDialogue/PaneAdvanced.ts
+++ b/src/modules/features/SettingDialogue/PaneAdvanced.ts
@@ -1,4 +1,4 @@
-import { ChunkAlgorithmNames } from "../../../lib/src/common/types.ts";
+import { ChunkAlgorithmNames } from "@lib/common/types.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
diff --git a/src/modules/features/SettingDialogue/PaneChangeLog.ts b/src/modules/features/SettingDialogue/PaneChangeLog.ts
index 3d8ceb9..eab16c5 100644
--- a/src/modules/features/SettingDialogue/PaneChangeLog.ts
+++ b/src/modules/features/SettingDialogue/PaneChangeLog.ts
@@ -1,6 +1,6 @@
-import { MarkdownRenderer } from "../../../deps.ts";
-import { versionNumberString2Number } from "../../../lib/src/string_and_binary/convert.ts";
-import { $msg } from "../../../lib/src/common/i18n.ts";
+import { MarkdownRenderer } from "@/deps.ts";
+import { versionNumberString2Number } from "@lib/string_and_binary/convert.ts";
+import { $msg } from "@lib/common/i18n.ts";
 import { fireAndForget } from "octagonal-wheels/promises";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import { visibleOnly } from "./SettingPane.ts";
diff --git a/src/modules/features/SettingDialogue/PaneCustomisationSync.ts b/src/modules/features/SettingDialogue/PaneCustomisationSync.ts
index b040369..927050d 100644
--- a/src/modules/features/SettingDialogue/PaneCustomisationSync.ts
+++ b/src/modules/features/SettingDialogue/PaneCustomisationSync.ts
@@ -1,5 +1,5 @@
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
-import { EVENT_REQUEST_OPEN_PLUGIN_SYNC_DIALOG, eventHub } from "../../../common/events.ts";
+import { EVENT_REQUEST_OPEN_PLUGIN_SYNC_DIALOG, eventHub } from "@/common/events.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
 import { enableOnly, visibleOnly } from "./SettingPane.ts";
diff --git a/src/modules/features/SettingDialogue/PaneGeneral.ts b/src/modules/features/SettingDialogue/PaneGeneral.ts
index fc9cf33..ccbdce9 100644
--- a/src/modules/features/SettingDialogue/PaneGeneral.ts
+++ b/src/modules/features/SettingDialogue/PaneGeneral.ts
@@ -1,5 +1,5 @@
-import { $msg, $t } from "../../../lib/src/common/i18n.ts";
-import { SUPPORTED_I18N_LANGS, type I18N_LANGS } from "../../../lib/src/common/rosetta.ts";
+import { $msg, $t } from "@lib/common/i18n.ts";
+import { SUPPORTED_I18N_LANGS, type I18N_LANGS } from "@lib/common/rosetta.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
diff --git a/src/modules/features/SettingDialogue/PaneMaintenance.ts b/src/modules/features/SettingDialogue/PaneMaintenance.ts
index 71ac0d7..457760d 100644
--- a/src/modules/features/SettingDialogue/PaneMaintenance.ts
+++ b/src/modules/features/SettingDialogue/PaneMaintenance.ts
@@ -1,8 +1,8 @@
 import { EVENT_REQUEST_PERFORM_GC_V3, eventHub } from "@/common/events.ts";
-import { LOG_LEVEL_NOTICE, Logger } from "../../../lib/src/common/logger.ts";
-import { FlagFilesHumanReadable, FLAGMD_REDFLAG } from "../../../lib/src/common/types.ts";
-import { fireAndForget } from "../../../lib/src/common/utils.ts";
-import { LiveSyncCouchDBReplicator } from "../../../lib/src/replication/couchdb/LiveSyncReplicator.ts";
+import { LOG_LEVEL_NOTICE, Logger } from "@lib/common/logger.ts";
+import { FlagFilesHumanReadable, FLAGMD_REDFLAG } from "@lib/common/types.ts";
+import { fireAndForget } from "@lib/common/utils.ts";
+import { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab";
 import { visibleOnly, type PageFunctions } from "./SettingPane";
diff --git a/src/modules/features/SettingDialogue/PanePatches.ts b/src/modules/features/SettingDialogue/PanePatches.ts
index 839f7b2..c83e7d8 100644
--- a/src/modules/features/SettingDialogue/PanePatches.ts
+++ b/src/modules/features/SettingDialogue/PanePatches.ts
@@ -4,14 +4,14 @@ import {
     type HashAlgorithm,
     LOG_LEVEL_NOTICE,
     SuffixDatabaseName,
-} from "../../../lib/src/common/types.ts";
-import { Logger } from "../../../lib/src/common/logger.ts";
+} from "@lib/common/types.ts";
+import { Logger } from "@lib/common/logger.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
 import { visibleOnly } from "./SettingPane.ts";
-import { PouchDB } from "../../../lib/src/pouchdb/pouchdb-browser";
-import { ExtraSuffixIndexedDB } from "../../../lib/src/common/types.ts";
+import { PouchDB } from "@lib/pouchdb/pouchdb-browser";
+import { ExtraSuffixIndexedDB } from "@lib/common/types.ts";
 import { migrateDatabases } from "./settingUtils.ts";
 
 export function panePatches(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel }: PageFunctions): void {
diff --git a/src/modules/features/SettingDialogue/PanePowerUsers.ts b/src/modules/features/SettingDialogue/PanePowerUsers.ts
index e7f33e8..7bec258 100644
--- a/src/modules/features/SettingDialogue/PanePowerUsers.ts
+++ b/src/modules/features/SettingDialogue/PanePowerUsers.ts
@@ -1,4 +1,4 @@
-import { type ConfigPassphraseStore } from "../../../lib/src/common/types.ts";
+import { type ConfigPassphraseStore } from "@lib/common/types.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
diff --git a/src/modules/features/SettingDialogue/PaneRemoteConfig.ts b/src/modules/features/SettingDialogue/PaneRemoteConfig.ts
index 8fb94e9..e6c6461 100644
--- a/src/modules/features/SettingDialogue/PaneRemoteConfig.ts
+++ b/src/modules/features/SettingDialogue/PaneRemoteConfig.ts
@@ -6,9 +6,9 @@ import {
     LOG_LEVEL_NOTICE,
     type ObsidianLiveSyncSettings,
     LOG_LEVEL_VERBOSE,
-} from "../../../lib/src/common/types.ts";
+} from "@lib/common/types.ts";
 import { Menu } from "@/deps.ts";
-import { $msg } from "../../../lib/src/common/i18n.ts";
+import { $msg } from "@lib/common/i18n.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
@@ -22,17 +22,17 @@ import {
     getCouchDBConfigSummary,
     getE2EEConfigSummary,
 } from "./settingUtils.ts";
-import { SETTING_KEY_P2P_DEVICE_NAME } from "../../../lib/src/common/types.ts";
-import { SetupManager, UserMode } from "../SetupManager.ts";
+import { SETTING_KEY_P2P_DEVICE_NAME } from "@lib/common/types.ts";
+import { SetupManager, UserMode } from "@/modules/features/SetupManager.ts";
 import { OnDialogSettingsDefault, type AllSettings } from "./settingConstants.ts";
-import { activateRemoteConfiguration } from "../../../lib/src/serviceFeatures/remoteConfig.ts";
-import { ConnectionStringParser } from "../../../lib/src/common/ConnectionString.ts";
-import type { RemoteConfigurationResult } from "../../../lib/src/common/ConnectionString.ts";
-import type { RemoteConfiguration } from "../../../lib/src/common/models/setting.type.ts";
-import SetupRemote from "../SetupWizard/dialogs/SetupRemote.svelte";
-import SetupRemoteCouchDB from "../SetupWizard/dialogs/SetupRemoteCouchDB.svelte";
-import SetupRemoteBucket from "../SetupWizard/dialogs/SetupRemoteBucket.svelte";
-import SetupRemoteP2P from "../SetupWizard/dialogs/SetupRemoteP2P.svelte";
+import { activateRemoteConfiguration } from "@lib/serviceFeatures/remoteConfig.ts";
+import { ConnectionStringParser } from "@lib/common/ConnectionString.ts";
+import type { RemoteConfigurationResult } from "@lib/common/ConnectionString.ts";
+import type { RemoteConfiguration } from "@lib/common/models/setting.type.ts";
+import SetupRemote from "@/modules/features/SetupWizard/dialogs/SetupRemote.svelte";
+import SetupRemoteCouchDB from "@/modules/features/SetupWizard/dialogs/SetupRemoteCouchDB.svelte";
+import SetupRemoteBucket from "@/modules/features/SetupWizard/dialogs/SetupRemoteBucket.svelte";
+import SetupRemoteP2P from "@/modules/features/SetupWizard/dialogs/SetupRemoteP2P.svelte";
 import { syncActivatedRemoteSettings } from "./remoteConfigBuffer.ts";
 
 function getSettingsFromEditingSettings(editingSettings: AllSettings): ObsidianLiveSyncSettings {
diff --git a/src/modules/features/SettingDialogue/PaneSelector.ts b/src/modules/features/SettingDialogue/PaneSelector.ts
index ff0ac95..4f00c68 100644
--- a/src/modules/features/SettingDialogue/PaneSelector.ts
+++ b/src/modules/features/SettingDialogue/PaneSelector.ts
@@ -1,5 +1,5 @@
-import { LEVEL_ADVANCED, type CustomRegExpSource } from "../../../lib/src/common/types.ts";
-import { constructCustomRegExpList, splitCustomRegExpList } from "../../../lib/src/common/utils.ts";
+import { LEVEL_ADVANCED, type CustomRegExpSource } from "@lib/common/types.ts";
+import { constructCustomRegExpList, splitCustomRegExpList } from "@lib/common/utils.ts";
 import MultipleRegExpControl from "./MultipleRegExpControl.svelte";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import { mount } from "svelte";
diff --git a/src/modules/features/SettingDialogue/PaneSetup.ts b/src/modules/features/SettingDialogue/PaneSetup.ts
index 4e365c9..5df4fb9 100644
--- a/src/modules/features/SettingDialogue/PaneSetup.ts
+++ b/src/modules/features/SettingDialogue/PaneSetup.ts
@@ -1,5 +1,5 @@
-import { MarkdownRenderer } from "../../../deps.ts";
-import { $msg } from "../../../lib/src/common/i18n.ts";
+import { MarkdownRenderer } from "@/deps.ts";
+import { $msg } from "@lib/common/i18n.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import { fireAndForget } from "octagonal-wheels/promises";
 import {
@@ -7,13 +7,13 @@ import {
     EVENT_REQUEST_OPEN_SETUP_URI,
     EVENT_REQUEST_SHOW_SETUP_QR,
     eventHub,
-} from "../../../common/events.ts";
+} from "@/common/events.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
 import { visibleOnly } from "./SettingPane.ts";
-import { DEFAULT_SETTINGS } from "../../../lib/src/common/types.ts";
+import { DEFAULT_SETTINGS } from "@lib/common/types.ts";
 import { request } from "@/deps.ts";
-import { SetupManager, UserMode } from "../SetupManager.ts";
+import { SetupManager, UserMode } from "@/modules/features/SetupManager.ts";
 export function paneSetup(
     this: ObsidianLiveSyncSettingTab,
     paneEl: HTMLElement,
diff --git a/src/modules/features/SettingDialogue/PaneSyncSettings.ts b/src/modules/features/SettingDialogue/PaneSyncSettings.ts
index 294b318..9d2a20e 100644
--- a/src/modules/features/SettingDialogue/PaneSyncSettings.ts
+++ b/src/modules/features/SettingDialogue/PaneSyncSettings.ts
@@ -1,13 +1,8 @@
-import {
-    type ObsidianLiveSyncSettings,
-    LOG_LEVEL_NOTICE,
-    REMOTE_COUCHDB,
-    LEVEL_ADVANCED,
-} from "../../../lib/src/common/types.ts";
-import { Logger } from "../../../lib/src/common/logger.ts";
-import { $msg } from "../../../lib/src/common/i18n.ts";
+import { type ObsidianLiveSyncSettings, LOG_LEVEL_NOTICE, REMOTE_COUCHDB, LEVEL_ADVANCED } from "@lib/common/types.ts";
+import { Logger } from "@lib/common/logger.ts";
+import { $msg } from "@lib/common/i18n.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
-import { EVENT_REQUEST_COPY_SETUP_URI, eventHub } from "../../../common/events.ts";
+import { EVENT_REQUEST_COPY_SETUP_URI, eventHub } from "@/common/events.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
 import { visibleOnly } from "./SettingPane.ts";
diff --git a/src/modules/features/SettingDialogue/SettingPane.ts b/src/modules/features/SettingDialogue/SettingPane.ts
index 2fe8f56..1a52f3f 100644
--- a/src/modules/features/SettingDialogue/SettingPane.ts
+++ b/src/modules/features/SettingDialogue/SettingPane.ts
@@ -1,5 +1,5 @@
-import { $msg } from "../../../lib/src/common/i18n";
-import { LEVEL_ADVANCED, LEVEL_EDGE_CASE, LEVEL_POWER_USER, type ConfigLevel } from "../../../lib/src/common/types";
+import { $msg } from "@lib/common/i18n";
+import { LEVEL_ADVANCED, LEVEL_EDGE_CASE, LEVEL_POWER_USER, type ConfigLevel } from "@lib/common/types";
 import type { AllSettingItemKey, AllSettings } from "./settingConstants";
 
 export const combineOnUpdate = (func1: OnUpdateFunc, func2: OnUpdateFunc): OnUpdateFunc => {
diff --git a/src/modules/features/SettingDialogue/remoteConfigBuffer.unit.spec.ts b/src/modules/features/SettingDialogue/remoteConfigBuffer.unit.spec.ts
index 224c7ce..2e5c4a7 100644
--- a/src/modules/features/SettingDialogue/remoteConfigBuffer.unit.spec.ts
+++ b/src/modules/features/SettingDialogue/remoteConfigBuffer.unit.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { DEFAULT_SETTINGS, REMOTE_COUCHDB, REMOTE_MINIO } from "../../../lib/src/common/types";
+import { DEFAULT_SETTINGS, REMOTE_COUCHDB, REMOTE_MINIO } from "@lib/common/types";
 import { syncActivatedRemoteSettings } from "./remoteConfigBuffer";
 
 describe("syncActivatedRemoteSettings", () => {
diff --git a/src/modules/features/SettingDialogue/settingUtils.ts b/src/modules/features/SettingDialogue/settingUtils.ts
index 847ebc0..ab03844 100644
--- a/src/modules/features/SettingDialogue/settingUtils.ts
+++ b/src/modules/features/SettingDialogue/settingUtils.ts
@@ -1,16 +1,11 @@
 import { escapeStringToHTML } from "octagonal-wheels/string";
-import {
-    E2EEAlgorithmNames,
-    MILESTONE_DOCID,
-    NODEINFO_DOCID,
-    type ObsidianLiveSyncSettings,
-} from "../../../lib/src/common/types";
+import { E2EEAlgorithmNames, MILESTONE_DOCID, NODEINFO_DOCID, type ObsidianLiveSyncSettings } from "@lib/common/types";
 import {
     pickCouchDBSyncSettings,
     pickBucketSyncSettings,
     pickP2PSyncSettings,
     pickEncryptionSettings,
-} from "../../../lib/src/common/utils";
+} from "@lib/common/utils";
 import { getConfig, type AllSettingItemKey } from "./settingConstants";
 import { LOG_LEVEL_NOTICE, Logger } from "octagonal-wheels/common/logger";
 
diff --git a/src/modules/features/SettingDialogue/utilFixCouchDBSetting.ts b/src/modules/features/SettingDialogue/utilFixCouchDBSetting.ts
index d061643..dd6d703 100644
--- a/src/modules/features/SettingDialogue/utilFixCouchDBSetting.ts
+++ b/src/modules/features/SettingDialogue/utilFixCouchDBSetting.ts
@@ -1,10 +1,10 @@
-import { requestToCouchDBWithCredentials } from "../../../common/utils";
-import { $msg } from "../../../lib/src/common/i18n";
-import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, Logger } from "../../../lib/src/common/logger";
-import type { ObsidianLiveSyncSettings } from "../../../lib/src/common/types";
-import { fireAndForget, parseHeaderValues } from "../../../lib/src/common/utils";
-import { isCloudantURI } from "../../../lib/src/pouchdb/utils_couchdb";
-import { generateCredentialObject } from "../../../lib/src/replication/httplib";
+import { requestToCouchDBWithCredentials } from "@/common/utils";
+import { $msg } from "@lib/common/i18n";
+import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, Logger } from "@lib/common/logger";
+import type { ObsidianLiveSyncSettings } from "@lib/common/types";
+import { fireAndForget, parseHeaderValues } from "@lib/common/utils";
+import { isCloudantURI } from "@lib/pouchdb/utils_couchdb";
+import { generateCredentialObject } from "@lib/replication/httplib";
 
 export const checkConfig = async (
     checkResultDiv: HTMLDivElement | undefined,
diff --git a/src/modules/features/SetupManager.ts b/src/modules/features/SetupManager.ts
index 890a2cf..56287d7 100644
--- a/src/modules/features/SetupManager.ts
+++ b/src/modules/features/SetupManager.ts
@@ -26,7 +26,7 @@ import SetupRemoteBucket from "./SetupWizard/dialogs/SetupRemoteBucket.svelte";
 import SetupRemoteP2P from "./SetupWizard/dialogs/SetupRemoteP2P.svelte";
 import SetupRemoteE2EE from "./SetupWizard/dialogs/SetupRemoteE2EE.svelte";
 import { decodeSettingsFromQRCodeData } from "@lib/API/processSetting.ts";
-import { AbstractModule } from "../AbstractModule.ts";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
 import { ConnectionStringParser } from "@lib/common/ConnectionString.ts";
 import type {
     OutroAskUserModeResultType,
diff --git a/src/modules/features/SetupManager.unit.spec.ts b/src/modules/features/SetupManager.unit.spec.ts
index ef94c4d..756528b 100644
--- a/src/modules/features/SetupManager.unit.spec.ts
+++ b/src/modules/features/SetupManager.unit.spec.ts
@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { DEFAULT_SETTINGS, REMOTE_COUCHDB, type ObsidianLiveSyncSettings } from "../../lib/src/common/types";
-import { SettingService } from "../../lib/src/services/base/SettingService";
-import { ServiceContext } from "../../lib/src/services/base/ServiceBase";
+import { DEFAULT_SETTINGS, REMOTE_COUCHDB, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { SettingService } from "@lib/services/base/SettingService";
+import { ServiceContext } from "@lib/services/base/ServiceBase";
 
 vi.mock("./SetupWizard/dialogs/Intro.svelte", () => ({ default: {} }));
 vi.mock("./SetupWizard/dialogs/SelectMethodNewUser.svelte", () => ({ default: {} }));
@@ -21,7 +21,7 @@ vi.mock("../../lib/src/API/processSetting.ts", () => ({
     decodeSettingsFromQRCodeData: vi.fn(),
 }));
 
-import { decodeSettingsFromQRCodeData } from "../../lib/src/API/processSetting.ts";
+import { decodeSettingsFromQRCodeData } from "@lib/API/processSetting.ts";
 import { SetupManager, UserMode } from "./SetupManager";
 
 class TestSettingService extends SettingService<ServiceContext> {
diff --git a/src/modules/features/SetupWizard/dialogs/OutroAskUserMode.svelte b/src/modules/features/SetupWizard/dialogs/OutroAskUserMode.svelte
index 4869984..4153c5b 100644
--- a/src/modules/features/SetupWizard/dialogs/OutroAskUserMode.svelte
+++ b/src/modules/features/SetupWizard/dialogs/OutroAskUserMode.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-    import DialogHeader from "@/lib/src/UI/components/DialogHeader.svelte";
-    import Guidance from "@/lib/src/UI/components/Guidance.svelte";
-    import Decision from "@/lib/src/UI/components/Decision.svelte";
-    import Question from "@/lib/src/UI/components/Question.svelte";
-    import Option from "@/lib/src/UI/components/Option.svelte";
-    import Instruction from "@/lib/src/UI/components/Instruction.svelte";
-    import UserDecisions from "@/lib/src/UI/components/UserDecisions.svelte";
-    import InfoNote from "@/lib/src/UI/components/InfoNote.svelte";
+    import DialogHeader from "@lib/UI/components/DialogHeader.svelte";
+    import Guidance from "@lib/UI/components/Guidance.svelte";
+    import Decision from "@lib/UI/components/Decision.svelte";
+    import Question from "@lib/UI/components/Question.svelte";
+    import Option from "@lib/UI/components/Option.svelte";
+    import Instruction from "@lib/UI/components/Instruction.svelte";
+    import UserDecisions from "@lib/UI/components/UserDecisions.svelte";
+    import InfoNote from "@lib/UI/components/InfoNote.svelte";
     import {
         type OutroAskUserModeResultType,
         TYPE_CANCELLED,
diff --git a/src/modules/features/SetupWizard/dialogs/OutroNewUser.svelte b/src/modules/features/SetupWizard/dialogs/OutroNewUser.svelte
index 3818a29..031ae85 100644
--- a/src/modules/features/SetupWizard/dialogs/OutroNewUser.svelte
+++ b/src/modules/features/SetupWizard/dialogs/OutroNewUser.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-    import DialogHeader from "@/lib/src/UI/components/DialogHeader.svelte";
-    import Guidance from "@/lib/src/UI/components/Guidance.svelte";
-    import Decision from "@/lib/src/UI/components/Decision.svelte";
-    import Question from "@/lib/src/UI/components/Question.svelte";
-    import Instruction from "@/lib/src/UI/components/Instruction.svelte";
-    import UserDecisions from "@/lib/src/UI/components/UserDecisions.svelte";
+    import DialogHeader from "@lib/UI/components/DialogHeader.svelte";
+    import Guidance from "@lib/UI/components/Guidance.svelte";
+    import Decision from "@lib/UI/components/Decision.svelte";
+    import Question from "@lib/UI/components/Question.svelte";
+    import Instruction from "@lib/UI/components/Instruction.svelte";
+    import UserDecisions from "@lib/UI/components/UserDecisions.svelte";
     import { TYPE_APPLY, TYPE_CANCELLED, type OutroNewUserResultType } from "./setupDialogTypes";
 
     type Props = {
diff --git a/src/modules/features/SetupWizard/dialogs/RebuildEverything.svelte b/src/modules/features/SetupWizard/dialogs/RebuildEverything.svelte
index 1fe06e3..8db36e4 100644
--- a/src/modules/features/SetupWizard/dialogs/RebuildEverything.svelte
+++ b/src/modules/features/SetupWizard/dialogs/RebuildEverything.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
-    import DialogHeader from "@/lib/src/UI/components/DialogHeader.svelte";
-    import Guidance from "@/lib/src/UI/components/Guidance.svelte";
-    import Decision from "@/lib/src/UI/components/Decision.svelte";
-    import Question from "@/lib/src/UI/components/Question.svelte";
-    import Option from "@/lib/src/UI/components/Option.svelte";
-    import Options from "@/lib/src/UI/components/Options.svelte";
-    import Instruction from "@/lib/src/UI/components/Instruction.svelte";
-    import UserDecisions from "@/lib/src/UI/components/UserDecisions.svelte";
-    import InfoNote from "@/lib/src/UI/components/InfoNote.svelte";
-    import ExtraItems from "@/lib/src/UI/components/ExtraItems.svelte";
-    import Check from "@/lib/src/UI/components/Check.svelte";
+    import DialogHeader from "@lib/UI/components/DialogHeader.svelte";
+    import Guidance from "@lib/UI/components/Guidance.svelte";
+    import Decision from "@lib/UI/components/Decision.svelte";
+    import Question from "@lib/UI/components/Question.svelte";
+    import Option from "@lib/UI/components/Option.svelte";
+    import Options from "@lib/UI/components/Options.svelte";
+    import Instruction from "@lib/UI/components/Instruction.svelte";
+    import UserDecisions from "@lib/UI/components/UserDecisions.svelte";
+    import InfoNote from "@lib/UI/components/InfoNote.svelte";
+    import ExtraItems from "@lib/UI/components/ExtraItems.svelte";
+    import Check from "@lib/UI/components/Check.svelte";
     import {
         TYPE_CANCEL,
         TYPE_BACKUP_DONE,
diff --git a/src/modules/features/SetupWizard/dialogs/ScanQRCode.svelte b/src/modules/features/SetupWizard/dialogs/ScanQRCode.svelte
index 4a24f46..fcef313 100644
--- a/src/modules/features/SetupWizard/dialogs/ScanQRCode.svelte
+++ b/src/modules/features/SetupWizard/dialogs/ScanQRCode.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-    import DialogHeader from "@/lib/src/UI/components/DialogHeader.svelte";
-    import Guidance from "@/lib/src/UI/components/Guidance.svelte";
-    import Decision from "@/lib/src/UI/components/Decision.svelte";
-    import Instruction from "@/lib/src/UI/components/Instruction.svelte";
-    import UserDecisions from "@/lib/src/UI/components/UserDecisions.svelte";
+    import DialogHeader from "@lib/UI/components/DialogHeader.svelte";
+    import Guidance from "@lib/UI/components/Guidance.svelte";
+    import Decision from "@lib/UI/components/Decision.svelte";
+    import Instruction from "@lib/UI/components/Instruction.svelte";
+    import UserDecisions from "@lib/UI/components/UserDecisions.svelte";
     import { TYPE_CLOSE, type ScanQRCodeResultType } from "./setupDialogTypes";
 
     type Props = {
diff --git a/src/modules/features/SetupWizard/dialogs/SelectMethodExisting.svelte b/src/modules/features/SetupWizard/dialogs/SelectMethodExisting.svelte
index 982d60c..d69504a 100644
--- a/src/modules/features/SetupWizard/dialogs/SelectMethodExisting.svelte
+++ b/src/modules/features/SetupWizard/dialogs/SelectMethodExisting.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-    import DialogHeader from "@/lib/src/UI/components/DialogHeader.svelte";
-    import Guidance from "@/lib/src/UI/components/Guidance.svelte";
-    import Decision from "@/lib/src/UI/components/Decision.svelte";
-    import Question from "@/lib/src/UI/components/Question.svelte";
-    import Option from "@/lib/src/UI/components/Option.svelte";
-    import Options from "@/lib/src/UI/components/Options.svelte";
-    import Instruction from "@/lib/src/UI/components/Instruction.svelte";
-    import UserDecisions from "@/lib/src/UI/components/UserDecisions.svelte";
+    import DialogHeader from "@lib/UI/components/DialogHeader.svelte";
+    import Guidance from "@lib/UI/components/Guidance.svelte";
+    import Decision from "@lib/UI/components/Decision.svelte";
+    import Question from "@lib/UI/components/Question.svelte";
+    import Option from "@lib/UI/components/Option.svelte";
+    import Options from "@lib/UI/components/Options.svelte";
+    import Instruction from "@lib/UI/components/Instruction.svelte";
+    import UserDecisions from "@lib/UI/components/UserDecisions.svelte";
     import {
         TYPE_USE_SETUP_URI,
         TYPE_SCAN_QR_CODE,
diff --git a/src/modules/features/SetupWizard/dialogs/SelectMethodNewUser.svelte b/src/modules/features/SetupWizard/dialogs/SelectMethodNewUser.svelte
index 36e90fc..b4f29de 100644
--- a/src/modules/features/SetupWizard/dialogs/SelectMethodNewUser.svelte
+++ b/src/modules/features/SetupWizard/dialogs/SelectMethodNewUser.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-    import DialogHeader from "@/lib/src/UI/components/DialogHeader.svelte";
-    import Guidance from "@/lib/src/UI/components/Guidance.svelte";
-    import Decision from "@/lib/src/UI/components/Decision.svelte";
-    import Question from "@/lib/src/UI/components/Question.svelte";
-    import Option from "@/lib/src/UI/components/Option.svelte";
-    import Options from "@/lib/src/UI/components/Options.svelte";
-    import Instruction from "@/lib/src/UI/components/Instruction.svelte";
-    import UserDecisions from "@/lib/src/UI/components/UserDecisions.svelte";
+    import DialogHeader from "@lib/UI/components/DialogHeader.svelte";
+    import Guidance from "@lib/UI/components/Guidance.svelte";
+    import Decision from "@lib/UI/components/Decision.svelte";
+    import Question from "@lib/UI/components/Question.svelte";
+    import Option from "@lib/UI/components/Option.svelte";
+    import Options from "@lib/UI/components/Options.svelte";
+    import Instruction from "@lib/UI/components/Instruction.svelte";
+    import UserDecisions from "@lib/UI/components/UserDecisions.svelte";
     import {
         TYPE_USE_SETUP_URI,
         TYPE_CONFIGURE_MANUALLY,
diff --git a/src/modules/features/SetupWizard/dialogs/SetupRemote.svelte b/src/modules/features/SetupWizard/dialogs/SetupRemote.svelte
index 365f117..01a299e 100644
--- a/src/modules/features/SetupWizard/dialogs/SetupRemote.svelte
+++ b/src/modules/features/SetupWizard/dialogs/SetupRemote.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-    import DialogHeader from "@/lib/src/UI/components/DialogHeader.svelte";
-    import Decision from "@/lib/src/UI/components/Decision.svelte";
-    import Question from "@/lib/src/UI/components/Question.svelte";
-    import Option from "@/lib/src/UI/components/Option.svelte";
-    import Options from "@/lib/src/UI/components/Options.svelte";
-    import Instruction from "@/lib/src/UI/components/Instruction.svelte";
-    import UserDecisions from "@/lib/src/UI/components/UserDecisions.svelte";
+    import DialogHeader from "@lib/UI/components/DialogHeader.svelte";
+    import Decision from "@lib/UI/components/Decision.svelte";
+    import Question from "@lib/UI/components/Question.svelte";
+    import Option from "@lib/UI/components/Option.svelte";
+    import Options from "@lib/UI/components/Options.svelte";
+    import Instruction from "@lib/UI/components/Instruction.svelte";
+    import UserDecisions from "@lib/UI/components/UserDecisions.svelte";
     import {
         TYPE_COUCHDB,
         TYPE_BUCKET,
diff --git a/src/modules/features/SetupWizard/dialogs/SetupRemoteBucket.svelte b/src/modules/features/SetupWizard/dialogs/SetupRemoteBucket.svelte
index 7c04c38..2ee81af 100644
--- a/src/modules/features/SetupWizard/dialogs/SetupRemoteBucket.svelte
+++ b/src/modules/features/SetupWizard/dialogs/SetupRemoteBucket.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-    import DialogHeader from "@/lib/src/UI/components/DialogHeader.svelte";
-    import Guidance from "@/lib/src/UI/components/Guidance.svelte";
-    import Decision from "@/lib/src/UI/components/Decision.svelte";
-    import UserDecisions from "@/lib/src/UI/components/UserDecisions.svelte";
-    import InfoNote from "@/lib/src/UI/components/InfoNote.svelte";
-    import ExtraItems from "@/lib/src/UI/components/ExtraItems.svelte";
-    import InputRow from "@/lib/src/UI/components/InputRow.svelte";
-    import Password from "@/lib/src/UI/components/Password.svelte";
+    import DialogHeader from "@lib/UI/components/DialogHeader.svelte";
+    import Guidance from "@lib/UI/components/Guidance.svelte";
+    import Decision from "@lib/UI/components/Decision.svelte";
+    import UserDecisions from "@lib/UI/components/UserDecisions.svelte";
+    import InfoNote from "@lib/UI/components/InfoNote.svelte";
+    import ExtraItems from "@lib/UI/components/ExtraItems.svelte";
+    import InputRow from "@lib/UI/components/InputRow.svelte";
+    import Password from "@lib/UI/components/Password.svelte";
     import {
         type BucketSyncSetting,
         type ObsidianLiveSyncSettings,
diff --git a/src/modules/features/SetupWizard/dialogs/SetupRemoteCouchDB.svelte b/src/modules/features/SetupWizard/dialogs/SetupRemoteCouchDB.svelte
index 39d54c4..554f568 100644
--- a/src/modules/features/SetupWizard/dialogs/SetupRemoteCouchDB.svelte
+++ b/src/modules/features/SetupWizard/dialogs/SetupRemoteCouchDB.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-    import DialogHeader from "@/lib/src/UI/components/DialogHeader.svelte";
-    import Guidance from "@/lib/src/UI/components/Guidance.svelte";
-    import Decision from "@/lib/src/UI/components/Decision.svelte";
-    import UserDecisions from "@/lib/src/UI/components/UserDecisions.svelte";
-    import InfoNote from "@/lib/src/UI/components/InfoNote.svelte";
-    import ExtraItems from "@/lib/src/UI/components/ExtraItems.svelte";
-    import InputRow from "@/lib/src/UI/components/InputRow.svelte";
-    import Password from "@/lib/src/UI/components/Password.svelte";
+    import DialogHeader from "@lib/UI/components/DialogHeader.svelte";
+    import Guidance from "@lib/UI/components/Guidance.svelte";
+    import Decision from "@lib/UI/components/Decision.svelte";
+    import UserDecisions from "@lib/UI/components/UserDecisions.svelte";
+    import InfoNote from "@lib/UI/components/InfoNote.svelte";
+    import ExtraItems from "@lib/UI/components/ExtraItems.svelte";
+    import InputRow from "@lib/UI/components/InputRow.svelte";
+    import Password from "@lib/UI/components/Password.svelte";
     import {
         DEFAULT_SETTINGS,
         PREFERRED_SETTING_CLOUDANT,
diff --git a/src/modules/features/SetupWizard/dialogs/SetupRemoteE2EE.svelte b/src/modules/features/SetupWizard/dialogs/SetupRemoteE2EE.svelte
index f3c40ed..09a6176 100644
--- a/src/modules/features/SetupWizard/dialogs/SetupRemoteE2EE.svelte
+++ b/src/modules/features/SetupWizard/dialogs/SetupRemoteE2EE.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-    import DialogHeader from "@/lib/src/UI/components/DialogHeader.svelte";
-    import Guidance from "@/lib/src/UI/components/Guidance.svelte";
-    import Decision from "@/lib/src/UI/components/Decision.svelte";
-    import UserDecisions from "@/lib/src/UI/components/UserDecisions.svelte";
-    import InfoNote from "@/lib/src/UI/components/InfoNote.svelte";
-    import ExtraItems from "@/lib/src/UI/components/ExtraItems.svelte";
-    import InputRow from "@/lib/src/UI/components/InputRow.svelte";
-    import Password from "@/lib/src/UI/components/Password.svelte";
+    import DialogHeader from "@lib/UI/components/DialogHeader.svelte";
+    import Guidance from "@lib/UI/components/Guidance.svelte";
+    import Decision from "@lib/UI/components/Decision.svelte";
+    import UserDecisions from "@lib/UI/components/UserDecisions.svelte";
+    import InfoNote from "@lib/UI/components/InfoNote.svelte";
+    import ExtraItems from "@lib/UI/components/ExtraItems.svelte";
+    import InputRow from "@lib/UI/components/InputRow.svelte";
+    import Password from "@lib/UI/components/Password.svelte";
     import {
         DEFAULT_SETTINGS,
         E2EEAlgorithmNames,
diff --git a/src/modules/features/SetupWizard/dialogs/UseSetupURI.svelte b/src/modules/features/SetupWizard/dialogs/UseSetupURI.svelte
index d1ed1ac..840f553 100644
--- a/src/modules/features/SetupWizard/dialogs/UseSetupURI.svelte
+++ b/src/modules/features/SetupWizard/dialogs/UseSetupURI.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
     import { configURIBase } from "@/common/types";
     import type { ObsidianLiveSyncSettings } from "@lib/common/types";
-    import DialogHeader from "@/lib/src/UI/components/DialogHeader.svelte";
-    import Guidance from "@/lib/src/UI/components/Guidance.svelte";
-    import Decision from "@/lib/src/UI/components/Decision.svelte";
-    import UserDecisions from "@/lib/src/UI/components/UserDecisions.svelte";
-    import InfoNote from "@/lib/src/UI/components/InfoNote.svelte";
-    import InputRow from "@/lib/src/UI/components/InputRow.svelte";
-    import Password from "@/lib/src/UI/components/Password.svelte";
+    import DialogHeader from "@lib/UI/components/DialogHeader.svelte";
+    import Guidance from "@lib/UI/components/Guidance.svelte";
+    import Decision from "@lib/UI/components/Decision.svelte";
+    import UserDecisions from "@lib/UI/components/UserDecisions.svelte";
+    import InfoNote from "@lib/UI/components/InfoNote.svelte";
+    import InputRow from "@lib/UI/components/InputRow.svelte";
+    import Password from "@lib/UI/components/Password.svelte";
 
     import { onMount } from "svelte";
     import { decryptString } from "@lib/encryption/stringEncryption.ts";
diff --git a/src/modules/features/SetupWizard/dialogs/utilCheckCouchDB.ts b/src/modules/features/SetupWizard/dialogs/utilCheckCouchDB.ts
index 62699bc..0de0a6a 100644
--- a/src/modules/features/SetupWizard/dialogs/utilCheckCouchDB.ts
+++ b/src/modules/features/SetupWizard/dialogs/utilCheckCouchDB.ts
@@ -1,10 +1,10 @@
-import { requestToCouchDBWithCredentials } from "../../../../common/utils";
-import { $msg } from "../../../../lib/src/common/i18n";
-import { Logger } from "../../../../lib/src/common/logger";
-import type { ObsidianLiveSyncSettings } from "../../../../lib/src/common/types";
-import { parseHeaderValues } from "../../../../lib/src/common/utils";
-import { isCloudantURI } from "../../../../lib/src/pouchdb/utils_couchdb";
-import { generateCredentialObject } from "../../../../lib/src/replication/httplib";
+import { requestToCouchDBWithCredentials } from "@/common/utils";
+import { $msg } from "@lib/common/i18n";
+import { Logger } from "@lib/common/logger";
+import type { ObsidianLiveSyncSettings } from "@lib/common/types";
+import { parseHeaderValues } from "@lib/common/utils";
+import { isCloudantURI } from "@lib/pouchdb/utils_couchdb";
+import { generateCredentialObject } from "@lib/replication/httplib";
 export type ResultMessage = { message: string; classes: string[] };
 export type ResultErrorMessage = { message: string; result: "error"; classes: string[] };
 export type ResultOk = { message: string; result: "ok"; value?: any };
diff --git a/src/modules/main/ModuleLiveSyncMain.ts b/src/modules/main/ModuleLiveSyncMain.ts
index 4be2f40..73f45c1 100644
--- a/src/modules/main/ModuleLiveSyncMain.ts
+++ b/src/modules/main/ModuleLiveSyncMain.ts
@@ -1,17 +1,17 @@
 import { fireAndForget } from "octagonal-wheels/promises";
-import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, VER, type ObsidianLiveSyncSettings } from "../../lib/src/common/types.ts";
+import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, VER, type ObsidianLiveSyncSettings } from "@lib/common/types.ts";
 import {
     EVENT_LAYOUT_READY,
     EVENT_PLUGIN_LOADED,
     EVENT_REQUEST_RELOAD_SETTING_TAB,
     EVENT_SETTING_SAVED,
     eventHub,
-} from "../../common/events.ts";
-import { $msg, setLang } from "../../lib/src/common/i18n.ts";
-import { versionNumberString2Number } from "../../lib/src/string_and_binary/convert.ts";
-import { AbstractModule } from "../AbstractModule.ts";
+} from "@/common/events.ts";
+import { $msg, setLang } from "@lib/common/i18n.ts";
+import { versionNumberString2Number } from "@lib/string_and_binary/convert.ts";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
 import type { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub.ts";
-import type { LiveSyncCore } from "../../main.ts";
+import type { LiveSyncCore } from "@/main.ts";
 import { initialiseWorkerModule } from "@lib/worker/bgWorker.ts";
 import { manifestVersion, packageVersion } from "@lib/common/coreEnvVars.ts";
 import { compatGlobal } from "@lib/common/coreEnvFunctions.ts";
diff --git a/src/modules/services/ObsidianAPIService.ts b/src/modules/services/ObsidianAPIService.ts
index 2ac8d76..ce00f43 100644
--- a/src/modules/services/ObsidianAPIService.ts
+++ b/src/modules/services/ObsidianAPIService.ts
@@ -1,11 +1,11 @@
 import { InjectableAPIService } from "@lib/services/implements/injectable/InjectableAPIService";
 import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
 import { Platform, type Command, type ViewCreator } from "obsidian";
-import { ObsHttpHandler } from "../essentialObsidian/APILib/ObsHttpHandler";
+import { ObsHttpHandler } from "@/modules/essentialObsidian/APILib/ObsHttpHandler";
 import { ObsidianConfirm } from "./ObsidianConfirm";
 import type { Confirm } from "@lib/interfaces/Confirm";
 import { requestUrl, type RequestUrlParam } from "@/deps";
-import { compatGlobal } from "@/lib/src/common/coreEnvFunctions";
+import { compatGlobal } from "@lib/common/coreEnvFunctions";
 // All Services will be migrated to be based on Plain Services, not Injectable Services.
 // This is a migration step.
 
diff --git a/src/modules/services/ObsidianAppLifecycleService.ts b/src/modules/services/ObsidianAppLifecycleService.ts
index b751bcb..6c730e6 100644
--- a/src/modules/services/ObsidianAppLifecycleService.ts
+++ b/src/modules/services/ObsidianAppLifecycleService.ts
@@ -1,5 +1,5 @@
-import { AppLifecycleServiceBase } from "@/lib/src/services/implements/injectable/InjectableAppLifecycleService";
-import type { ObsidianServiceContext } from "@/lib/src/services/implements/obsidian/ObsidianServiceContext";
+import { AppLifecycleServiceBase } from "@lib/services/implements/injectable/InjectableAppLifecycleService";
+import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
 declare module "obsidian" {
     interface App {
         commands: {
diff --git a/src/modules/services/ObsidianConfirm.ts b/src/modules/services/ObsidianConfirm.ts
index eb4e3b3..ca4f9c1 100644
--- a/src/modules/services/ObsidianConfirm.ts
+++ b/src/modules/services/ObsidianConfirm.ts
@@ -1,15 +1,15 @@
 import { type App, type Plugin, Notice } from "@/deps";
 import { scheduleTask, memoIfNotExist, memoObject, retrieveMemoObject, disposeMemoObject } from "@/common/utils";
-import { $msg } from "@/lib/src/common/i18n";
-import type { Confirm } from "@/lib/src/interfaces/Confirm";
-import type { ObsidianServiceContext } from "@/lib/src/services/implements/obsidian/ObsidianServiceContext";
+import { $msg } from "@lib/common/i18n";
+import type { Confirm } from "@lib/interfaces/Confirm";
+import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
 import {
     askYesNo,
     askString,
     confirmWithMessageWithWideButton,
     askSelectString,
     confirmWithMessage,
-} from "../coreObsidian/UILib/dialogs";
+} from "@/modules/coreObsidian/UILib/dialogs";
 
 export class ObsidianConfirm<T extends ObsidianServiceContext = ObsidianServiceContext> implements Confirm {
     private _context: T;
diff --git a/src/modules/services/ObsidianDatabaseService.ts b/src/modules/services/ObsidianDatabaseService.ts
index b2e4146..39759f9 100644
--- a/src/modules/services/ObsidianDatabaseService.ts
+++ b/src/modules/services/ObsidianDatabaseService.ts
@@ -1,7 +1,7 @@
 import { initializeStores } from "@/common/stores";
 
 // import { InjectableDatabaseService } from "@/lib/src/services/implements/injectable/InjectableDatabaseService";
-import type { ObsidianServiceContext } from "@/lib/src/services/implements/obsidian/ObsidianServiceContext";
+import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
 import { DatabaseService, type DatabaseServiceDependencies } from "@lib/services/base/DatabaseService.ts";
 
 export class ObsidianDatabaseService<T extends ObsidianServiceContext> extends DatabaseService<T> {
diff --git a/src/modules/services/ObsidianPathService.ts b/src/modules/services/ObsidianPathService.ts
index 82b5c85..ed479e0 100644
--- a/src/modules/services/ObsidianPathService.ts
+++ b/src/modules/services/ObsidianPathService.ts
@@ -1,6 +1,6 @@
 import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
 import { normalizePath } from "@/deps";
-import { PathService } from "@/lib/src/services/base/PathService";
+import { PathService } from "@lib/services/base/PathService";
 
 import {
     type BASE_IS_NEW,
@@ -11,7 +11,7 @@ import {
     compareFileFreshness,
     isMarkedAsSameChanges,
 } from "@/common/utils";
-import type { UXFileInfo, AnyEntry, UXFileInfoStub, FilePathWithPrefix } from "@/lib/src/common/types";
+import type { UXFileInfo, AnyEntry, UXFileInfoStub, FilePathWithPrefix } from "@lib/common/types";
 export class ObsidianPathService extends PathService<ObsidianServiceContext> {
     override markChangesAreSame(
         old: UXFileInfo | AnyEntry | FilePathWithPrefix,
diff --git a/src/modules/services/ObsidianSettingService.ts b/src/modules/services/ObsidianSettingService.ts
index e684ea5..f3a32ee 100644
--- a/src/modules/services/ObsidianSettingService.ts
+++ b/src/modules/services/ObsidianSettingService.ts
@@ -1,4 +1,4 @@
-import { compatGlobal } from "@/lib/src/common/coreEnvFunctions";
+import { compatGlobal } from "@lib/common/coreEnvFunctions";
 import { type ObsidianLiveSyncSettings } from "@lib/common/types";
 import { EVENT_REQUEST_RELOAD_SETTING_TAB, EVENT_SETTING_SAVED } from "@lib/events/coreEvents";
 import { eventHub } from "@lib/hub/hub";
diff --git a/src/modules/services/ObsidianUIService.ts b/src/modules/services/ObsidianUIService.ts
index 67f6955..45975af 100644
--- a/src/modules/services/ObsidianUIService.ts
+++ b/src/modules/services/ObsidianUIService.ts
@@ -1,7 +1,7 @@
 import type { ConfigService } from "@lib/services/base/ConfigService";
 import type { AppLifecycleService } from "@lib/services/base/AppLifecycleService";
 import type { ReplicatorService } from "@lib/services/base/ReplicatorService";
-import { UIService } from "@lib/services//implements/base/UIService";
+import { UIService } from "@lib/services/implements/base/UIService";
 import { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
 import { ObsidianSvelteDialogManager } from "./SvelteDialogObsidian";
 import DialogToCopy from "@lib/UI/dialogues/DialogueToCopy.svelte";
diff --git a/src/modules/services/ObsidianVaultService.ts b/src/modules/services/ObsidianVaultService.ts
index 480c561..d86c7b1 100644
--- a/src/modules/services/ObsidianVaultService.ts
+++ b/src/modules/services/ObsidianVaultService.ts
@@ -1,7 +1,7 @@
 import { getPathFromTFile, isValidPath } from "@/common/utils";
-import { InjectableVaultService } from "@/lib/src/services/implements/injectable/InjectableVaultService";
-import type { ObsidianServiceContext } from "@/lib/src/services/implements/obsidian/ObsidianServiceContext";
-import type { FilePath } from "@/lib/src/common/types";
+import { InjectableVaultService } from "@lib/services/implements/injectable/InjectableVaultService";
+import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
+import type { FilePath } from "@lib/common/types";
 
 declare module "obsidian" {
     interface DataAdapter {
diff --git a/src/modules/services/SvelteDialogObsidian.ts b/src/modules/services/SvelteDialogObsidian.ts
index b40418b..95c9ba2 100644
--- a/src/modules/services/SvelteDialogObsidian.ts
+++ b/src/modules/services/SvelteDialogObsidian.ts
@@ -7,7 +7,7 @@ import {
     type SvelteDialogManagerDependencies,
 } from "@lib/services/implements/base/SvelteDialog";
 import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
-import DialogHost from "@/lib/src/UI/DialogHost.svelte";
+import DialogHost from "@lib/UI/DialogHost.svelte";
 export const SvelteDialogBase = SvelteDialogMixIn(Modal, DialogHost);
 export class SvelteDialogObsidian<
     T,
diff --git a/src/serviceFeatures/redFlag.ts b/src/serviceFeatures/redFlag.ts
index 6f0af05..bcbdbe7 100644
--- a/src/serviceFeatures/redFlag.ts
+++ b/src/serviceFeatures/redFlag.ts
@@ -2,8 +2,8 @@ import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "octagonal-w
 import type { NecessaryServices } from "@lib/interfaces/ServiceModule";
 import { createInstanceLogFunction, type LogFunction } from "@lib/services/lib/logUtils";
 import { FlagFilesHumanReadable, FlagFilesOriginal } from "@lib/common/models/redflag.const";
-import FetchEverything from "../modules/features/SetupWizard/dialogs/FetchEverything.svelte";
-import RebuildEverything from "../modules/features/SetupWizard/dialogs/RebuildEverything.svelte";
+import FetchEverything from "@/modules/features/SetupWizard/dialogs/FetchEverything.svelte";
+import RebuildEverything from "@/modules/features/SetupWizard/dialogs/RebuildEverything.svelte";
 import { extractObject } from "octagonal-wheels/object";
 import { REMOTE_MINIO, REMOTE_P2P } from "@lib/common/models/setting.const";
 import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
diff --git a/src/serviceFeatures/redFlag.unit.spec.ts b/src/serviceFeatures/redFlag.unit.spec.ts
index e2a77a0..7ab9e70 100644
--- a/src/serviceFeatures/redFlag.unit.spec.ts
+++ b/src/serviceFeatures/redFlag.unit.spec.ts
@@ -18,12 +18,12 @@ import {
     TweakValuesRecommendedTemplate,
     TweakValuesShouldMatchedTemplate,
     TweakValuesTemplate,
-} from "@/lib/src/common/types";
+} from "@lib/common/types";
 import {
     ExtraOnLocal,
     FullScanModes,
     synchroniseAllFilesBetweenDBandStorage,
-} from "@/lib/src/serviceFeatures/offlineScanner";
+} from "@lib/serviceFeatures/offlineScanner";
 import {
     SIMPLE_FETCH_STAGE1_LEGACY,
     SIMPLE_FETCH_STAGE1_NEWER_WINS,
diff --git a/src/serviceFeatures/useP2PReplicatorUI.ts b/src/serviceFeatures/useP2PReplicatorUI.ts
index 3e3882a..da06492 100644
--- a/src/serviceFeatures/useP2PReplicatorUI.ts
+++ b/src/serviceFeatures/useP2PReplicatorUI.ts
@@ -1,8 +1,8 @@
 import { eventHub, EVENT_REQUEST_OPEN_P2P } from "@/common/events";
 import { reactiveSource } from "octagonal-wheels/dataobject/reactive_v2";
 import type { NecessaryServices } from "@lib/interfaces/ServiceModule";
-import { type UseP2PReplicatorResult } from "@/lib/src/replication/trystero/UseP2PReplicatorResult";
-import { P2PLogCollector } from "@/lib/src/replication/trystero/P2PLogCollector";
+import { type UseP2PReplicatorResult } from "@lib/replication/trystero/UseP2PReplicatorResult";
+import { P2PLogCollector } from "@lib/replication/trystero/P2PLogCollector";
 import { P2PReplicatorPaneView, VIEW_TYPE_P2P } from "@/features/P2PSync/P2PReplicator/P2PReplicatorPaneView";
 import {
     P2PServerStatusPaneView,
diff --git a/src/serviceModules/FileSystemAdapters/ObsidianConversionAdapter.ts b/src/serviceModules/FileSystemAdapters/ObsidianConversionAdapter.ts
index 82e6f65..0295759 100644
--- a/src/serviceModules/FileSystemAdapters/ObsidianConversionAdapter.ts
+++ b/src/serviceModules/FileSystemAdapters/ObsidianConversionAdapter.ts
@@ -1,5 +1,5 @@
-import type { UXFileInfoStub, UXFolderInfo } from "@/lib/src/common/types";
-import type { IConversionAdapter } from "@/lib/src/serviceModules/adapters";
+import type { UXFileInfoStub, UXFolderInfo } from "@lib/common/types";
+import type { IConversionAdapter } from "@lib/serviceModules/adapters";
 import { TFileToUXFileInfoStub, TFolderToUXFileInfoStub } from "@/modules/coreObsidian/storageLib/utilObsidian";
 import type { TFile, TFolder } from "obsidian";
 
diff --git a/src/serviceModules/FileSystemAdapters/ObsidianFileSystemAdapter.ts b/src/serviceModules/FileSystemAdapters/ObsidianFileSystemAdapter.ts
index 944a007..be527df 100644
--- a/src/serviceModules/FileSystemAdapters/ObsidianFileSystemAdapter.ts
+++ b/src/serviceModules/FileSystemAdapters/ObsidianFileSystemAdapter.ts
@@ -1,4 +1,4 @@
-import type { FilePath, UXStat } from "@/lib/src/common/types";
+import type { FilePath, UXStat } from "@lib/common/types";
 import type {
     IFileSystemAdapter,
     IPathAdapter,
@@ -6,7 +6,7 @@ import type {
     IConversionAdapter,
     IStorageAdapter,
     IVaultAdapter,
-} from "@/lib/src/serviceModules/adapters";
+} from "@lib/serviceModules/adapters";
 import type { TAbstractFile, TFile, TFolder, Stat, App } from "obsidian";
 import { ObsidianConversionAdapter } from "./ObsidianConversionAdapter";
 import { ObsidianPathAdapter } from "./ObsidianPathAdapter";
diff --git a/src/serviceModules/FileSystemAdapters/ObsidianStorageAdapter.ts b/src/serviceModules/FileSystemAdapters/ObsidianStorageAdapter.ts
index fe4818e..a913301 100644
--- a/src/serviceModules/FileSystemAdapters/ObsidianStorageAdapter.ts
+++ b/src/serviceModules/FileSystemAdapters/ObsidianStorageAdapter.ts
@@ -1,6 +1,6 @@
-import type { UXDataWriteOptions } from "@/lib/src/common/types";
-import type { IStorageAdapter } from "@/lib/src/serviceModules/adapters";
-import { toArrayBuffer } from "@/lib/src/serviceModules/FileAccessBase";
+import type { UXDataWriteOptions } from "@lib/common/types";
+import type { IStorageAdapter } from "@lib/serviceModules/adapters";
+import { toArrayBuffer } from "@lib/serviceModules/FileAccessBase";
 import type { Stat, App } from "obsidian";
 
 /**
diff --git a/src/serviceModules/FileSystemAdapters/ObsidianTypeGuardAdapter.ts b/src/serviceModules/FileSystemAdapters/ObsidianTypeGuardAdapter.ts
index 455affb..9de3a43 100644
--- a/src/serviceModules/FileSystemAdapters/ObsidianTypeGuardAdapter.ts
+++ b/src/serviceModules/FileSystemAdapters/ObsidianTypeGuardAdapter.ts
@@ -1,4 +1,4 @@
-import type { ITypeGuardAdapter } from "@/lib/src/serviceModules/adapters";
+import type { ITypeGuardAdapter } from "@lib/serviceModules/adapters";
 import { TFile, TFolder } from "obsidian";
 
 /**
diff --git a/src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.ts b/src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.ts
index bb89774..b178798 100644
--- a/src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.ts
+++ b/src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.ts
@@ -1,6 +1,6 @@
-import type { UXDataWriteOptions } from "@/lib/src/common/types";
-import type { IVaultAdapter } from "@/lib/src/serviceModules/adapters";
-import { toArrayBuffer } from "@/lib/src/serviceModules/FileAccessBase";
+import type { UXDataWriteOptions } from "@lib/common/types";
+import type { IVaultAdapter } from "@lib/serviceModules/adapters";
+import { toArrayBuffer } from "@lib/serviceModules/FileAccessBase";
 import type { TFile, App, TFolder } from "obsidian";
 
 /**
diff --git a/src/types.ts b/src/types.ts
index 22ece98..cf404e2 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,7 +1,7 @@
-import type { DatabaseFileAccess } from "@/lib/src/interfaces/DatabaseFileAccess";
-import type { Rebuilder } from "@/lib/src/interfaces/DatabaseRebuilder";
-import type { IFileHandler } from "@/lib/src/interfaces/FileHandler";
-import type { StorageAccess } from "@/lib/src/interfaces/StorageAccess";
+import type { DatabaseFileAccess } from "@lib/interfaces/DatabaseFileAccess";
+import type { Rebuilder } from "@lib/interfaces/DatabaseRebuilder";
+import type { IFileHandler } from "@lib/interfaces/FileHandler";
+import type { StorageAccess } from "@lib/interfaces/StorageAccess";
 import type { IServiceHub } from "./lib/src/services/base/IService";
 
 export interface ServiceModules {
diff --git a/utilsdeno/normalise-imports.ts b/utilsdeno/normalise-imports.ts
new file mode 100644
index 0000000..1fb51b0
--- /dev/null
+++ b/utilsdeno/normalise-imports.ts
@@ -0,0 +1,177 @@
+// Normalise import and export paths in the codebase to use @lib/ and @/ aliases correctly.
+// Use this script by running `deno run --allow-read --allow-write normalise-imports.ts` from the utilsdeno directory.
+// Set the --run flag to apply changes: `deno run --allow-read --allow-write normalise-imports.ts --run`
+// Set the --all-alias flag to also normalise sibling/child imports (starting with ./): `deno run --allow-read --allow-write normalise-imports.ts --all-alias`
+
+import { Project } from "npm:ts-morph";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const isDryRun = !Deno.args.includes("--run");
+const allAlias = Deno.args.includes("--all-alias");
+
+if (isDryRun) {
+    console.log("=== DRY RUN MODE ===");
+    console.log("To apply changes, run with: deno run --allow-read --allow-write normalise-imports.ts --run\n");
+} else {
+    console.log("=== RUN MODE: WILL MODIFY FILES ===");
+}
+
+if (allAlias) {
+    console.log("Option --all-alias is active: Sibling imports (starting with ./) will also be normalised to @/.\n");
+} else {
+    console.log("Sibling imports (starting with ./) will be left relative.\n");
+}
+
+const project = new Project({ tsConfigFilePath: "../tsconfig.json" });
+
+// Manually add files under src/ to ensure those excluded by tsconfig.json (e.g. src/apps) are processed.
+project.addSourceFilesAtPaths("../src/**/*.ts");
+project.addSourceFilesAtPaths("../src/**/*.svelte");
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const projectRoot = path.resolve(__dirname, "..");
+
+function toPosixPath(filePath: string): string {
+    return filePath.replace(/\\/g, "/");
+}
+
+const posixProjectRoot = toPosixPath(projectRoot);
+const posixSrc = `${posixProjectRoot}/src`;
+const posixLibSrc = `${posixProjectRoot}/src/lib/src`;
+
+console.log(`Project Root: ${posixProjectRoot}`);
+console.log(`Source Directory: ${posixSrc}`);
+console.log(`Library Source Directory: ${posixLibSrc}`);
+console.log("");
+
+let modifiedFilesCount = 0;
+
+for (const sourceFile of project.getSourceFiles()) {
+    const filePath = sourceFile.getFilePath();
+    const posixFilePath = toPosixPath(filePath);
+    const fileDir = path.dirname(posixFilePath);
+
+    // Only process files inside the project src directory.
+    if (!posixFilePath.startsWith(posixSrc)) {
+        // console.log(`Skipping outside src: ${posixFilePath}`);
+        continue;
+    }
+
+    // Skip files inside directories starting with an underscore (e.g., _tools, _test).
+    const dirSegments = fileDir.split("/");
+    const isUnderscore = dirSegments.some((segment) => segment.startsWith("_"));
+    if (isUnderscore) {
+        // console.log(`Skipping underscore dir: ${posixFilePath}`);
+        continue;
+    }
+
+    let fileModified = false;
+    const imports = sourceFile.getImportDeclarations();
+    const exports = sourceFile.getExportDeclarations();
+    const declarations = [...imports, ...exports];
+
+    for (const decl of declarations) {
+        let moduleSpecifier: string | undefined;
+        try {
+            moduleSpecifier = decl.getModuleSpecifierValue();
+        } catch (_err) {
+            // Gracefully skip declarations that do not have a standard string literal specifier.
+            continue;
+        }
+        if (!moduleSpecifier) {
+            continue;
+        }
+
+        // Determine if it is an internal import.
+        const isRelative = moduleSpecifier.startsWith(".");
+        const isAlias = moduleSpecifier.startsWith("@/") || moduleSpecifier.startsWith("@lib/");
+
+        if (!isRelative && !isAlias) {
+            // Skip external packages/modules.
+            continue;
+        }
+
+        // Keep relative sibling/child imports unchanged (e.g. ./utils) unless --all-alias is set.
+        const isSibling = isRelative && !moduleSpecifier.startsWith("..");
+        if (isSibling && !allAlias) {
+            continue;
+        }
+
+        // Resolve path to an absolute POSIX path.
+        let resolvedPath = "";
+        if (moduleSpecifier.startsWith("@lib/")) {
+            resolvedPath = `${posixLibSrc}/${moduleSpecifier.slice(5)}`;
+        } else if (moduleSpecifier.startsWith("@/")) {
+            resolvedPath = `${posixSrc}/${moduleSpecifier.slice(2)}`;
+        } else {
+            // Relative path.
+            resolvedPath = path.resolve(fileDir, moduleSpecifier);
+        }
+
+        resolvedPath = toPosixPath(path.normalize(resolvedPath));
+
+        // Determine correct normalised specifier.
+        let newSpecifier = "";
+        const hasExtension =
+            moduleSpecifier.endsWith(".ts") ||
+            moduleSpecifier.endsWith(".js") ||
+            moduleSpecifier.endsWith(".svelte") ||
+            moduleSpecifier.endsWith(".d.ts");
+
+        if (resolvedPath.startsWith(posixLibSrc + "/")) {
+            let rel = resolvedPath.slice(posixLibSrc.length + 1);
+            if (!hasExtension && (rel.endsWith(".ts") || rel.endsWith(".js"))) {
+                // Strip extension if the original import did not have one.
+                if (rel.endsWith(".ts") && !rel.endsWith(".d.ts")) {
+                    rel = rel.slice(0, -3);
+                } else if (rel.endsWith(".js")) {
+                    rel = rel.slice(0, -3);
+                }
+            }
+            newSpecifier = `@lib/${rel}`;
+        } else if (resolvedPath.startsWith(posixSrc + "/")) {
+            let rel = resolvedPath.slice(posixSrc.length + 1);
+            if (!hasExtension && (rel.endsWith(".ts") || rel.endsWith(".js"))) {
+                // Strip extension if the original import did not have one.
+                if (rel.endsWith(".ts") && !rel.endsWith(".d.ts")) {
+                    rel = rel.slice(0, -3);
+                } else if (rel.endsWith(".js")) {
+                    rel = rel.slice(0, -3);
+                }
+            }
+
+            newSpecifier = `@/${rel}`;
+        } else {
+            // Target is outside the src directory (e.g. root configs or tests).
+            continue;
+        }
+
+        // Update module specifier if different.
+        if (newSpecifier && newSpecifier !== moduleSpecifier) {
+            if (!fileModified) {
+                console.log(`File: ${posixFilePath.slice(posixProjectRoot.length + 1)}`);
+                fileModified = true;
+            }
+            console.log(`  - "${moduleSpecifier}" -> "${newSpecifier}"`);
+
+            if (!isDryRun) {
+                decl.setModuleSpecifier(newSpecifier);
+            }
+        }
+    }
+
+    if (fileModified) {
+        modifiedFilesCount++;
+    }
+}
+
+console.log(`\nTotal files to modify: ${modifiedFilesCount}`);
+
+if (!isDryRun) {
+    project.saveSync();
+    console.log("All changes successfully saved.");
+} else {
+    console.log("Dry run complete. No changes were written to files.");
+}