diff --git a/src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable.ts b/src/behaviours/proxy/resolve-system-proxy/common/resolve-system-proxy-channel.injectable.ts
similarity index 72%
rename from src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable.ts
rename to src/behaviours/proxy/resolve-system-proxy/common/resolve-system-proxy-channel.injectable.ts
index 5dd17ddc6a..8531c77a68 100644
--- a/src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable.ts
+++ b/src/behaviours/proxy/resolve-system-proxy/common/resolve-system-proxy-channel.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 type { RequestChannel } from "../channel/request-channel-injection-token";
-import { requestChannelInjectionToken } from "../channel/request-channel-injection-token";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-injection-token";
+import { requestChannelInjectionToken } from "../../../../common/utils/channel/request-channel-injection-token";
 
 export type ResolveSystemProxyChannel = RequestChannel<string, string>;
 
diff --git a/src/common/utils/resolve-system-proxy/resolve-system-proxy-injection-token.ts b/src/behaviours/proxy/resolve-system-proxy/common/resolve-system-proxy-injection-token.ts
similarity index 100%
rename from src/common/utils/resolve-system-proxy/resolve-system-proxy-injection-token.ts
rename to src/behaviours/proxy/resolve-system-proxy/common/resolve-system-proxy-injection-token.ts
diff --git a/src/main/utils/resolve-system-proxy/electron.injectable.ts b/src/behaviours/proxy/resolve-system-proxy/main/electron.injectable.ts
similarity index 100%
rename from src/main/utils/resolve-system-proxy/electron.injectable.ts
rename to src/behaviours/proxy/resolve-system-proxy/main/electron.injectable.ts
diff --git a/src/main/utils/resolve-system-proxy/resolve-system-proxy-channel-responder.injectable.ts b/src/behaviours/proxy/resolve-system-proxy/main/resolve-system-proxy-channel-responder.injectable.ts
similarity index 71%
rename from src/main/utils/resolve-system-proxy/resolve-system-proxy-channel-responder.injectable.ts
rename to src/behaviours/proxy/resolve-system-proxy/main/resolve-system-proxy-channel-responder.injectable.ts
index c7a1747770..4df39b7436 100644
--- a/src/main/utils/resolve-system-proxy/resolve-system-proxy-channel-responder.injectable.ts
+++ b/src/behaviours/proxy/resolve-system-proxy/main/resolve-system-proxy-channel-responder.injectable.ts
@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import resolveSystemProxyChannelInjectable from "../../../common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable";
+import resolveSystemProxyChannelInjectable from "../common/resolve-system-proxy-channel.injectable";
 import resolveSystemProxyInjectable from "./resolve-system-proxy.injectable";
-import { requestChannelListenerInjectionToken } from "../../../common/utils/channel/request-channel-listener-injection-token";
+import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
 
 const resolveSystemProxyChannelResponderInjectable = getInjectable({
   id: "resolve-system-proxy-channel-responder",
diff --git a/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.injectable.ts b/src/behaviours/proxy/resolve-system-proxy/main/resolve-system-proxy-from-electron.injectable.ts
similarity index 89%
rename from src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.injectable.ts
rename to src/behaviours/proxy/resolve-system-proxy/main/resolve-system-proxy-from-electron.injectable.ts
index c663d59fde..25b2e8b259 100644
--- a/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.injectable.ts
+++ b/src/behaviours/proxy/resolve-system-proxy/main/resolve-system-proxy-from-electron.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import electronInjectable from "./electron.injectable";
-import withErrorLoggingInjectable from "../../../common/utils/with-error-logging/with-error-logging.injectable";
+import withErrorLoggingInjectable from "../../../../common/utils/with-error-logging/with-error-logging.injectable";
 
 const resolveSystemProxyFromElectronInjectable = getInjectable({
   id: "resolve-system-proxy-from-electron",
diff --git a/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts b/src/behaviours/proxy/resolve-system-proxy/main/resolve-system-proxy-from-electron.test.ts
similarity index 94%
rename from src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts
rename to src/behaviours/proxy/resolve-system-proxy/main/resolve-system-proxy-from-electron.test.ts
index 9c395dca5b..7d4fa1689b 100644
--- a/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts
+++ b/src/behaviours/proxy/resolve-system-proxy/main/resolve-system-proxy-from-electron.test.ts
@@ -3,14 +3,14 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { getDiForUnitTesting } from "../../getDiForUnitTesting";
+import { getDiForUnitTesting } from "../../../../main/getDiForUnitTesting";
 import resolveSystemProxyFromElectronInjectable from "./resolve-system-proxy-from-electron.injectable";
 import electronInjectable from "./electron.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import type electron from "electron";
-import { getPromiseStatus } from "../../../common/test-utils/get-promise-status";
-import logErrorInjectable from "../../../common/log-error.injectable";
+import { getPromiseStatus } from "../../../../common/test-utils/get-promise-status";
+import logErrorInjectable from "../../../../common/log-error.injectable";
 import type { DiContainer } from "@ogre-tools/injectable";
 
 describe("technical: resolve-system-proxy-from-electron", () => {
diff --git a/src/main/utils/resolve-system-proxy/resolve-system-proxy.injectable.ts b/src/behaviours/proxy/resolve-system-proxy/main/resolve-system-proxy.injectable.ts
similarity index 83%
rename from src/main/utils/resolve-system-proxy/resolve-system-proxy.injectable.ts
rename to src/behaviours/proxy/resolve-system-proxy/main/resolve-system-proxy.injectable.ts
index c683217916..c034db0f31 100644
--- a/src/main/utils/resolve-system-proxy/resolve-system-proxy.injectable.ts
+++ b/src/behaviours/proxy/resolve-system-proxy/main/resolve-system-proxy.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 { resolveSystemProxyInjectionToken } from "../../../common/utils/resolve-system-proxy/resolve-system-proxy-injection-token";
+import { resolveSystemProxyInjectionToken } from "../common/resolve-system-proxy-injection-token";
 import resolveSystemProxyFromElectronInjectable from "./resolve-system-proxy-from-electron.injectable";
 
 const resolveSystemProxyInjectable = getInjectable({
diff --git a/src/renderer/utils/resolve-proxy/resolve-system-proxy.injectable.ts b/src/behaviours/proxy/resolve-system-proxy/renderer/resolve-system-proxy.injectable.ts
similarity index 65%
rename from src/renderer/utils/resolve-proxy/resolve-system-proxy.injectable.ts
rename to src/behaviours/proxy/resolve-system-proxy/renderer/resolve-system-proxy.injectable.ts
index 8fcb9063d0..28e05e161d 100644
--- a/src/renderer/utils/resolve-proxy/resolve-system-proxy.injectable.ts
+++ b/src/behaviours/proxy/resolve-system-proxy/renderer/resolve-system-proxy.injectable.ts
@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { resolveSystemProxyInjectionToken } from "../../../common/utils/resolve-system-proxy/resolve-system-proxy-injection-token";
-import requestFromChannelInjectable from "../channel/request-from-channel.injectable";
-import resolveSystemProxyChannelInjectable from "../../../common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable";
+import { resolveSystemProxyInjectionToken } from "../common/resolve-system-proxy-injection-token";
+import requestFromChannelInjectable from "../../../../renderer/utils/channel/request-from-channel.injectable";
+import resolveSystemProxyChannelInjectable from "../common/resolve-system-proxy-channel.injectable";
 
 const resolveSystemProxyInjectable = getInjectable({
   id: "resolve-system-proxy-for-renderer",
diff --git a/src/behaviours/resolve-system-proxy/resolve-system-proxy.test.ts b/src/behaviours/proxy/resolve-system-proxy/resolve-system-proxy.test.ts
similarity index 78%
rename from src/behaviours/resolve-system-proxy/resolve-system-proxy.test.ts
rename to src/behaviours/proxy/resolve-system-proxy/resolve-system-proxy.test.ts
index a78aa0dd68..c7023ba9d6 100644
--- a/src/behaviours/resolve-system-proxy/resolve-system-proxy.test.ts
+++ b/src/behaviours/proxy/resolve-system-proxy/resolve-system-proxy.test.ts
@@ -4,12 +4,12 @@
  */
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
-import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import type { ResolveSystemProxy } from "../../common/utils/resolve-system-proxy/resolve-system-proxy-injection-token";
-import { resolveSystemProxyInjectionToken } from "../../common/utils/resolve-system-proxy/resolve-system-proxy-injection-token";
-import resolveSystemProxyFromElectronInjectable from "../../main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.injectable";
-import { getPromiseStatus } from "../../common/test-utils/get-promise-status";
+import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
+import type { ResolveSystemProxy } from "./common/resolve-system-proxy-injection-token";
+import { resolveSystemProxyInjectionToken } from "./common/resolve-system-proxy-injection-token";
+import resolveSystemProxyFromElectronInjectable from "./main/resolve-system-proxy-from-electron.injectable";
+import { getPromiseStatus } from "../../../common/test-utils/get-promise-status";
 
 describe("resolve-system-proxy", () => {
   let applicationBuilder: ApplicationBuilder;
diff --git a/src/extensions/common-api/proxy.ts b/src/extensions/common-api/proxy.ts
index bf0cd8e626..d559e5961b 100644
--- a/src/extensions/common-api/proxy.ts
+++ b/src/extensions/common-api/proxy.ts
@@ -4,7 +4,7 @@
  */
 
 import { asLegacyGlobalFunctionForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api";
-import { resolveSystemProxyInjectionToken } from "../../common/utils/resolve-system-proxy/resolve-system-proxy-injection-token";
+import { resolveSystemProxyInjectionToken } from "../../behaviours/proxy/resolve-system-proxy/common/resolve-system-proxy-injection-token";
 
 /**
  * Resolves URL-specific proxy information from system. See more here: https://www.electronjs.org/docs/latest/api/session#sesresolveproxyurl
diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts
index 5d22057c06..6f8fc81a30 100644
--- a/src/main/getDiForUnitTesting.ts
+++ b/src/main/getDiForUnitTesting.ts
@@ -99,7 +99,7 @@ import rollbackHelmReleaseInjectable from "./helm/helm-service/rollback-helm-rel
 import updateHelmReleaseInjectable from "./helm/helm-service/update-helm-release.injectable";
 import waitUntilBundledExtensionsAreLoadedInjectable from "./start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable";
 import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
-import electronInjectable from "./utils/resolve-system-proxy/electron.injectable";
+import electronInjectable from "../behaviours/proxy/resolve-system-proxy/main/electron.injectable";
 
 export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) {
   const {