diff --git a/src/LiveSyncBaseCore.ts b/src/LiveSyncBaseCore.ts
index a83c975..f7cd7d2 100644
--- a/src/LiveSyncBaseCore.ts
+++ b/src/LiveSyncBaseCore.ts
@@ -1,22 +1,22 @@
 import { LOG_LEVEL_INFO } from "octagonal-wheels/common/logger";
 import type PouchDB from "pouchdb-core";
 import type { SimpleStore } from "octagonal-wheels/databases/SimpleStoreBase";
-import type { HasSettings, ObsidianLiveSyncSettings, EntryDoc } from "./lib/src/common/types";
-import { __$checkInstanceBinding } from "./lib/src/dev/checks";
-import type { Confirm } from "./lib/src/interfaces/Confirm";
-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 { LiveSyncLocalDBEnv } from "./lib/src/pouchdb/LiveSyncLocalDB";
-import type { LiveSyncCouchDBReplicatorEnv } from "./lib/src/replication/couchdb/LiveSyncReplicator";
-import type { CheckPointInfo } from "./lib/src/replication/journal/JournalSyncTypes";
-import type { LiveSyncJournalReplicatorEnv } from "./lib/src/replication/journal/LiveSyncJournalReplicatorEnv";
-import type { LiveSyncReplicatorEnv } from "./lib/src/replication/LiveSyncAbstractReplicator";
-import { useTargetFilters } from "./lib/src/serviceFeatures/targetFilter";
-import { useRemoteConfigurationMigration } from "./lib/src/serviceFeatures/remoteConfig";
-import type { ServiceContext } from "./lib/src/services/base/ServiceBase";
-import type { InjectableServiceHub } from "./lib/src/services/InjectableServices";
+import type { HasSettings, ObsidianLiveSyncSettings, EntryDoc } from "@lib/common/types";
+import { __$checkInstanceBinding } from "@lib/dev/checks";
+import type { Confirm } from "@lib/interfaces/Confirm";
+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 { LiveSyncLocalDBEnv } from "@lib/pouchdb/LiveSyncLocalDB";
+import type { LiveSyncCouchDBReplicatorEnv } from "@lib/replication/couchdb/LiveSyncReplicator";
+import type { CheckPointInfo } from "@lib/replication/journal/JournalSyncTypes";
+import type { LiveSyncJournalReplicatorEnv } from "@lib/replication/journal/LiveSyncJournalReplicatorEnv";
+import type { LiveSyncReplicatorEnv } from "@lib/replication/LiveSyncAbstractReplicator";
+import { useTargetFilters } from "@lib/serviceFeatures/targetFilter";
+import { useRemoteConfigurationMigration } from "@lib/serviceFeatures/remoteConfig";
+import type { ServiceContext } from "@lib/services/base/ServiceBase";
+import type { InjectableServiceHub } from "@lib/services/InjectableServices";
 import { AbstractModule } from "./modules/AbstractModule";
 import { ModulePeriodicProcess } from "./modules/core/ModulePeriodicProcess";
 import { ModuleReplicator } from "./modules/core/ModuleReplicator";
@@ -26,9 +26,9 @@ import { ModuleConflictChecker } from "./modules/coreFeatures/ModuleConflictChec
 import { ModuleConflictResolver } from "./modules/coreFeatures/ModuleConflictResolver";
 import { ModuleResolvingMismatchedTweaks } from "./modules/coreFeatures/ModuleResolveMismatchedTweaks";
 import { ModuleLiveSyncMain } from "./modules/main/ModuleLiveSyncMain";
-import type { ServiceModules } from "./lib/src/interfaces/ServiceModule";
+import type { ServiceModules } from "@lib/interfaces/ServiceModule";
 import { ModuleBasicMenu } from "./modules/essential/ModuleBasicMenu";
-import { usePrepareDatabaseForUse } from "./lib/src/serviceFeatures/prepareDatabaseForUse";
+import { usePrepareDatabaseForUse } from "@lib/serviceFeatures/prepareDatabaseForUse";
 
 export class LiveSyncBaseCore<
     T extends ServiceContext = ServiceContext,
diff --git a/src/apps/cli/main.ts b/src/apps/cli/main.ts
index ed4cb8b..9f827bd 100644
--- a/src/apps/cli/main.ts
+++ b/src/apps/cli/main.ts
@@ -11,7 +11,7 @@ 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/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/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/common/KeyValueDBv2.ts b/src/common/KeyValueDBv2.ts
index a6ad077..b053c11 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 a1a8518..3716667 100644
--- a/src/common/events.ts
+++ b/src/common/events.ts
@@ -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/types.ts b/src/common/types.ts
index f245eee..e517753 100644
--- a/src/common/types.ts
+++ b/src/common/types.ts
@@ -1,7 +1,7 @@
 import { type PluginManifest, TFile } from "@/deps.ts";
 import type { DatabaseEntry, FilePath } from "@lib/common/models/db.type";
 import type { EntryBody } from "@lib/common/models/db.definition";
-export type { CacheData, FileEventItem } from "../lib/src/common/types.ts";
+export type { CacheData, FileEventItem } from "@lib/common/types.ts";
 
 export interface PluginDataEntry extends DatabaseEntry {
     deviceVaultName: string;
@@ -52,7 +52,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,
@@ -62,4 +62,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 f9be0f9..8585370 100644
--- a/src/common/utils.ts
+++ b/src/common/utils.ts
@@ -205,7 +205,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.database.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 6b97de7..dd87839 100644
--- a/src/features/ConfigSync/CmdConfigSync.ts
+++ b/src/features/ConfigSync/CmdConfigSync.ts
@@ -60,7 +60,7 @@ import { ConflictResolveModal } from "@/modules/features/InteractiveConflictReso
 import { Semaphore } from "octagonal-wheels/concurrency/semaphore";
 import { EVENT_REQUEST_OPEN_PLUGIN_SYNC_DIALOG, eventHub } from "@/common/events.ts";
 import type { PluginDialogModal } from "./PluginDialogModal.ts";
-import { $msg } from "@/lib/src/common/i18n.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";
diff --git a/src/features/HiddenFileSync/CmdHiddenFileSync.ts b/src/features/HiddenFileSync/CmdHiddenFileSync.ts
index 56aee18..cfc1770 100644
--- a/src/features/HiddenFileSync/CmdHiddenFileSync.ts
+++ b/src/features/HiddenFileSync/CmdHiddenFileSync.ts
@@ -570,7 +570,7 @@ Offline Changed files: ${processFiles.length}`;
                     this._log(`Hidden file:${path} is changed.`, LOG_LEVEL_VERBOSE);
                     stat = cache.stat;
                 }
-                this.updateLastProcessedFile(path, stat!);
+                this.updateLastProcessedFile(path, stat ?? this.statToKey(null));
                 const lastIsNotFound = !lastKey || lastKey.endsWith("-0-0");
                 const nowIsNotFound = cache.deleted;
                 const type = lastIsNotFound && nowIsNotFound ? "invalid" : nowIsNotFound ? "delete" : "modified";
diff --git a/src/features/LiveSyncCommands.ts b/src/features/LiveSyncCommands.ts
index 9645e57..98ed828 100644
--- a/src/features/LiveSyncCommands.ts
+++ b/src/features/LiveSyncCommands.ts
@@ -6,7 +6,7 @@ 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/src/services/lib/logUtils.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 77ca4eb..af6df9e 100644
--- a/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts
+++ b/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts
@@ -15,8 +15,8 @@ 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 { isNotFoundError } from "@lib/common/utils.doc.ts";
 // import { _requestToCouchDB } from "@/common/utils";
 const DB_KEY_SEQ = "gc-seq";
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/P2PReplicatorPaneView.ts b/src/features/P2PSync/P2PReplicator/P2PReplicatorPaneView.ts
index 5195396..5818313 100644
--- a/src/features/P2PSync/P2PReplicator/P2PReplicatorPaneView.ts
+++ b/src/features/P2PSync/P2PReplicator/P2PReplicatorPaneView.ts
@@ -10,7 +10,7 @@ import { LOG_LEVEL_NOTICE } from "@lib/common/logger";
 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/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/lib b/src/lib
index 66c9eba..d22b759 160000
--- a/src/lib
+++ b/src/lib
@@ -1 +1 @@
-Subproject commit 66c9ebaa1e835fbaa29d9542286005a89cc0823a
+Subproject commit d22b7595cc468377fd48ee7c0b811d52a1bb053d
diff --git a/src/main.ts b/src/main.ts
index 6404d58..7a9a5af 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,5 +1,5 @@
 import { getLanguage, Notice, Plugin, type App, type PluginManifest } from "./deps";
-import { setGetLanguage } from "./lib/src/common/coreEnvFunctions.ts";
+import { setGetLanguage } from "@lib/common/coreEnvFunctions.ts";
 setGetLanguage(getLanguage);
 import { LiveSyncCommands } from "./features/LiveSyncCommands.ts";
 import { HiddenFileSync } from "./features/HiddenFileSync/CmdHiddenFileSync.ts";
@@ -14,34 +14,34 @@ import { ModuleObsidianSettingDialogue } from "./modules/features/ModuleObsidian
 import { ModuleObsidianDocumentHistory } from "./modules/features/ModuleObsidianDocumentHistory.ts";
 import { ModuleObsidianGlobalHistory } from "./modules/features/ModuleGlobalHistory.ts";
 import { LocalDatabaseMaintenance } from "./features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts";
-import type { InjectableServiceHub } from "./lib/src/services/implements/injectable/InjectableServiceHub.ts";
+import type { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub.ts";
 import { ObsidianServiceHub } from "./modules/services/ObsidianServiceHub.ts";
-import { ServiceRebuilder } from "./lib/src/serviceModules/Rebuilder.ts";
+import { ServiceRebuilder } from "@lib/serviceModules/Rebuilder.ts";
 import { ServiceDatabaseFileAccess } from "./serviceModules/DatabaseFileAccess.ts";
 import { ServiceFileAccessObsidian } from "./serviceModules/ServiceFileAccessImpl.ts";
-import { StorageAccessManager } from "./lib/src/managers/StorageProcessingManager.ts";
+import { StorageAccessManager } from "@lib/managers/StorageProcessingManager.ts";
 import { ServiceFileHandler } from "./serviceModules/FileHandler.ts";
 import { FileAccessObsidian } from "./serviceModules/FileAccessObsidian.ts";
 import { StorageEventManagerObsidian } from "./managers/StorageEventManagerObsidian.ts";
 import type { ServiceModules } from "./types.ts";
-import { setNoticeClass } from "./lib/src/mock_and_interop/wrapper.ts";
-import type { ObsidianServiceContext } from "./lib/src/services/implements/obsidian/ObsidianServiceContext.ts";
+import { setNoticeClass } from "@lib/mock_and_interop/wrapper.ts";
+import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext.ts";
 import { LiveSyncBaseCore } from "./LiveSyncBaseCore.ts";
 import { ModuleObsidianMenu } from "./modules/essentialObsidian/ModuleObsidianMenu.ts";
 import { ModuleObsidianSettingsAsMarkdown } from "./modules/features/ModuleObsidianSettingAsMarkdown.ts";
 import { SetupManager } from "./modules/features/SetupManager.ts";
 import { ModuleMigration } from "./modules/essential/ModuleMigration.ts";
 import { enableI18nFeature } from "./serviceFeatures/onLayoutReady/enablei18n.ts";
-import { useOfflineScanner } from "./lib/src/serviceFeatures/offlineScanner.ts";
-import { useRemoteConfiguration } from "./lib/src/serviceFeatures/remoteConfig.ts";
-import { useCheckRemoteSize } from "./lib/src/serviceFeatures/checkRemoteSize.ts";
+import { useOfflineScanner } from "@lib/serviceFeatures/offlineScanner.ts";
+import { useRemoteConfiguration } from "@lib/serviceFeatures/remoteConfig.ts";
+import { useCheckRemoteSize } from "@lib/serviceFeatures/checkRemoteSize.ts";
 import { useRedFlagFeatures } from "./serviceFeatures/redFlag.ts";
 import { useSetupProtocolFeature } from "./serviceFeatures/setupObsidian/setupProtocol.ts";
-import { useSetupQRCodeFeature } from "./lib/src/serviceFeatures/setupObsidian/qrCode";
-import { useSetupURIFeature } from "./lib/src/serviceFeatures/setupObsidian/setupUri";
+import { useSetupQRCodeFeature } from "@lib/serviceFeatures/setupObsidian/qrCode";
+import { useSetupURIFeature } from "@lib/serviceFeatures/setupObsidian/setupUri";
 import { useSetupManagerHandlersFeature } from "./serviceFeatures/setupObsidian/setupManagerHandlers.ts";
-import { useP2PReplicatorFeature } from "./lib/src/replication/trystero/useP2PReplicatorFeature.ts";
-import { useP2PReplicatorCommands } from "./lib/src/replication/trystero/useP2PReplicatorCommands.ts";
+import { useP2PReplicatorFeature } from "@lib/replication/trystero/useP2PReplicatorFeature.ts";
+import { useP2PReplicatorCommands } from "@lib/replication/trystero/useP2PReplicatorCommands.ts";
 import { useP2PReplicatorUI } from "./serviceFeatures/useP2PReplicatorUI.ts";
 import { createOpenReplicationUI, createOpenRebuildUI } from "./features/P2PSync/P2PReplicator/P2PReplicationUI.ts";
 export type LiveSyncCore = LiveSyncBaseCore<ObsidianServiceContext, LiveSyncCommands>;
diff --git a/src/modules/AbstractModule.ts b/src/modules/AbstractModule.ts
index 48501b8..7aa368d 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/core/ReplicateResultProcessor.ts b/src/modules/core/ReplicateResultProcessor.ts
index 34e4c57..885dec1 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/features/ModuleLog.ts b/src/modules/features/ModuleLog.ts
index f56c7cc..be40548 100644
--- a/src/modules/features/ModuleLog.ts
+++ b/src/modules/features/ModuleLog.ts
@@ -27,7 +27,7 @@ import { LOG_LEVEL_NOTICE, setGlobalLogFunction } from "octagonal-wheels/common/
 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 { 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";
diff --git a/src/modules/features/ModuleObsidianSettingAsMarkdown.ts b/src/modules/features/ModuleObsidianSettingAsMarkdown.ts
index 75488a7..cebde09 100644
--- a/src/modules/features/ModuleObsidianSettingAsMarkdown.ts
+++ b/src/modules/features/ModuleObsidianSettingAsMarkdown.ts
@@ -1,4 +1,3 @@
-// import { PouchDB } from "../../lib/src/pouchdb/pouchdb-browser";
 import { isObjectDifferent } from "octagonal-wheels/object";
 import { EVENT_SETTING_SAVED, eventHub } from "@/common/events";
 import { fireAndForget } from "octagonal-wheels/promises";
diff --git a/src/modules/features/ModuleObsidianSettingTab.ts b/src/modules/features/ModuleObsidianSettingTab.ts
index 04800d9..5a71530 100644
--- a/src/modules/features/ModuleObsidianSettingTab.ts
+++ b/src/modules/features/ModuleObsidianSettingTab.ts
@@ -1,6 +1,5 @@
 import { ObsidianLiveSyncSettingTab } from "./SettingDialogue/ObsidianLiveSyncSettingTab.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 type { LiveSyncCore } from "@/main.ts";
 
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/SetupManager.unit.spec.ts b/src/modules/features/SetupManager.unit.spec.ts
index ef94c4d..9b9a6c2 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: {} }));
@@ -17,11 +17,11 @@ vi.mock("./SetupWizard/dialogs/SetupRemoteBucket.svelte", () => ({ default: {} }
 vi.mock("./SetupWizard/dialogs/SetupRemoteP2P.svelte", () => ({ default: {} }));
 vi.mock("./SetupWizard/dialogs/SetupRemoteE2EE.svelte", () => ({ default: {} }));
 
-vi.mock("../../lib/src/API/processSetting.ts", () => ({
+vi.mock("@lib/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/services/ObsidianAPIService.ts b/src/modules/services/ObsidianAPIService.ts
index ebeea0d..3e44046 100644
--- a/src/modules/services/ObsidianAPIService.ts
+++ b/src/modules/services/ObsidianAPIService.ts
@@ -5,7 +5,7 @@ import { ObsHttpHandler } from "@/modules/essentialObsidian/APILib/ObsHttpHandle
 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 af9c0e3..ca4f9c1 100644
--- a/src/modules/services/ObsidianConfirm.ts
+++ b/src/modules/services/ObsidianConfirm.ts
@@ -1,8 +1,8 @@
 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,
diff --git a/src/modules/services/ObsidianDatabaseService.ts b/src/modules/services/ObsidianDatabaseService.ts
index b2e4146..b14adca 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 { InjectableDatabaseService } from "@lib/services/implements/injectable/InjectableDatabaseService";
+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/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.unit.spec.ts b/src/serviceFeatures/redFlag.unit.spec.ts
index 6d0975f..d1f5ef6 100644
--- a/src/serviceFeatures/redFlag.unit.spec.ts
+++ b/src/serviceFeatures/redFlag.unit.spec.ts
@@ -20,12 +20,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,
@@ -40,7 +40,7 @@ import {
 } from "./redFlag.simpleFetch";
 import { activateRemoteConfiguration } from "@lib/serviceFeatures/remoteConfig";
 //Mock synchroniseAllFilesBetweenDBandStorage
-vi.mock("@/lib/src/serviceFeatures/offlineScanner", async (importOriginal) => {
+vi.mock("@lib/serviceFeatures/offlineScanner", async (importOriginal) => {
     const originalModule = (await importOriginal()) as any;
     return {
         ...originalModule,
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 e7b6fb4..74e05bd 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 cc360d5..7d0fe1b 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 98a0e9f..b4c40bf 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,8 +1,8 @@
-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 { IServiceHub } from "./lib/src/services/base/IService";
+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/services/base/IService";
 
 export interface ServiceModules {
     storageAccess: StorageAccess;
diff --git a/test/harness/harness.ts b/test/harness/harness.ts
index ef2d20e..c297df7 100644
--- a/test/harness/harness.ts
+++ b/test/harness/harness.ts
@@ -1,6 +1,6 @@
 import { App } from "@/deps.ts";
 import ObsidianLiveSyncPlugin from "@/main";
-import { DEFAULT_SETTINGS, type ObsidianLiveSyncSettings } from "@/lib/src/common/types";
+import { DEFAULT_SETTINGS, type ObsidianLiveSyncSettings } from "@lib/common/types";
 import { LOG_LEVEL_VERBOSE, setGlobalLogFunction } from "@lib/common/logger";
 import { SettingCache } from "./obsidian-mock";
 import { delay, fireAndForget, promiseWithResolvers } from "octagonal-wheels/promises";
diff --git a/test/lib/commands.ts b/test/lib/commands.ts
index 762b5c0..d33d974 100644
--- a/test/lib/commands.ts
+++ b/test/lib/commands.ts
@@ -1,4 +1,4 @@
-import type { P2PSyncSetting } from "@/lib/src/common/types";
+import type { P2PSyncSetting } from "@lib/common/types";
 import { delay } from "octagonal-wheels/promises";
 import type { BrowserContext, Page } from "playwright";
 import type { Plugin } from "vitest/config";
diff --git a/test/lib/ui.ts b/test/lib/ui.ts
index 3d2381a..52da702 100644
--- a/test/lib/ui.ts
+++ b/test/lib/ui.ts
@@ -1,5 +1,5 @@
 import { page } from "vitest/browser";
-import { delay } from "@/lib/src/common/utils";
+import { delay } from "@lib/common/utils";
 
 export async function waitForDialogShown(dialogText: string, timeout = 500) {
     const ttl = Date.now() + timeout;
diff --git a/test/lib/util.ts b/test/lib/util.ts
index 502d0d2..5f12b49 100644
--- a/test/lib/util.ts
+++ b/test/lib/util.ts
@@ -1,4 +1,4 @@
-import { delay } from "@/lib/src/common/utils";
+import { delay } from "@lib/common/utils";
 
 export async function waitTaskWithFollowups<T>(
     task: Promise<T>,
diff --git a/test/suite/db_common.ts b/test/suite/db_common.ts
index be17ead..62b9120 100644
--- a/test/suite/db_common.ts
+++ b/test/suite/db_common.ts
@@ -1,7 +1,7 @@
 import { compareMTime } from "@lib/common/utils.database";
 import { EVEN } from "@/common/utils";
 import { TFile, type DataWriteOptions } from "@/deps";
-import type { FilePath } from "@/lib/src/common/types";
+import type { FilePath } from "@lib/common/types";
 import { isDocContentSame, readContent } from "@lib/common/utils.database";
 import { waitForIdle, type LiveSyncHarness } from "../harness/harness";
 import { expect } from "vitest";
diff --git a/test/suite/onlylocaldb.test.ts b/test/suite/onlylocaldb.test.ts
index aadcd85..9714693 100644
--- a/test/suite/onlylocaldb.test.ts
+++ b/test/suite/onlylocaldb.test.ts
@@ -1,7 +1,7 @@
 import { beforeAll, describe, expect, it, test } from "vitest";
 import { generateHarness, waitForIdle, waitForReady, type LiveSyncHarness } from "../harness/harness";
 import { TFile } from "@/deps.ts";
-import { DEFAULT_SETTINGS, type FilePath, type ObsidianLiveSyncSettings } from "@/lib/src/common/types";
+import { DEFAULT_SETTINGS, type FilePath, type ObsidianLiveSyncSettings } from "@lib/common/types";
 import { isDocContentSame, readContent } from "@lib/common/utils.database";
 import { DummyFileSourceInisialised, generateBinaryFile, generateFile, init } from "../utils/dummyfile";
 
diff --git a/test/suite/sync.senario.basic.ts b/test/suite/sync.senario.basic.ts
index 3eafe3c..574db74 100644
--- a/test/suite/sync.senario.basic.ts
+++ b/test/suite/sync.senario.basic.ts
@@ -3,7 +3,7 @@
 // and edge, resolving conflicts, etc. will be covered in separate test suites.
 import { afterAll, beforeAll, describe, expect, it, test } from "vitest";
 import { generateHarness, waitForIdle, waitForReady, type LiveSyncHarness } from "../harness/harness";
-import { RemoteTypes, type FilePath, type ObsidianLiveSyncSettings } from "@/lib/src/common/types";
+import { RemoteTypes, type FilePath, type ObsidianLiveSyncSettings } from "@lib/common/types";
 
 import {
     DummyFileSourceInisialised,
@@ -13,7 +13,7 @@ import {
     generateFile,
 } from "../utils/dummyfile";
 import { checkStoredFileInDB, testFileRead, testFileWrite } from "./db_common";
-import { delay } from "@/lib/src/common/utils";
+import { delay } from "@lib/common/utils";
 import { commands } from "vitest/browser";
 import { closeReplication, performReplication, prepareRemote } from "./sync_common";
 import type { DataWriteOptions } from "@/deps.ts";
diff --git a/test/suite/sync.single.test.ts b/test/suite/sync.single.test.ts
index 9be98b4..d0fd942 100644
--- a/test/suite/sync.single.test.ts
+++ b/test/suite/sync.single.test.ts
@@ -7,7 +7,7 @@ import {
     PREFERRED_SETTING_SELF_HOSTED,
     RemoteTypes,
     type ObsidianLiveSyncSettings,
-} from "@/lib/src/common/types";
+} from "@lib/common/types";
 
 import { defaultFileOption } from "./db_common";
 import { syncBasicCase } from "./sync.senario.basic.ts";
diff --git a/test/suite/sync.test.ts b/test/suite/sync.test.ts
index aa284c1..0529352 100644
--- a/test/suite/sync.test.ts
+++ b/test/suite/sync.test.ts
@@ -7,7 +7,7 @@ import {
     PREFERRED_SETTING_SELF_HOSTED,
     RemoteTypes,
     type ObsidianLiveSyncSettings,
-} from "@/lib/src/common/types";
+} from "@lib/common/types";
 
 import { defaultFileOption } from "./db_common";
 import { syncBasicCase } from "./sync.senario.basic.ts";
diff --git a/test/suite/sync_common.ts b/test/suite/sync_common.ts
index 74da866..d2f32a2 100644
--- a/test/suite/sync_common.ts
+++ b/test/suite/sync_common.ts
@@ -1,10 +1,10 @@
 import { expect } from "vitest";
 import { waitForIdle, type LiveSyncHarness } from "../harness/harness";
-import { RemoteTypes, type ObsidianLiveSyncSettings } from "@/lib/src/common/types";
+import { RemoteTypes, type ObsidianLiveSyncSettings } from "@lib/common/types";
 
-import { delay, fireAndForget } from "@/lib/src/common/utils";
+import { delay, fireAndForget } from "@lib/common/utils";
 import { commands } from "vitest/browser";
-import { LiveSyncTrysteroReplicator } from "@/lib/src/replication/trystero/LiveSyncTrysteroReplicator";
+import { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
 import { waitTaskWithFollowups } from "../lib/util";
 async function waitForP2PPeers(harness: LiveSyncHarness) {
     if (harness.plugin.core.settings.remoteType === RemoteTypes.REMOTE_P2P) {
diff --git a/test/suite/variables.ts b/test/suite/variables.ts
index f55cce2..fda1a5a 100644
--- a/test/suite/variables.ts
+++ b/test/suite/variables.ts
@@ -1,10 +1,5 @@
-import { DoctorRegulation } from "@/lib/src/common/configForDoc";
-import {
-    DEFAULT_SETTINGS,
-    ChunkAlgorithms,
-    AutoAccepting,
-    type ObsidianLiveSyncSettings,
-} from "@/lib/src/common/types";
+import { DoctorRegulation } from "@lib/common/configForDoc";
+import { DEFAULT_SETTINGS, ChunkAlgorithms, AutoAccepting, type ObsidianLiveSyncSettings } from "@lib/common/types";
 export const env = (import.meta as any).env;
 export const settingBase = {
     ...DEFAULT_SETTINGS,
diff --git a/test/suitep2p/sync_common_p2p.ts b/test/suitep2p/sync_common_p2p.ts
index 5300989..d3d2b00 100644
--- a/test/suitep2p/sync_common_p2p.ts
+++ b/test/suitep2p/sync_common_p2p.ts
@@ -7,9 +7,9 @@
  */
 import { expect } from "vitest";
 import { waitForIdle, type LiveSyncHarness } from "../harness/harness";
-import { RemoteTypes, type ObsidianLiveSyncSettings } from "@/lib/src/common/types";
-import { delay } from "@/lib/src/common/utils";
-import { LiveSyncTrysteroReplicator } from "@/lib/src/replication/trystero/LiveSyncTrysteroReplicator";
+import { RemoteTypes, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { delay } from "@lib/common/utils";
+import { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
 import { waitTaskWithFollowups } from "../lib/util";
 
 const P2P_REPLICATION_TIMEOUT_MS = 180000;
diff --git a/test/suitep2p/syncp2p.p2p-down.test.ts b/test/suitep2p/syncp2p.p2p-down.test.ts
index 7f3b77f..6611147 100644
--- a/test/suitep2p/syncp2p.p2p-down.test.ts
+++ b/test/suitep2p/syncp2p.p2p-down.test.ts
@@ -15,10 +15,10 @@ import {
     type FilePath,
     type ObsidianLiveSyncSettings,
     AutoAccepting,
-} from "@/lib/src/common/types";
+} from "@lib/common/types";
 import { DummyFileSourceInisialised, generateBinaryFile, generateFile } from "../utils/dummyfile";
 import { defaultFileOption, testFileRead } from "../suite/db_common";
-import { delay } from "@/lib/src/common/utils";
+import { delay } from "@lib/common/utils";
 import { closeReplication, performReplication } from "./sync_common_p2p";
 import { settingBase } from "../suite/variables";
 
diff --git a/test/suitep2p/syncp2p.p2p-up.test.ts b/test/suitep2p/syncp2p.p2p-up.test.ts
index 7c463eb..682bd1d 100644
--- a/test/suitep2p/syncp2p.p2p-up.test.ts
+++ b/test/suitep2p/syncp2p.p2p-up.test.ts
@@ -17,7 +17,7 @@ import {
     RemoteTypes,
     type ObsidianLiveSyncSettings,
     AutoAccepting,
-} from "@/lib/src/common/types";
+} from "@lib/common/types";
 import {
     DummyFileSourceInisialised,
     FILE_SIZE_BINS,
@@ -26,7 +26,7 @@ import {
     generateFile,
 } from "../utils/dummyfile";
 import { checkStoredFileInDB, defaultFileOption, testFileWrite } from "../suite/db_common";
-import { delay } from "@/lib/src/common/utils";
+import { delay } from "@lib/common/utils";
 import { closeReplication, performReplication } from "./sync_common_p2p";
 import { settingBase } from "../suite/variables";
 
diff --git a/test/suitep2p/syncp2p.test.ts b/test/suitep2p/syncp2p.test.ts
index 08c2c10..757c92a 100644
--- a/test/suitep2p/syncp2p.test.ts
+++ b/test/suitep2p/syncp2p.test.ts
@@ -7,7 +7,7 @@ import {
     PREFERRED_SETTING_SELF_HOSTED,
     RemoteTypes,
     type ObsidianLiveSyncSettings,
-} from "@/lib/src/common/types";
+} from "@lib/common/types";
 
 import { settingBase } from "../suite/variables.ts";
 import { defaultFileOption } from "../suite/db_common";
diff --git a/test/unit/dialog.test.ts b/test/unit/dialog.test.ts
index 86c424c..1ed6545 100644
--- a/test/unit/dialog.test.ts
+++ b/test/unit/dialog.test.ts
@@ -3,12 +3,12 @@ import { beforeAll, describe, expect, it } from "vitest";
 import { commands } from "vitest/browser";
 
 import { generateHarness, waitForIdle, waitForReady, type LiveSyncHarness } from "../harness/harness";
-import { ChunkAlgorithms, DEFAULT_SETTINGS, type ObsidianLiveSyncSettings } from "@/lib/src/common/types";
+import { ChunkAlgorithms, DEFAULT_SETTINGS, type ObsidianLiveSyncSettings } from "@lib/common/types";
 
 import { DummyFileSourceInisialised } from "../utils/dummyfile";
 
 import { page } from "vitest/browser";
-import { DoctorRegulation } from "@/lib/src/common/configForDoc";
+import { DoctorRegulation } from "@lib/common/configForDoc";
 import { waitForDialogHidden, waitForDialogShown } from "../lib/ui";
 const env = (import.meta as any).env;
 const dialog_setting_base = {