diff --git a/src/common/user-store/user-store.injectable.ts b/src/common/user-store/user-store.injectable.ts
index 3b4aba0b56..bb76969bc3 100644
--- a/src/common/user-store/user-store.injectable.ts
+++ b/src/common/user-store/user-store.injectable.ts
@@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import { ipcMain } from "electron";
 import userStoreFileNameMigrationInjectable from "./file-name-migration.injectable";
 import { UserStore } from "./user-store";
-import selectedUpdateChannelInjectable from "../application-update/selected-update-channel/selected-update-channel.injectable";
+import selectedUpdateChannelInjectable from "../../behaviours/application-update/common/selected-update-channel/selected-update-channel.injectable";
 
 const userStoreInjectable = getInjectable({
   id: "user-store",
diff --git a/src/common/user-store/user-store.ts b/src/common/user-store/user-store.ts
index b806732735..55ed3e8242 100644
--- a/src/common/user-store/user-store.ts
+++ b/src/common/user-store/user-store.ts
@@ -15,8 +15,8 @@ import { getOrInsertSet, toggle, toJS, object } from "../../renderer/utils";
 import { DESCRIPTORS } from "./preferences-helpers";
 import type { UserPreferencesModel, StoreType } from "./preferences-helpers";
 import logger from "../../main/logger";
-import type { SelectedUpdateChannel } from "../application-update/selected-update-channel/selected-update-channel.injectable";
-import type { UpdateChannelId } from "../application-update/update-channels";
+import type { SelectedUpdateChannel } from "../../behaviours/application-update/common/selected-update-channel/selected-update-channel.injectable";
+import type { UpdateChannelId } from "../../behaviours/application-update/common/update-channels";
 
 export interface UserStoreModel {
   lastSeenAppVersion: string;
diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts
index fc11e9b60a..52bda5c3dd 100644
--- a/src/main/getDiForUnitTesting.ts
+++ b/src/main/getDiForUnitTesting.ts
@@ -73,16 +73,16 @@ import platformInjectable from "../common/vars/platform.injectable";
 import productNameInjectable from "./app-paths/app-name/product-name.injectable";
 import electronQuitAndInstallUpdateInjectable from "./electron-app/features/electron-quit-and-install-update.injectable";
 import electronUpdaterIsActiveInjectable from "./electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "./application-update/publish-is-configured.injectable";
-import checkForPlatformUpdatesInjectable from "./application-update/check-for-platform-updates/check-for-platform-updates.injectable";
+import publishIsConfiguredInjectable from "../behaviours/application-update/main/publish-is-configured.injectable";
+import checkForPlatformUpdatesInjectable from "../behaviours/application-update/main/check-for-platform-updates/check-for-platform-updates.injectable";
 import baseBundledBinariesDirectoryInjectable from "../common/vars/base-bundled-binaries-dir.injectable";
 import setUpdateOnQuitInjectable from "./electron-app/features/set-update-on-quit.injectable";
-import downloadPlatformUpdateInjectable from "./application-update/download-platform-update/download-platform-update.injectable";
+import downloadPlatformUpdateInjectable from "../behaviours/application-update/main/download-platform-update/download-platform-update.injectable";
 import startCatalogSyncInjectable from "./catalog-sync-to-renderer/start-catalog-sync.injectable";
 import startKubeConfigSyncInjectable from "./start-main-application/runnables/kube-config-sync/start-kube-config-sync.injectable";
 import appVersionInjectable from "../common/get-configuration-file-model/app-version/app-version.injectable";
 import getRandomIdInjectable from "../common/utils/get-random-id.injectable";
-import periodicalCheckForUpdatesInjectable from "./application-update/periodical-check-for-updates/periodical-check-for-updates.injectable";
+import periodicalCheckForUpdatesInjectable from "../behaviours/application-update/main/periodical-check-for-updates/periodical-check-for-updates.injectable";
 import execFileInjectable from "../common/fs/exec-file.injectable";
 import normalizedPlatformArchitectureInjectable from "../common/vars/normalized-platform-architecture.injectable";
 import getHelmChartInjectable from "./helm/helm-service/get-helm-chart.injectable";
diff --git a/src/main/menu/application-menu-items.injectable.ts b/src/main/menu/application-menu-items.injectable.ts
index f223c539c6..1a8ef68a9b 100644
--- a/src/main/menu/application-menu-items.injectable.ts
+++ b/src/main/menu/application-menu-items.injectable.ts
@@ -11,7 +11,7 @@ import { webContents } from "electron";
 import loggerInjectable from "../../common/logger.injectable";
 import appNameInjectable from "../app-paths/app-name/app-name.injectable";
 import electronMenuItemsInjectable from "./electron-menu-items.injectable";
-import updatingIsEnabledInjectable from "../application-update/updating-is-enabled.injectable";
+import updatingIsEnabledInjectable from "../../behaviours/application-update/main/updating-is-enabled.injectable";
 import navigateToPreferencesInjectable from "../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable";
 import navigateToExtensionsInjectable from "../../common/front-end-routing/routes/extensions/navigate-to-extensions.injectable";
 import navigateToCatalogInjectable from "../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
@@ -24,7 +24,7 @@ import showAboutInjectable from "./show-about.injectable";
 import applicationWindowInjectable from "../start-main-application/lens-window/application-window/application-window.injectable";
 import reloadWindowInjectable from "../start-main-application/lens-window/reload-window.injectable";
 import showApplicationWindowInjectable from "../start-main-application/lens-window/show-application-window.injectable";
-import processCheckingForUpdatesInjectable from "../application-update/check-for-updates/process-checking-for-updates.injectable";
+import processCheckingForUpdatesInjectable from "../../behaviours/application-update/main/check-for-updates/process-checking-for-updates.injectable";
 
 function ignoreIf(check: boolean, menuItems: MenuItemOpts[]) {
   return check ? [] : menuItems;
diff --git a/src/renderer/components/+preferences/application.tsx b/src/renderer/components/+preferences/application.tsx
index d3c0fd4414..44e41fa003 100644
--- a/src/renderer/components/+preferences/application.tsx
+++ b/src/renderer/components/+preferences/application.tsx
@@ -24,11 +24,11 @@ import { Preferences } from "./preferences";
 import userStoreInjectable from "../../../common/user-store/user-store.injectable";
 import themeStoreInjectable from "../../themes/store.injectable";
 import { defaultThemeId } from "../../../common/vars";
-import { updateChannels } from "../../../common/application-update/update-channels";
+import { updateChannels } from "../../../behaviours/application-update/common/update-channels";
 import { map, toPairs } from "lodash/fp";
 import { pipeline } from "@ogre-tools/fp";
-import type { SelectedUpdateChannel } from "../../../common/application-update/selected-update-channel/selected-update-channel.injectable";
-import selectedUpdateChannelInjectable from "../../../common/application-update/selected-update-channel/selected-update-channel.injectable";
+import type { SelectedUpdateChannel } from "../../../behaviours/application-update/common/selected-update-channel/selected-update-channel.injectable";
+import selectedUpdateChannelInjectable from "../../../behaviours/application-update/common/selected-update-channel/selected-update-channel.injectable";
 
 interface Dependencies {
   appPreferenceItems: IComputedValue<RegisteredAppPreference[]>;
diff --git a/src/renderer/components/layout/top-bar/top-bar.tsx b/src/renderer/components/layout/top-bar/top-bar.tsx
index 59382d56f0..73b247a1df 100644
--- a/src/renderer/components/layout/top-bar/top-bar.tsx
+++ b/src/renderer/components/layout/top-bar/top-bar.tsx
@@ -18,7 +18,7 @@ import type { NavigateToCatalog } from "../../../../common/front-end-routing/rou
 import navigateToCatalogInjectable from "../../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
 import catalogRouteInjectable from "../../../../common/front-end-routing/routes/catalog/catalog-route.injectable";
 import routeIsActiveInjectable from "../../../routes/route-is-active.injectable";
-import { UpdateButton } from "../../update-button";
+import { UpdateButton } from "../../../../behaviours/application-update/renderer/update-button";
 import topBarPrevEnabledInjectable from "./prev-enabled.injectable";
 import topBarNextEnabledInjectable from "./next-enabled.injectable";
 import openAppContextMenuInjectable from "./open-app-context-menu.injectable";