diff --git a/src/LiveSyncBaseCore.ts b/src/LiveSyncBaseCore.ts
index f7cd7d2..5e2cd10 100644
--- a/src/LiveSyncBaseCore.ts
+++ b/src/LiveSyncBaseCore.ts
@@ -1,7 +1,8 @@
 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/common/types";
+import type { HasSettings, ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
+import type { EntryDoc } from "@lib/common/models/db.definition";
 import { __$checkInstanceBinding } from "@lib/dev/checks";
 import type { Confirm } from "@lib/interfaces/Confirm";
 import type { DatabaseFileAccess } from "@lib/interfaces/DatabaseFileAccess";
diff --git a/src/common/obsidianEvents.ts b/src/common/obsidianEvents.ts
index b3281c2..d2e1b23 100644
--- a/src/common/obsidianEvents.ts
+++ b/src/common/obsidianEvents.ts
@@ -1,6 +1,5 @@
 import type { TFile } from "@/deps";
-import type { FilePathWithPrefix, LoadedEntry } from "@lib/common/types";
-
+import type { FilePathWithPrefix, LoadedEntry } from "@lib/common/models/db.type";
 export const EVENT_REQUEST_SHOW_HISTORY = "show-history";
 
 declare global {
diff --git a/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts b/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts
index af6df9e..b07da0f 100644
--- a/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts
+++ b/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts
@@ -1,15 +1,8 @@
 import { sizeToHumanReadable } from "octagonal-wheels/number";
-import {
-    EntryTypes,
-    LOG_LEVEL_INFO,
-    LOG_LEVEL_NOTICE,
-    LOG_LEVEL_VERBOSE,
-    type DocumentID,
-    type EntryDoc,
-    type EntryLeaf,
-    type FilePathWithPrefix,
-    type MetaEntry,
-} from "@lib/common/types";
+import type { DocumentID, EntryLeaf, FilePathWithPrefix, MetaEntry } from "@lib/common/models/db.type";
+import { EntryTypes } from "@lib/common/models/db.const";
+import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/logger";
+import type { EntryDoc } from "@lib/common/models/db.definition";
 import { getNoFromRev } from "@lib/pouchdb/LiveSyncLocalDB";
 import { LiveSyncCommands } from "@/features/LiveSyncCommands";
 import { serialized } from "octagonal-wheels/concurrency/lock_v2";
diff --git a/src/features/P2PSync/P2PReplicator/P2PReplicationUI.ts b/src/features/P2PSync/P2PReplicator/P2PReplicationUI.ts
index ae5f02f..633aa5c 100644
--- a/src/features/P2PSync/P2PReplicator/P2PReplicationUI.ts
+++ b/src/features/P2PSync/P2PReplicator/P2PReplicationUI.ts
@@ -1,6 +1,6 @@
 import { App } from "@/deps.ts";
 import { Logger } from "@lib/common/logger";
-import { LOG_LEVEL_NOTICE, LOG_LEVEL_INFO } from "@lib/common/types";
+import { LOG_LEVEL_NOTICE, LOG_LEVEL_INFO } from "@lib/common/logger";
 import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
 import { P2POpenReplicationModal } from "./P2POpenReplicationModal";
 
diff --git a/src/lib b/src/lib
index d22b759..ee45b07 160000
--- a/src/lib
+++ b/src/lib
@@ -1 +1 @@
-Subproject commit d22b7595cc468377fd48ee7c0b811d52a1bb053d
+Subproject commit ee45b07b7f94fd36266806a6e59a673828c79a43
diff --git a/src/managers/ObsidianStorageEventManagerAdapter.ts b/src/managers/ObsidianStorageEventManagerAdapter.ts
index 6c5534a..fb4761e 100644
--- a/src/managers/ObsidianStorageEventManagerAdapter.ts
+++ b/src/managers/ObsidianStorageEventManagerAdapter.ts
@@ -1,6 +1,7 @@
 import { TFile, TFolder } from "@/deps";
-import type { FilePath, UXFileInfoStub, UXInternalFileInfoStub } from "@lib/common/types";
-import type { FileEventItem } from "@lib/common/types";
+import type { FilePath } from "@lib/common/models/db.type";
+import type { UXFileInfoStub, UXInternalFileInfoStub } from "@lib/common/models/fileaccess.type";
+import type { FileEventItem } from "@lib/common/models/fileaccess.type";
 import type { IStorageEventManagerAdapter } from "@lib/managers/adapters";
 import type {
     IStorageEventTypeGuardAdapter,
diff --git a/src/managers/StorageEventManagerObsidian.ts b/src/managers/StorageEventManagerObsidian.ts
index d57f204..a98acbc 100644
--- a/src/managers/StorageEventManagerObsidian.ts
+++ b/src/managers/StorageEventManagerObsidian.ts
@@ -1,4 +1,4 @@
-import type { FilePath } from "@lib/common/types";
+import type { FilePath } from "@lib/common/models/db.type";
 import type ObsidianLiveSyncPlugin from "@/main";
 import type { LiveSyncCore } from "@/main";
 import { StorageEventManagerBase, type StorageEventManagerBaseDependencies } from "@lib/managers/StorageEventManager";
diff --git a/src/modules/AbstractModule.ts b/src/modules/AbstractModule.ts
index 7aa368d..949fcc3 100644
--- a/src/modules/AbstractModule.ts
+++ b/src/modules/AbstractModule.ts
@@ -1,5 +1,5 @@
 import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, Logger } from "octagonal-wheels/common/logger";
-import type { AnyEntry, FilePathWithPrefix } from "@lib/common/types";
+import type { AnyEntry, FilePathWithPrefix } from "@lib/common/models/db.type";
 import type { IMinimumLiveSyncCommands, LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 import { stripAllPrefixes } from "@lib/string_and_binary/path";
 import { createInstanceLogFunction } from "@lib/services/lib/logUtils";
diff --git a/src/modules/AbstractObsidianModule.ts b/src/modules/AbstractObsidianModule.ts
index 44a952c..d828b2b 100644
--- a/src/modules/AbstractObsidianModule.ts
+++ b/src/modules/AbstractObsidianModule.ts
@@ -1,4 +1,4 @@
-import { type Prettify } from "@lib/common/types";
+import type { Prettify } from "@lib/common/models/shared.type.util";
 import type { LiveSyncCore } from "@/main";
 import type ObsidianLiveSyncPlugin from "@/main";
 import { AbstractModule } from "./AbstractModule.ts";
diff --git a/src/modules/ModuleTypes.ts b/src/modules/ModuleTypes.ts
index 0abe6a2..47c72b3 100644
--- a/src/modules/ModuleTypes.ts
+++ b/src/modules/ModuleTypes.ts
@@ -1,4 +1,4 @@
-import type { Prettify } from "@lib/common/types";
+import type { Prettify } from "@lib/common/models/shared.type.util";
 import type { LiveSyncCore } from "@/main";
 
 export type OverridableFunctionsKeys<T> = {
diff --git a/src/modules/core/ModuleReplicator.ts b/src/modules/core/ModuleReplicator.ts
index 806a825..37458b0 100644
--- a/src/modules/core/ModuleReplicator.ts
+++ b/src/modules/core/ModuleReplicator.ts
@@ -6,8 +6,8 @@ import { skipIfDuplicated } from "octagonal-wheels/concurrency/lock";
 import { balanceChunkPurgedDBs } from "@lib/pouchdb/chunks";
 import { purgeUnreferencedChunks } from "@lib/pouchdb/chunks";
 import { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator";
-import { type EntryDoc, type RemoteType } from "@lib/common/types";
-
+import type { EntryDoc } from "@lib/common/models/db.definition";
+import type { RemoteType } from "@lib/common/models/setting.type";
 import { scheduleTask } from "octagonal-wheels/concurrency/task";
 import { EVENT_FILE_SAVED, EVENT_SETTING_SAVED, eventHub } from "@/common/events";
 
diff --git a/src/modules/core/ModuleReplicatorCouchDB.ts b/src/modules/core/ModuleReplicatorCouchDB.ts
index 680fc34..be5be23 100644
--- a/src/modules/core/ModuleReplicatorCouchDB.ts
+++ b/src/modules/core/ModuleReplicatorCouchDB.ts
@@ -1,5 +1,6 @@
 import { fireAndForget } from "octagonal-wheels/promises";
-import { REMOTE_MINIO, REMOTE_P2P, type RemoteDBSettings } from "@lib/common/types";
+import { REMOTE_MINIO, REMOTE_P2P } from "@lib/common/models/setting.const";
+import type { RemoteDBSettings } from "@lib/common/models/setting.type";
 import { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator";
 import type { LiveSyncAbstractReplicator } from "@lib/replication/LiveSyncAbstractReplicator";
 import { AbstractModule } from "@/modules/AbstractModule";
diff --git a/src/modules/core/ModuleReplicatorMinIO.ts b/src/modules/core/ModuleReplicatorMinIO.ts
index 1d552f0..7e00a07 100644
--- a/src/modules/core/ModuleReplicatorMinIO.ts
+++ b/src/modules/core/ModuleReplicatorMinIO.ts
@@ -1,4 +1,5 @@
-import { REMOTE_MINIO, type RemoteDBSettings } from "@lib/common/types";
+import { REMOTE_MINIO } from "@lib/common/models/setting.const";
+import type { RemoteDBSettings } from "@lib/common/models/setting.type";
 import { LiveSyncJournalReplicator } from "@lib/replication/journal/LiveSyncJournalReplicator";
 import type { LiveSyncAbstractReplicator } from "@lib/replication/LiveSyncAbstractReplicator";
 import type { LiveSyncCore } from "@/main";
diff --git a/src/modules/core/ReplicateResultProcessor.ts b/src/modules/core/ReplicateResultProcessor.ts
index 885dec1..a41f501 100644
--- a/src/modules/core/ReplicateResultProcessor.ts
+++ b/src/modules/core/ReplicateResultProcessor.ts
@@ -1,12 +1,7 @@
-import {
-    SYNCINFO_ID,
-    VER,
-    type AnyEntry,
-    type EntryDoc,
-    type EntryLeaf,
-    type LoadedEntry,
-    type MetaEntry,
-} from "@lib/common/types";
+import { SYNCINFO_ID } from "@lib/common/models/db.const";
+import { VER } from "@lib/common/models/shared.const.behabiour";
+import type { AnyEntry, EntryLeaf, LoadedEntry, MetaEntry } from "@lib/common/models/db.type";
+import type { EntryDoc } from "@lib/common/models/db.definition";
 import type { ModuleReplicator } from "./ModuleReplicator";
 import { isChunk } from "@lib/common/typeUtils";
 import {
diff --git a/src/modules/coreFeatures/ModuleConflictChecker.ts b/src/modules/coreFeatures/ModuleConflictChecker.ts
index 810914c..3b6097c 100644
--- a/src/modules/coreFeatures/ModuleConflictChecker.ts
+++ b/src/modules/coreFeatures/ModuleConflictChecker.ts
@@ -1,5 +1,6 @@
 import { AbstractModule } from "@/modules/AbstractModule.ts";
-import { LOG_LEVEL_NOTICE, type FilePathWithPrefix } from "@lib/common/types";
+import { LOG_LEVEL_NOTICE } from "@lib/common/logger";
+import type { FilePathWithPrefix } from "@lib/common/models/db.type";
 import { QueueProcessor } from "octagonal-wheels/concurrency/processor";
 import { sendValue } from "octagonal-wheels/messagepassing/signal";
 import type { InjectableServiceHub } from "@lib/services/InjectableServices.ts";
diff --git a/src/modules/coreFeatures/ModuleConflictResolver.ts b/src/modules/coreFeatures/ModuleConflictResolver.ts
index 8c40b19..91423ad 100644
--- a/src/modules/coreFeatures/ModuleConflictResolver.ts
+++ b/src/modules/coreFeatures/ModuleConflictResolver.ts
@@ -1,16 +1,9 @@
 import { serialized } from "octagonal-wheels/concurrency/lock";
 import { AbstractModule } from "@/modules/AbstractModule.ts";
-import {
-    AUTO_MERGED,
-    CANCELLED,
-    LOG_LEVEL_INFO,
-    LOG_LEVEL_NOTICE,
-    LOG_LEVEL_VERBOSE,
-    MISSING_OR_ERROR,
-    NOT_CONFLICTED,
-    type diff_check_result,
-    type FilePathWithPrefix,
-} from "@lib/common/types";
+import { AUTO_MERGED, CANCELLED, MISSING_OR_ERROR, NOT_CONFLICTED } from "@lib/common/models/shared.const.symbols";
+import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/logger";
+import type { diff_check_result } from "@lib/common/models/diff.definition";
+import type { FilePathWithPrefix } from "@lib/common/models/db.type";
 import { isCustomisationSyncMetadata, isPluginMetadata } from "@lib/common/typeUtils.ts";
 import { TARGET_IS_NEW } from "@lib/common/models/shared.const.symbols.ts";
 import { compareMTime } from "@lib/common/utils.database.ts";
diff --git a/src/modules/coreFeatures/ModuleResolveMismatchedTweaks.unit.spec.ts b/src/modules/coreFeatures/ModuleResolveMismatchedTweaks.unit.spec.ts
index 4415891..b114caf 100644
--- a/src/modules/coreFeatures/ModuleResolveMismatchedTweaks.unit.spec.ts
+++ b/src/modules/coreFeatures/ModuleResolveMismatchedTweaks.unit.spec.ts
@@ -1,5 +1,8 @@
 import { describe, expect, it, vi } from "vitest";
-import { DEFAULT_SETTINGS, REMOTE_COUCHDB, type RemoteDBSettings, type TweakValues } from "@lib/common/types";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import { REMOTE_COUCHDB } from "@lib/common/models/setting.const";
+import type { RemoteDBSettings } from "@lib/common/models/setting.type";
+import type { TweakValues } from "@lib/common/models/tweak.definition";
 import { ModuleResolvingMismatchedTweaks } from "./ModuleResolveMismatchedTweaks";
 
 function createModule(settingsOverride: Partial<typeof DEFAULT_SETTINGS> = {}) {
diff --git a/src/modules/features/ModuleObsidianSettingAsMarkdown.ts b/src/modules/features/ModuleObsidianSettingAsMarkdown.ts
index cebde09..9c0ff77 100644
--- a/src/modules/features/ModuleObsidianSettingAsMarkdown.ts
+++ b/src/modules/features/ModuleObsidianSettingAsMarkdown.ts
@@ -1,7 +1,9 @@
 import { isObjectDifferent } from "octagonal-wheels/object";
 import { EVENT_SETTING_SAVED, eventHub } from "@/common/events";
 import { fireAndForget } from "octagonal-wheels/promises";
-import { DEFAULT_SETTINGS, type FilePathWithPrefix, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import type { FilePathWithPrefix } from "@lib/common/models/db.type";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 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 "@/modules/AbstractModule.ts";
diff --git a/src/modules/features/SettingDialogue/SettingPane.ts b/src/modules/features/SettingDialogue/SettingPane.ts
index 1a52f3f..8c33eba 100644
--- a/src/modules/features/SettingDialogue/SettingPane.ts
+++ b/src/modules/features/SettingDialogue/SettingPane.ts
@@ -1,5 +1,6 @@
 import { $msg } from "@lib/common/i18n";
-import { LEVEL_ADVANCED, LEVEL_EDGE_CASE, LEVEL_POWER_USER, type ConfigLevel } from "@lib/common/types";
+import type { ConfigLevel } from "@lib/common/models/shared.definition.configNames";
+import { LEVEL_ADVANCED, LEVEL_EDGE_CASE, LEVEL_POWER_USER } from "@lib/common/models/shared.definition.configNames";
 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 2e5c4a7..6d0a4fd 100644
--- a/src/modules/features/SettingDialogue/remoteConfigBuffer.unit.spec.ts
+++ b/src/modules/features/SettingDialogue/remoteConfigBuffer.unit.spec.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
-import { DEFAULT_SETTINGS, REMOTE_COUCHDB, REMOTE_MINIO } from "@lib/common/types";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import { REMOTE_COUCHDB, REMOTE_MINIO } from "@lib/common/models/setting.const";
 import { syncActivatedRemoteSettings } from "./remoteConfigBuffer";
 
 describe("syncActivatedRemoteSettings", () => {
diff --git a/src/modules/features/SettingDialogue/settingUtils.ts b/src/modules/features/SettingDialogue/settingUtils.ts
index 1445d06..868791f 100644
--- a/src/modules/features/SettingDialogue/settingUtils.ts
+++ b/src/modules/features/SettingDialogue/settingUtils.ts
@@ -1,5 +1,7 @@
 import { escapeStringToHTML } from "octagonal-wheels/string";
-import { E2EEAlgorithmNames, MILESTONE_DOCID, NODEINFO_DOCID, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { E2EEAlgorithmNames } from "@lib/common/models/setting.const";
+import { MILESTONE_DOCID, NODEINFO_DOCID } from "@lib/common/models/db.const";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import {
     pickCouchDBSyncSettings,
     pickBucketSyncSettings,
diff --git a/src/modules/features/SettingDialogue/utilFixCouchDBSetting.ts b/src/modules/features/SettingDialogue/utilFixCouchDBSetting.ts
index 31f9beb..a219f34 100644
--- a/src/modules/features/SettingDialogue/utilFixCouchDBSetting.ts
+++ b/src/modules/features/SettingDialogue/utilFixCouchDBSetting.ts
@@ -1,7 +1,7 @@
 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 type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { parseHeaderValues } from "@lib/common/utils.misc";
 import { fireAndForget } from "@lib/common/utils";
 import { isCloudantURI } from "@lib/pouchdb/utils_couchdb";
diff --git a/src/modules/features/SetupManager.unit.spec.ts b/src/modules/features/SetupManager.unit.spec.ts
index 9b9a6c2..919d45b 100644
--- a/src/modules/features/SetupManager.unit.spec.ts
+++ b/src/modules/features/SetupManager.unit.spec.ts
@@ -1,5 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { DEFAULT_SETTINGS, REMOTE_COUCHDB, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import { REMOTE_COUCHDB } from "@lib/common/models/setting.const";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { SettingService } from "@lib/services/base/SettingService";
 import { ServiceContext } from "@lib/services/base/ServiceBase";
 
diff --git a/src/modules/features/SetupWizard/dialogs/utilCheckCouchDB.ts b/src/modules/features/SetupWizard/dialogs/utilCheckCouchDB.ts
index 4d760a1..4b2b1a7 100644
--- a/src/modules/features/SetupWizard/dialogs/utilCheckCouchDB.ts
+++ b/src/modules/features/SetupWizard/dialogs/utilCheckCouchDB.ts
@@ -1,7 +1,7 @@
 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 type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { parseHeaderValues } from "@lib/common/utils.misc";
 import { isCloudantURI } from "@lib/pouchdb/utils_couchdb";
 import { generateCredentialObject } from "@lib/replication/httplib";
diff --git a/src/modules/services/ObsidianPathService.ts b/src/modules/services/ObsidianPathService.ts
index ed479e0..47dac81 100644
--- a/src/modules/services/ObsidianPathService.ts
+++ b/src/modules/services/ObsidianPathService.ts
@@ -11,7 +11,9 @@ import {
     compareFileFreshness,
     isMarkedAsSameChanges,
 } from "@/common/utils";
-import type { UXFileInfo, AnyEntry, UXFileInfoStub, FilePathWithPrefix } from "@lib/common/types";
+import type { UXFileInfo, UXFileInfoStub } from "@lib/common/models/fileaccess.type";
+import type { AnyEntry, FilePathWithPrefix } from "@lib/common/models/db.type";
+
 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 f3a32ee..dc30f29 100644
--- a/src/modules/services/ObsidianSettingService.ts
+++ b/src/modules/services/ObsidianSettingService.ts
@@ -1,5 +1,5 @@
 import { compatGlobal } from "@lib/common/coreEnvFunctions";
-import { type ObsidianLiveSyncSettings } from "@lib/common/types";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { EVENT_REQUEST_RELOAD_SETTING_TAB, EVENT_SETTING_SAVED } from "@lib/events/coreEvents";
 import { eventHub } from "@lib/hub/hub";
 import { SettingService, type SettingServiceDependencies } from "@lib/services/base/SettingService";
diff --git a/src/modules/services/ObsidianVaultService.ts b/src/modules/services/ObsidianVaultService.ts
index d86c7b1..1e05556 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/services/implements/injectable/InjectableVaultService";
 import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
-import type { FilePath } from "@lib/common/types";
+import type { FilePath } from "@lib/common/models/db.type";
 
 declare module "obsidian" {
     interface DataAdapter {
diff --git a/src/serviceFeatures/redFlag.unit.spec.ts b/src/serviceFeatures/redFlag.unit.spec.ts
index d1f5ef6..3cd09cc 100644
--- a/src/serviceFeatures/redFlag.unit.spec.ts
+++ b/src/serviceFeatures/redFlag.unit.spec.ts
@@ -20,7 +20,7 @@ import {
     TweakValuesRecommendedTemplate,
     TweakValuesShouldMatchedTemplate,
     TweakValuesTemplate,
-} from "@lib/common/types";
+} from "@lib/common/models/tweak.definition";
 import {
     ExtraOnLocal,
     FullScanModes,
diff --git a/src/serviceFeatures/setupObsidian/setupProtocol.ts b/src/serviceFeatures/setupObsidian/setupProtocol.ts
index 5310fbf..9d1e97f 100644
--- a/src/serviceFeatures/setupObsidian/setupProtocol.ts
+++ b/src/serviceFeatures/setupObsidian/setupProtocol.ts
@@ -1,4 +1,4 @@
-import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/types";
+import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/logger";
 import type { LogFunction } from "@lib/services/lib/logUtils";
 import { createInstanceLogFunction } from "@lib/services/lib/logUtils";
 import type { SetupFeatureHost } from "@lib/serviceFeatures/setupObsidian/types";
diff --git a/src/serviceModules/FileSystemAdapters/ObsidianConversionAdapter.ts b/src/serviceModules/FileSystemAdapters/ObsidianConversionAdapter.ts
index 0295759..28f7e5b 100644
--- a/src/serviceModules/FileSystemAdapters/ObsidianConversionAdapter.ts
+++ b/src/serviceModules/FileSystemAdapters/ObsidianConversionAdapter.ts
@@ -1,4 +1,4 @@
-import type { UXFileInfoStub, UXFolderInfo } from "@lib/common/types";
+import type { UXFileInfoStub, UXFolderInfo } from "@lib/common/models/fileaccess.type";
 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 be527df..09a8542 100644
--- a/src/serviceModules/FileSystemAdapters/ObsidianFileSystemAdapter.ts
+++ b/src/serviceModules/FileSystemAdapters/ObsidianFileSystemAdapter.ts
@@ -1,4 +1,5 @@
-import type { FilePath, UXStat } from "@lib/common/types";
+import type { FilePath } from "@lib/common/models/db.type";
+import type { UXStat } from "@lib/common/models/fileaccess.type";
 import type {
     IFileSystemAdapter,
     IPathAdapter,
diff --git a/src/serviceModules/FileSystemAdapters/ObsidianPathAdapter.ts b/src/serviceModules/FileSystemAdapters/ObsidianPathAdapter.ts
index a21ced1..6af63a7 100644
--- a/src/serviceModules/FileSystemAdapters/ObsidianPathAdapter.ts
+++ b/src/serviceModules/FileSystemAdapters/ObsidianPathAdapter.ts
@@ -1,5 +1,5 @@
 import { type TAbstractFile, normalizePath } from "@/deps";
-import type { FilePath } from "@lib/common/types";
+import type { FilePath } from "@lib/common/models/db.type";
 import type { IPathAdapter } from "@lib/serviceModules/adapters";
 
 /**
diff --git a/src/serviceModules/FileSystemAdapters/ObsidianStorageAdapter.ts b/src/serviceModules/FileSystemAdapters/ObsidianStorageAdapter.ts
index a913301..c77d8ac 100644
--- a/src/serviceModules/FileSystemAdapters/ObsidianStorageAdapter.ts
+++ b/src/serviceModules/FileSystemAdapters/ObsidianStorageAdapter.ts
@@ -1,4 +1,4 @@
-import type { UXDataWriteOptions } from "@lib/common/types";
+import type { UXDataWriteOptions } from "@lib/common/models/fileaccess.type";
 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/ObsidianVaultAdapter.ts b/src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.ts
index 7d0fe1b..5b0fc1f 100644
--- a/src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.ts
+++ b/src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.ts
@@ -1,4 +1,4 @@
-import type { UXDataWriteOptions } from "@lib/common/types";
+import type { UXDataWriteOptions } from "@lib/common/models/fileaccess.type";
 import type { IVaultAdapter } from "@lib/serviceModules/adapters";
 import { toArrayBuffer } from "@lib/serviceModules/FileAccessBase";
 import type { TFile, App, TFolder } from "obsidian";
diff --git a/test/harness/harness.ts b/test/harness/harness.ts
index c297df7..b9b371a 100644
--- a/test/harness/harness.ts
+++ b/test/harness/harness.ts
@@ -1,6 +1,7 @@
 import { App } from "@/deps.ts";
 import ObsidianLiveSyncPlugin from "@/main";
-import { DEFAULT_SETTINGS, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 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 d33d974..3badea7 100644
--- a/test/lib/commands.ts
+++ b/test/lib/commands.ts
@@ -1,4 +1,4 @@
-import type { P2PSyncSetting } from "@lib/common/types";
+import type { P2PSyncSetting } from "@lib/common/models/setting.type";
 import { delay } from "octagonal-wheels/promises";
 import type { BrowserContext, Page } from "playwright";
 import type { Plugin } from "vitest/config";
diff --git a/test/suite/db_common.ts b/test/suite/db_common.ts
index 62b9120..5812253 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/common/types";
+import type { FilePath } from "@lib/common/models/db.type";
 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 9714693..6831a57 100644
--- a/test/suite/onlylocaldb.test.ts
+++ b/test/suite/onlylocaldb.test.ts
@@ -1,7 +1,9 @@
 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/common/types";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import type { FilePath } from "@lib/common/models/db.type";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 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 574db74..87b7925 100644
--- a/test/suite/sync.senario.basic.ts
+++ b/test/suite/sync.senario.basic.ts
@@ -3,8 +3,9 @@
 // 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/common/types";
-
+import { RemoteTypes } from "@lib/common/models/setting.const";
+import type { FilePath } from "@lib/common/models/db.type";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import {
     DummyFileSourceInisialised,
     FILE_SIZE_BINS,
diff --git a/test/suite/sync.single.test.ts b/test/suite/sync.single.test.ts
index d0fd942..385e985 100644
--- a/test/suite/sync.single.test.ts
+++ b/test/suite/sync.single.test.ts
@@ -2,13 +2,9 @@
 // This test suite only covers main functional cases of synchronisation. Event handling, error cases,
 // and edge, resolving conflicts, etc. will be covered in separate test suites.
 import { describe } from "vitest";
-import {
-    PREFERRED_JOURNAL_SYNC,
-    PREFERRED_SETTING_SELF_HOSTED,
-    RemoteTypes,
-    type ObsidianLiveSyncSettings,
-} from "@lib/common/types";
-
+import { PREFERRED_JOURNAL_SYNC, PREFERRED_SETTING_SELF_HOSTED } from "@lib/common/models/setting.const.preferred";
+import { RemoteTypes } from "@lib/common/models/setting.const";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { defaultFileOption } from "./db_common";
 import { syncBasicCase } from "./sync.senario.basic.ts";
 import { settingBase } from "./variables.ts";
diff --git a/test/suite/sync.test.ts b/test/suite/sync.test.ts
index 0529352..06337e6 100644
--- a/test/suite/sync.test.ts
+++ b/test/suite/sync.test.ts
@@ -2,13 +2,9 @@
 // This test suite only covers main functional cases of synchronisation. Event handling, error cases,
 // and edge, resolving conflicts, etc. will be covered in separate test suites.
 import { describe } from "vitest";
-import {
-    PREFERRED_JOURNAL_SYNC,
-    PREFERRED_SETTING_SELF_HOSTED,
-    RemoteTypes,
-    type ObsidianLiveSyncSettings,
-} from "@lib/common/types";
-
+import { PREFERRED_JOURNAL_SYNC, PREFERRED_SETTING_SELF_HOSTED } from "@lib/common/models/setting.const.preferred";
+import { RemoteTypes } from "@lib/common/models/setting.const";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { defaultFileOption } from "./db_common";
 import { syncBasicCase } from "./sync.senario.basic.ts";
 import { settingBase } from "./variables.ts";
diff --git a/test/suite/sync_common.ts b/test/suite/sync_common.ts
index d2f32a2..3cd08e9 100644
--- a/test/suite/sync_common.ts
+++ b/test/suite/sync_common.ts
@@ -1,7 +1,7 @@
 import { expect } from "vitest";
 import { waitForIdle, type LiveSyncHarness } from "../harness/harness";
-import { RemoteTypes, type ObsidianLiveSyncSettings } from "@lib/common/types";
-
+import { RemoteTypes } from "@lib/common/models/setting.const";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { delay, fireAndForget } from "@lib/common/utils";
 import { commands } from "vitest/browser";
 import { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
diff --git a/test/suite/variables.ts b/test/suite/variables.ts
index fda1a5a..a855947 100644
--- a/test/suite/variables.ts
+++ b/test/suite/variables.ts
@@ -1,5 +1,8 @@
 import { DoctorRegulation } from "@lib/common/configForDoc";
-import { DEFAULT_SETTINGS, ChunkAlgorithms, AutoAccepting, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import { ChunkAlgorithms } from "@lib/common/models/setting.const";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
+import { AutoAccepting } from "@lib/common/models/setting.type";
 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 d3d2b00..9906eeb 100644
--- a/test/suitep2p/sync_common_p2p.ts
+++ b/test/suitep2p/sync_common_p2p.ts
@@ -7,7 +7,8 @@
  */
 import { expect } from "vitest";
 import { waitForIdle, type LiveSyncHarness } from "../harness/harness";
-import { RemoteTypes, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { RemoteTypes } from "@lib/common/models/setting.const";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { delay } from "@lib/common/utils";
 import { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
 import { waitTaskWithFollowups } from "../lib/util";
diff --git a/test/suitep2p/syncp2p.p2p-down.test.ts b/test/suitep2p/syncp2p.p2p-down.test.ts
index 6611147..694ddad 100644
--- a/test/suitep2p/syncp2p.p2p-down.test.ts
+++ b/test/suitep2p/syncp2p.p2p-down.test.ts
@@ -9,13 +9,11 @@
  */
 import { afterAll, beforeAll, beforeEach, describe, expect, it, test } from "vitest";
 import { generateHarness, waitForIdle, waitForReady, type LiveSyncHarness } from "../harness/harness";
-import {
-    PREFERRED_SETTING_SELF_HOSTED,
-    RemoteTypes,
-    type FilePath,
-    type ObsidianLiveSyncSettings,
-    AutoAccepting,
-} from "@lib/common/types";
+import { PREFERRED_SETTING_SELF_HOSTED } from "@lib/common/models/setting.const.preferred";
+import { RemoteTypes } from "@lib/common/models/setting.const";
+import type { FilePath } from "@lib/common/models/db.type";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
+import { AutoAccepting } from "@lib/common/models/setting.type";
 import { DummyFileSourceInisialised, generateBinaryFile, generateFile } from "../utils/dummyfile";
 import { defaultFileOption, testFileRead } from "../suite/db_common";
 import { delay } from "@lib/common/utils";
diff --git a/test/suitep2p/syncp2p.p2p-up.test.ts b/test/suitep2p/syncp2p.p2p-up.test.ts
index 682bd1d..a6f137c 100644
--- a/test/suitep2p/syncp2p.p2p-up.test.ts
+++ b/test/suitep2p/syncp2p.p2p-up.test.ts
@@ -12,12 +12,10 @@
  */
 import { afterAll, beforeAll, describe, expect, it, test } from "vitest";
 import { generateHarness, waitForIdle, waitForReady, type LiveSyncHarness } from "../harness/harness";
-import {
-    PREFERRED_SETTING_SELF_HOSTED,
-    RemoteTypes,
-    type ObsidianLiveSyncSettings,
-    AutoAccepting,
-} from "@lib/common/types";
+import { PREFERRED_SETTING_SELF_HOSTED } from "@lib/common/models/setting.const.preferred";
+import { RemoteTypes } from "@lib/common/models/setting.const";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
+import { AutoAccepting } from "@lib/common/models/setting.type";
 import {
     DummyFileSourceInisialised,
     FILE_SIZE_BINS,
diff --git a/test/suitep2p/syncp2p.test.ts b/test/suitep2p/syncp2p.test.ts
index 757c92a..c2badc5 100644
--- a/test/suitep2p/syncp2p.test.ts
+++ b/test/suitep2p/syncp2p.test.ts
@@ -2,13 +2,9 @@
 // This test suite only covers main functional cases of synchronisation. Event handling, error cases,
 // and edge, resolving conflicts, etc. will be covered in separate test suites.
 import { describe } from "vitest";
-import {
-    PREFERRED_JOURNAL_SYNC,
-    PREFERRED_SETTING_SELF_HOSTED,
-    RemoteTypes,
-    type ObsidianLiveSyncSettings,
-} from "@lib/common/types";
-
+import { PREFERRED_JOURNAL_SYNC, PREFERRED_SETTING_SELF_HOSTED } from "@lib/common/models/setting.const.preferred";
+import { RemoteTypes } from "@lib/common/models/setting.const";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { settingBase } from "../suite/variables.ts";
 import { defaultFileOption } from "../suite/db_common";
 import { syncBasicCase } from "../suite/sync.senario.basic.ts";
diff --git a/test/unit/dialog.test.ts b/test/unit/dialog.test.ts
index 1ed6545..ae74e27 100644
--- a/test/unit/dialog.test.ts
+++ b/test/unit/dialog.test.ts
@@ -3,8 +3,9 @@ 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/common/types";
-
+import { ChunkAlgorithms } from "@lib/common/models/setting.const";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { DummyFileSourceInisialised } from "../utils/dummyfile";
 
 import { page } from "vitest/browser";