diff --git a/packages/core/src/extensions/base-extension-store.ts b/packages/core/src/extensions/base-extension-store.ts
index adba026767..1a841087ca 100644
--- a/packages/core/src/extensions/base-extension-store.ts
+++ b/packages/core/src/extensions/base-extension-store.ts
@@ -8,12 +8,12 @@ import type { LensExtension } from "./lens-extension";
 import type { StaticThis } from "../common/utils/singleton";
 import { getOrInsertWith } from "@k8slens/utilities";
 import { getLegacyGlobalDiForExtensionApi } from "@k8slens/legacy-global-di";
-import type { PersistentStorage, PersistentStorageParams } from "../common/persistent-storage/create.injectable";
-import createPersistentStorageInjectable from "../common/persistent-storage/create.injectable";
 import directoryForUserDataInjectable from "../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import assert from "assert";
 import type { Options } from "conf";
-import type { Migrations } from "../common/persistent-storage/migrations.injectable";
+import createPersistentStorageInjectable, { type PersistentStorage } from "../features/persistent-storage/common/create.injectable";
+import type { PersistentStorageParams } from "./common-api/stores";
+import type { Migrations } from "../features/persistent-storage/common/migrations.injectable";
 
 export interface ExtensionStoreParams<T extends object> extends Omit<PersistentStorageParams<T>, "migrations" | "cwd" | "fromStore" | "toJSON"> {
   migrations?: Options<T>["migrations"];
diff --git a/packages/core/src/extensions/common-api/stores.ts b/packages/core/src/extensions/common-api/stores.ts
index 4585a1661d..5c35b63a7d 100644
--- a/packages/core/src/extensions/common-api/stores.ts
+++ b/packages/core/src/extensions/common-api/stores.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { PersistentStorageParams } from "../../common/persistent-storage/create.injectable";
+import type { PersistentStorageParams } from "../../features/persistent-storage/common/create.injectable";
 import type { ExtensionStoreParams } from "../base-extension-store";
 import { BaseExtensionStore as ExtensionStore } from "../base-extension-store";
 
diff --git a/packages/core/src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store-injection-token.ts b/packages/core/src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store-injection-token.ts
index 297238787e..de4e8c242b 100644
--- a/packages/core/src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store-injection-token.ts
+++ b/packages/core/src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store-injection-token.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { MigrationDeclaration } from "../../../common/persistent-storage/migrations.injectable";
+import type { MigrationDeclaration } from "../../../features/persistent-storage/common/migrations.injectable";
 
 export const fileSystemProvisionerStoreMigrationDeclarationInjectionToken = getInjectionToken<MigrationDeclaration>({
   id: "file-system-provisioner-store-migration-declaration",
diff --git a/packages/core/src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.injectable.ts b/packages/core/src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.injectable.ts
index fe78674d11..2f08efa17e 100644
--- a/packages/core/src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.injectable.ts
+++ b/packages/core/src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { registeredExtensionsInjectable } from "./registered-extensions.injectable";
-import createPersistentStorageInjectable from "../../../common/persistent-storage/create.injectable";
+import createPersistentStorageInjectable from "../../../features/persistent-storage/common/create.injectable";
 import { action } from "mobx";
 import { object } from "@k8slens/utilities";
 import storeMigrationVersionInjectable from "../../../common/vars/store-migration-version.injectable";
diff --git a/packages/core/src/features/cluster/storage/cluster-storage.test.ts b/packages/core/src/features/cluster/storage/cluster-storage.test.ts
index 4178b3e7d4..5a0cc0ecb1 100644
--- a/packages/core/src/features/cluster/storage/cluster-storage.test.ts
+++ b/packages/core/src/features/cluster/storage/cluster-storage.test.ts
@@ -24,7 +24,7 @@ import writeFileSyncInjectable from "../../../common/fs/write-file-sync.injectab
 import type { WriteBufferSync } from "../../../common/fs/write-buffer-sync.injectable";
 import writeBufferSyncInjectable from "../../../common/fs/write-buffer-sync.injectable";
 import clustersPersistentStorageInjectable from "./common/storage.injectable";
-import type { PersistentStorage } from "../../../common/persistent-storage/create.injectable";
+import type { PersistentStorage } from "../../persistent-storage/common/create.injectable";
 import type { AddCluster } from "./common/add.injectable";
 import addClusterInjectable from "./common/add.injectable";
 import type { GetClusterById } from "./common/get-by-id.injectable";
diff --git a/packages/core/src/features/cluster/storage/common/migration-token.ts b/packages/core/src/features/cluster/storage/common/migration-token.ts
index 8fa8064cf6..121f4e7f57 100644
--- a/packages/core/src/features/cluster/storage/common/migration-token.ts
+++ b/packages/core/src/features/cluster/storage/common/migration-token.ts
@@ -4,7 +4,7 @@
  */
 
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { MigrationDeclaration } from "../../../../common/persistent-storage/migrations.injectable";
+import type { MigrationDeclaration } from "../../../persistent-storage/common/migrations.injectable";
 
 export const clusterStoreMigrationInjectionToken = getInjectionToken<MigrationDeclaration>({
   id: "cluster-store-migration",
diff --git a/packages/core/src/features/cluster/storage/common/storage.injectable.ts b/packages/core/src/features/cluster/storage/common/storage.injectable.ts
index 0066621e3b..56ba24de06 100644
--- a/packages/core/src/features/cluster/storage/common/storage.injectable.ts
+++ b/packages/core/src/features/cluster/storage/common/storage.injectable.ts
@@ -9,8 +9,8 @@ import { clusterStoreMigrationInjectionToken } from "./migration-token";
 import type { ClusterId, ClusterModel } from "../../../../common/cluster-types";
 import { Cluster } from "../../../../common/cluster/cluster";
 import { loggerInjectionToken } from "@k8slens/logger";
-import createPersistentStorageInjectable from "../../../../common/persistent-storage/create.injectable";
-import persistentStorageMigrationsInjectable from "../../../../common/persistent-storage/migrations.injectable";
+import createPersistentStorageInjectable from "../../../persistent-storage/common/create.injectable";
+import persistentStorageMigrationsInjectable from "../../../persistent-storage/common/migrations.injectable";
 import storeMigrationVersionInjectable from "../../../../common/vars/store-migration-version.injectable";
 import clustersStateInjectable from "./state.injectable";
 
diff --git a/packages/core/src/features/extensions/enabled/common/storage.injectable.ts b/packages/core/src/features/extensions/enabled/common/storage.injectable.ts
index d3d5b36565..0d75a21472 100644
--- a/packages/core/src/features/extensions/enabled/common/storage.injectable.ts
+++ b/packages/core/src/features/extensions/enabled/common/storage.injectable.ts
@@ -6,9 +6,9 @@ import type { LensExtensionId } from "@k8slens/legacy-extensions";
 import { isDefined } from "@k8slens/utilities";
 import { getInjectable } from "@ogre-tools/injectable";
 import { action, toJS } from "mobx";
-import createPersistentStorageInjectable from "../../../../common/persistent-storage/create.injectable";
-import persistentStorageMigrationsInjectable from "../../../../common/persistent-storage/migrations.injectable";
-import { enabledExtensionsMigrationDeclarationInjectionToken } from "./migrations";
+import createPersistentStorageInjectable from "../../../persistent-storage/common/create.injectable";
+import persistentStorageMigrationsInjectable from "../../../persistent-storage/common/migrations.injectable";
+import { enabledExtensionsMigrationDeclarationInjectionToken } from "../main/migrations";
 import type { LensExtensionState } from "./state.injectable";
 import enabledExtensionsStateInjectable from "./state.injectable";
 import { enabledExtensionsPersistentStorageVersionInitializable } from "./storage-version";
diff --git a/packages/core/src/features/extensions/enabled/common/migrations.ts b/packages/core/src/features/extensions/enabled/main/migrations.ts
similarity index 77%
rename from packages/core/src/features/extensions/enabled/common/migrations.ts
rename to packages/core/src/features/extensions/enabled/main/migrations.ts
index eef1c4c996..5095636b1c 100644
--- a/packages/core/src/features/extensions/enabled/common/migrations.ts
+++ b/packages/core/src/features/extensions/enabled/main/migrations.ts
@@ -4,7 +4,7 @@
  */
 
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { MigrationDeclaration } from "../../../../common/persistent-storage/migrations.injectable";
+import type { MigrationDeclaration } from "../../../persistent-storage/common/migrations.injectable";
 
 export const enabledExtensionsMigrationDeclarationInjectionToken = getInjectionToken<MigrationDeclaration>({
   id: "enabled-extensions-migration-declaration",
diff --git a/packages/core/src/features/extensions/enabled/main/storage-version.injectable.ts b/packages/core/src/features/extensions/enabled/main/storage-version.injectable.ts
index dacbb52011..1be6d028b2 100644
--- a/packages/core/src/features/extensions/enabled/main/storage-version.injectable.ts
+++ b/packages/core/src/features/extensions/enabled/main/storage-version.injectable.ts
@@ -2,8 +2,8 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import storageMigrationVersionInjectable from "../../../../common/persistent-storage/storage-migration-version.injectable";
-import { enabledExtensionsMigrationDeclarationInjectionToken } from "../common/migrations";
+import storageMigrationVersionInjectable from "../../../persistent-storage/main/storage-migration-version.injectable";
+import { enabledExtensionsMigrationDeclarationInjectionToken } from "./migrations";
 import { enabledExtensionsPersistentStorageVersionInitializable } from "../common/storage-version";
 import { getInjectable } from "@ogre-tools/injectable";
 
diff --git a/packages/core/src/features/extensions/enabled/main/v6.5.0-migration.injectable.ts b/packages/core/src/features/extensions/enabled/main/v6.5.0-migration.injectable.ts
index f658180535..bfb7d42d33 100644
--- a/packages/core/src/features/extensions/enabled/main/v6.5.0-migration.injectable.ts
+++ b/packages/core/src/features/extensions/enabled/main/v6.5.0-migration.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { isObject } from "@k8slens/utilities";
 import { getInjectable } from "@ogre-tools/injectable";
-import { enabledExtensionsMigrationDeclarationInjectionToken } from "../common/migrations";
+import { enabledExtensionsMigrationDeclarationInjectionToken } from "./migrations";
 
 const enabledExtensionsMigrationV650Injectable = getInjectable({
   id: "enabled-extensions-migration-v650",
diff --git a/packages/core/src/features/hotbar/storage/common/migrations-token.ts b/packages/core/src/features/hotbar/storage/common/migrations-token.ts
index ede5cd1966..a625f48bbb 100644
--- a/packages/core/src/features/hotbar/storage/common/migrations-token.ts
+++ b/packages/core/src/features/hotbar/storage/common/migrations-token.ts
@@ -4,7 +4,7 @@
  */
 
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { MigrationDeclaration } from "../../../../common/persistent-storage/migrations.injectable";
+import type { MigrationDeclaration } from "../../../persistent-storage/common/migrations.injectable";
 
 export const hotbarStoreMigrationInjectionToken = getInjectionToken<MigrationDeclaration>({
   id: "hotbar-store-migration-token",
diff --git a/packages/core/src/features/hotbar/storage/common/storage.injectable.ts b/packages/core/src/features/hotbar/storage/common/storage.injectable.ts
index 3bdc2bd3b6..e85fe60ae2 100644
--- a/packages/core/src/features/hotbar/storage/common/storage.injectable.ts
+++ b/packages/core/src/features/hotbar/storage/common/storage.injectable.ts
@@ -8,8 +8,8 @@ import { action, comparer } from "mobx";
 import catalogCatalogEntityInjectable from "../../../../common/catalog-entities/general-catalog-entities/implementations/catalog-catalog-entity.injectable";
 import { hotbarStoreMigrationInjectionToken } from "./migrations-token";
 import { defaultHotbarCells } from "./types";
-import createPersistentStorageInjectable from "../../../../common/persistent-storage/create.injectable";
-import persistentStorageMigrationsInjectable from "../../../../common/persistent-storage/migrations.injectable";
+import createPersistentStorageInjectable from "../../../persistent-storage/common/create.injectable";
+import persistentStorageMigrationsInjectable from "../../../persistent-storage/common/migrations.injectable";
 import storeMigrationVersionInjectable from "../../../../common/vars/store-migration-version.injectable";
 import activeHotbarIdInjectable from "./active-id.injectable";
 import createHotbarInjectable from "./create-hotbar.injectable";
diff --git a/packages/core/src/features/hotbar/storage/main/welcome-page-migration.test.ts b/packages/core/src/features/hotbar/storage/main/welcome-page-migration.test.ts
index 31cb3a4092..d9804dbc22 100644
--- a/packages/core/src/features/hotbar/storage/main/welcome-page-migration.test.ts
+++ b/packages/core/src/features/hotbar/storage/main/welcome-page-migration.test.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import welcomeCatalogEntityInjectable from "../../../../common/catalog-entities/general-catalog-entities/implementations/welcome-catalog-entity.injectable";
-import type { MigrationDeclaration, MigrationStore } from "../../../../common/persistent-storage/migrations.injectable";
+import type { MigrationDeclaration, MigrationStore } from "../../../persistent-storage/common/migrations.injectable";
 import { getDiForUnitTesting } from "../../../../main/getDiForUnitTesting";
 import type { HotbarData } from "../common/hotbar";
 import type { HotbarItem } from "../common/types";
diff --git a/packages/core/src/common/persistent-storage/channel-prefix.ts b/packages/core/src/features/persistent-storage/common/channel-prefix.ts
similarity index 100%
rename from packages/core/src/common/persistent-storage/channel-prefix.ts
rename to packages/core/src/features/persistent-storage/common/channel-prefix.ts
diff --git a/packages/core/src/common/persistent-storage/create.injectable.ts b/packages/core/src/features/persistent-storage/common/create.injectable.ts
similarity index 94%
rename from packages/core/src/common/persistent-storage/create.injectable.ts
rename to packages/core/src/features/persistent-storage/common/create.injectable.ts
index 1f3d158e90..3c2a244711 100644
--- a/packages/core/src/common/persistent-storage/create.injectable.ts
+++ b/packages/core/src/features/persistent-storage/common/create.injectable.ts
@@ -8,10 +8,7 @@ import type { Options } from "conf/dist/source";
 import { isEqual, kebabCase } from "lodash";
 import type { IEqualsComparer } from "mobx";
 import { reaction } from "mobx";
-import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
-import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable";
 import { loggerInjectionToken } from "@k8slens/logger";
-import getBasenameOfPathInjectable from "../path/get-basename.injectable";
 import { enlistMessageChannelListenerInjectionToken, sendMessageToChannelInjectionToken } from "@k8slens/messaging";
 import type { MessageChannel } from "@k8slens/messaging";
 import { persistentStorageIpcChannelPrefixesInjectionToken } from "./channel-prefix";
@@ -19,6 +16,9 @@ import { shouldPersistentStorageDisableSyncInIpcListenerInjectionToken } from ".
 import { persistStateToConfigInjectionToken } from "./save-to-file";
 import type { Migrations } from "./migrations.injectable";
 import { nextTick } from "process";
+import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable";
+import getBasenameOfPathInjectable from "../../../common/path/get-basename.injectable";
 
 export interface PersistentStorage {
   /**
diff --git a/packages/core/src/common/persistent-storage/disable-sync.ts b/packages/core/src/features/persistent-storage/common/disable-sync.ts
similarity index 100%
rename from packages/core/src/common/persistent-storage/disable-sync.ts
rename to packages/core/src/features/persistent-storage/common/disable-sync.ts
diff --git a/packages/core/src/common/persistent-storage/migrations.injectable.ts b/packages/core/src/features/persistent-storage/common/migrations.injectable.ts
similarity index 100%
rename from packages/core/src/common/persistent-storage/migrations.injectable.ts
rename to packages/core/src/features/persistent-storage/common/migrations.injectable.ts
diff --git a/packages/core/src/common/persistent-storage/save-to-file.ts b/packages/core/src/features/persistent-storage/common/save-to-file.ts
similarity index 100%
rename from packages/core/src/common/persistent-storage/save-to-file.ts
rename to packages/core/src/features/persistent-storage/common/save-to-file.ts
diff --git a/packages/core/src/main/base-store/disable-sync-in-ipc-listener.injectable.ts b/packages/core/src/features/persistent-storage/main/disable-sync-in-ipc-listener.injectable.ts
similarity index 90%
rename from packages/core/src/main/base-store/disable-sync-in-ipc-listener.injectable.ts
rename to packages/core/src/features/persistent-storage/main/disable-sync-in-ipc-listener.injectable.ts
index 10c1528c57..01cbc62b17 100644
--- a/packages/core/src/main/base-store/disable-sync-in-ipc-listener.injectable.ts
+++ b/packages/core/src/features/persistent-storage/main/disable-sync-in-ipc-listener.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { shouldPersistentStorageDisableSyncInIpcListenerInjectionToken } from "../../common/persistent-storage/disable-sync";
+import { shouldPersistentStorageDisableSyncInIpcListenerInjectionToken } from "../common/disable-sync";
 
 const shouldBaseStoreDisableSyncInIpcListenerInjectable = getInjectable({
   id: "should-base-store-disable-sync-in-ipc-listener",
diff --git a/packages/core/src/main/base-store/ipc-channel-prefix.injectable.ts b/packages/core/src/features/persistent-storage/main/ipc-channel-prefix.injectable.ts
similarity index 91%
rename from packages/core/src/main/base-store/ipc-channel-prefix.injectable.ts
rename to packages/core/src/features/persistent-storage/main/ipc-channel-prefix.injectable.ts
index a0a96ce3af..1d0575a060 100644
--- a/packages/core/src/main/base-store/ipc-channel-prefix.injectable.ts
+++ b/packages/core/src/features/persistent-storage/main/ipc-channel-prefix.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { persistentStorageIpcChannelPrefixesInjectionToken } from "../../common/persistent-storage/channel-prefix";
+import { persistentStorageIpcChannelPrefixesInjectionToken } from "../common/channel-prefix";
 
 const baseStoreIpcChannelPrefixInjectable = getInjectable({
   id: "base-store-ipc-channel-prefix",
diff --git a/packages/core/src/main/base-store/persist-state-to-config.injectable.ts b/packages/core/src/features/persistent-storage/main/persist-state-to-config.injectable.ts
similarity index 88%
rename from packages/core/src/main/base-store/persist-state-to-config.injectable.ts
rename to packages/core/src/features/persistent-storage/main/persist-state-to-config.injectable.ts
index fc380d6239..4b9ed7dc3b 100644
--- a/packages/core/src/main/base-store/persist-state-to-config.injectable.ts
+++ b/packages/core/src/features/persistent-storage/main/persist-state-to-config.injectable.ts
@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { persistStateToConfigInjectionToken } from "../../common/persistent-storage/save-to-file";
 import { loggerInjectionToken } from "@k8slens/logger";
+import { persistStateToConfigInjectionToken } from "../common/save-to-file";
 
 const persistStateToConfigInjectable = getInjectable({
   id: "persist-state-to-config",
diff --git a/packages/core/src/common/persistent-storage/storage-migration-version.injectable.ts b/packages/core/src/features/persistent-storage/main/storage-migration-version.injectable.ts
similarity index 92%
rename from packages/core/src/common/persistent-storage/storage-migration-version.injectable.ts
rename to packages/core/src/features/persistent-storage/main/storage-migration-version.injectable.ts
index 6568e8f983..4e762e2bb8 100644
--- a/packages/core/src/common/persistent-storage/storage-migration-version.injectable.ts
+++ b/packages/core/src/features/persistent-storage/main/storage-migration-version.injectable.ts
@@ -5,7 +5,7 @@
 import type { InjectionToken } from "@ogre-tools/injectable";
 import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
 import * as semver from "semver";
-import type { MigrationDeclaration } from "./migrations.injectable";
+import type { MigrationDeclaration } from "../common/migrations.injectable";
 
 /**
  * NOTE: not all stores can use this computed version, namely if any migration uses a range for
diff --git a/packages/core/src/renderer/base-store/disable-sync-in-ipc-listener.injectable.ts b/packages/core/src/features/persistent-storage/renderer/disable-sync-in-ipc-listener.injectable.ts
similarity index 90%
rename from packages/core/src/renderer/base-store/disable-sync-in-ipc-listener.injectable.ts
rename to packages/core/src/features/persistent-storage/renderer/disable-sync-in-ipc-listener.injectable.ts
index a1ae454992..163016c485 100644
--- a/packages/core/src/renderer/base-store/disable-sync-in-ipc-listener.injectable.ts
+++ b/packages/core/src/features/persistent-storage/renderer/disable-sync-in-ipc-listener.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { shouldPersistentStorageDisableSyncInIpcListenerInjectionToken } from "../../common/persistent-storage/disable-sync";
+import { shouldPersistentStorageDisableSyncInIpcListenerInjectionToken } from "../common/disable-sync";
 
 const shouldBaseStoreDisableSyncInIpcListenerInjectable = getInjectable({
   id: "should-base-store-disable-sync-in-ipc-listener",
diff --git a/packages/core/src/renderer/base-store/ipc-channel-prefix.injectable.ts b/packages/core/src/features/persistent-storage/renderer/ipc-channel-prefix.injectable.ts
similarity index 91%
rename from packages/core/src/renderer/base-store/ipc-channel-prefix.injectable.ts
rename to packages/core/src/features/persistent-storage/renderer/ipc-channel-prefix.injectable.ts
index 8a27bc456e..c2d33ebfc1 100644
--- a/packages/core/src/renderer/base-store/ipc-channel-prefix.injectable.ts
+++ b/packages/core/src/features/persistent-storage/renderer/ipc-channel-prefix.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { persistentStorageIpcChannelPrefixesInjectionToken } from "../../common/persistent-storage/channel-prefix";
+import { persistentStorageIpcChannelPrefixesInjectionToken } from "../common/channel-prefix";
 
 const baseStoreIpcChannelPrefixInjectable = getInjectable({
   id: "base-store-ipc-channel-prefix",
diff --git a/packages/core/src/renderer/base-store/persist-state-to-config.injectable.ts b/packages/core/src/features/persistent-storage/renderer/persist-state-to-config.injectable.ts
similarity index 82%
rename from packages/core/src/renderer/base-store/persist-state-to-config.injectable.ts
rename to packages/core/src/features/persistent-storage/renderer/persist-state-to-config.injectable.ts
index 78d87c7fb1..2ca0b8c8f2 100644
--- a/packages/core/src/renderer/base-store/persist-state-to-config.injectable.ts
+++ b/packages/core/src/features/persistent-storage/renderer/persist-state-to-config.injectable.ts
@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { persistStateToConfigInjectionToken } from "../../common/persistent-storage/save-to-file";
 import { noop } from "@k8slens/utilities";
+import { persistStateToConfigInjectionToken } from "../common/save-to-file";
 
 const persistStateToConfigInjectable = getInjectable({
   id: "persist-state-to-config",
diff --git a/packages/core/src/features/user-preferences/common/migrations-token.ts b/packages/core/src/features/user-preferences/common/migrations-token.ts
index 0da426e3e6..79f067ba4e 100644
--- a/packages/core/src/features/user-preferences/common/migrations-token.ts
+++ b/packages/core/src/features/user-preferences/common/migrations-token.ts
@@ -4,7 +4,7 @@
  */
 
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { MigrationDeclaration } from "../../../common/persistent-storage/migrations.injectable";
+import type { MigrationDeclaration } from "../../persistent-storage/common/migrations.injectable";
 
 export const userPreferencesMigrationInjectionToken = getInjectionToken<MigrationDeclaration>({
   id: "user-preferences-migration-token",
diff --git a/packages/core/src/features/user-preferences/common/storage.injectable.ts b/packages/core/src/features/user-preferences/common/storage.injectable.ts
index 947403c03a..217f4a354d 100644
--- a/packages/core/src/features/user-preferences/common/storage.injectable.ts
+++ b/packages/core/src/features/user-preferences/common/storage.injectable.ts
@@ -5,8 +5,8 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { action } from "mobx";
 import { prefixedLoggerInjectable } from "@k8slens/logger";
-import createPersistentStorageInjectable from "../../../common/persistent-storage/create.injectable";
-import persistentStorageMigrationsInjectable from "../../../common/persistent-storage/migrations.injectable";
+import createPersistentStorageInjectable from "../../persistent-storage/common/create.injectable";
+import persistentStorageMigrationsInjectable from "../../persistent-storage/common/migrations.injectable";
 import { userPreferencesMigrationInjectionToken } from "./migrations-token";
 import { toJS } from "../../../common/utils";
 import storeMigrationVersionInjectable from "../../../common/vars/store-migration-version.injectable";
diff --git a/packages/core/src/features/weblinks/common/migration-token.ts b/packages/core/src/features/weblinks/common/migration-token.ts
index a0d8ce58fc..10b89bcfc0 100644
--- a/packages/core/src/features/weblinks/common/migration-token.ts
+++ b/packages/core/src/features/weblinks/common/migration-token.ts
@@ -4,7 +4,7 @@
  */
 
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { MigrationDeclaration } from "../../../common/persistent-storage/migrations.injectable";
+import type { MigrationDeclaration } from "../../persistent-storage/common/migrations.injectable";
 
 export const weblinkStoreMigrationInjectionToken = getInjectionToken<MigrationDeclaration>({
   id: "weblink-store-migration-token",
diff --git a/packages/core/src/features/weblinks/common/storage.injectable.ts b/packages/core/src/features/weblinks/common/storage.injectable.ts
index 6b6c668b83..aa5e0ed082 100644
--- a/packages/core/src/features/weblinks/common/storage.injectable.ts
+++ b/packages/core/src/features/weblinks/common/storage.injectable.ts
@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { action, comparer, toJS } from "mobx";
-import createPersistentStorageInjectable from "../../../common/persistent-storage/create.injectable";
-import persistentStorageMigrationsInjectable from "../../../common/persistent-storage/migrations.injectable";
+import createPersistentStorageInjectable from "../../persistent-storage/common/create.injectable";
+import persistentStorageMigrationsInjectable from "../../persistent-storage/common/migrations.injectable";
 import storeMigrationVersionInjectable from "../../../common/vars/store-migration-version.injectable";
 import { weblinkStoreMigrationInjectionToken } from "./migration-token";
 import weblinksStateInjectable from "./state.injectable";