diff --git a/src/main/__test__/static-file-route.test.ts b/src/main/__test__/static-file-route.test.ts
index 85ea7e14c6..bd66b0b08d 100644
--- a/src/main/__test__/static-file-route.test.ts
+++ b/src/main/__test__/static-file-route.test.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { LensApiRequest, Route } from "../router";
+import type { LensApiRequest, Route } from "../router/router";
 import staticFileRouteInjectable from "../routes/static-file-route.injectable";
 import { getDiForUnitTesting } from "../getDiForUnitTesting";
 
diff --git a/src/main/lens-proxy.ts b/src/main/lens-proxy.ts
index 31d593d627..fb6d7fcc0f 100644
--- a/src/main/lens-proxy.ts
+++ b/src/main/lens-proxy.ts
@@ -8,7 +8,7 @@ import type http from "http";
 import spdy from "spdy";
 import type httpProxy from "http-proxy";
 import { apiPrefix, apiKubePrefix } from "../common/vars";
-import type { Router } from "./router";
+import type { Router } from "./router/router";
 import type { ContextHandler } from "./context-handler/context-handler";
 import logger from "./logger";
 import { Singleton } from "../common/utils";
@@ -84,7 +84,7 @@ export class LensProxy extends Singleton {
 
         if (!cluster) {
           logger.error(`[LENS-PROXY]: Could not find cluster for upgrade request from url=${req.url}`);
-          
+
           return socket.destroy();
         }
 
diff --git a/src/main/router-content-types.ts b/src/main/router/router-content-types.ts
similarity index 100%
rename from src/main/router-content-types.ts
rename to src/main/router/router-content-types.ts
diff --git a/src/main/router/router.injectable.ts b/src/main/router/router.injectable.ts
index 3d6845fca8..620ce4f2c4 100644
--- a/src/main/router/router.injectable.ts
+++ b/src/main/router/router.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable, getInjectionToken } from "@ogre-tools/injectable";
-import { Route, Router } from "../router";
+import { Route, Router } from "./router";
 import parseRequestInjectable from "./parse-request.injectable";
 
 export const routeInjectionToken = getInjectionToken<Route<any>>({
diff --git a/src/main/router.test.ts b/src/main/router/router.test.ts
similarity index 97%
rename from src/main/router.test.ts
rename to src/main/router/router.test.ts
index 18621b1764..96f0587163 100644
--- a/src/main/router.test.ts
+++ b/src/main/router/router.test.ts
@@ -3,15 +3,15 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import routerInjectable, { routeInjectionToken } from "./router/router.injectable";
-import { getDiForUnitTesting } from "./getDiForUnitTesting";
+import routerInjectable, { routeInjectionToken } from "./router.injectable";
+import { getDiForUnitTesting } from "../getDiForUnitTesting";
 import type { Router, RouteHandler, Route } from "./router";
-import type { Cluster } from "../common/cluster/cluster";
+import type { Cluster } from "../../common/cluster/cluster";
 import { Request } from "mock-http";
 import { getInjectable } from "@ogre-tools/injectable";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
-import parseRequestInjectable from "./router/parse-request.injectable";
+import parseRequestInjectable from "./parse-request.injectable";
 import { contentTypes } from "./router-content-types";
 import mockFs from "mock-fs";
 
diff --git a/src/main/router.ts b/src/main/router/router.ts
similarity index 98%
rename from src/main/router.ts
rename to src/main/router/router.ts
index bcdae79a04..ca5da23ce1 100644
--- a/src/main/router.ts
+++ b/src/main/router/router.ts
@@ -8,12 +8,12 @@ import type http from "http";
 import type httpProxy from "http-proxy";
 import { toPairs } from "lodash/fp";
 import path from "path";
-import type { Cluster } from "../common/cluster/cluster";
+import type { Cluster } from "../../common/cluster/cluster";
 import type { LensApiResultContentType } from "./router-content-types";
 import { contentTypes } from "./router-content-types";
 
 // TODO: Import causes side effect, sets value for __static
-import "../common/vars";
+import "../../common/vars";
 
 export interface RouterRequestOpts {
   req: http.IncomingMessage;
diff --git a/src/main/routes/helm/charts/get-chart-route.injectable.ts b/src/main/routes/helm/charts/get-chart-route.injectable.ts
index 6ea294a464..523be0e1a6 100644
--- a/src/main/routes/helm/charts/get-chart-route.injectable.ts
+++ b/src/main/routes/helm/charts/get-chart-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { routeInjectionToken } from "../../../router/router.injectable";
-import type { Route } from "../../../router";
+import type { Route } from "../../../router/router";
 import { helmService } from "../../../helm/helm-service";
 import { apiPrefix } from "../../../../common/vars";
 import type { RawHelmChart } from "../../../../common/k8s-api/endpoints/helm-charts.api";
diff --git a/src/main/routes/helm/charts/get-chart-values-route.injectable.ts b/src/main/routes/helm/charts/get-chart-values-route.injectable.ts
index ccb80c86df..4eeeb263ec 100644
--- a/src/main/routes/helm/charts/get-chart-values-route.injectable.ts
+++ b/src/main/routes/helm/charts/get-chart-values-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { routeInjectionToken } from "../../../router/router.injectable";
-import type { Route } from "../../../router";
+import type { Route } from "../../../router/router";
 import { helmService } from "../../../helm/helm-service";
 import { apiPrefix } from "../../../../common/vars";
 
diff --git a/src/main/routes/helm/charts/list-charts-route.injectable.ts b/src/main/routes/helm/charts/list-charts-route.injectable.ts
index 61c0813606..a1273ca7af 100644
--- a/src/main/routes/helm/charts/list-charts-route.injectable.ts
+++ b/src/main/routes/helm/charts/list-charts-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { routeInjectionToken } from "../../../router/router.injectable";
-import type { Route } from "../../../router";
+import type { Route } from "../../../router/router";
 import { helmService } from "../../../helm/helm-service";
 import { apiPrefix } from "../../../../common/vars";
 
diff --git a/src/main/routes/helm/releases/delete-release-route.injectable.ts b/src/main/routes/helm/releases/delete-release-route.injectable.ts
index a5ba23dcc1..6487cc7ce8 100644
--- a/src/main/routes/helm/releases/delete-release-route.injectable.ts
+++ b/src/main/routes/helm/releases/delete-release-route.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import type { Route } from "../../../router";
+import type { Route } from "../../../router/router";
 import { helmService } from "../../../helm/helm-service";
 import { routeInjectionToken } from "../../../router/router.injectable";
 import { getInjectable } from "@ogre-tools/injectable";
diff --git a/src/main/routes/helm/releases/get-release-history-route.injectable.ts b/src/main/routes/helm/releases/get-release-history-route.injectable.ts
index a7fa6f5a70..5ceadb2695 100644
--- a/src/main/routes/helm/releases/get-release-history-route.injectable.ts
+++ b/src/main/routes/helm/releases/get-release-history-route.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import type { Route } from "../../../router";
+import type { Route } from "../../../router/router";
 import { helmService } from "../../../helm/helm-service";
 import { routeInjectionToken } from "../../../router/router.injectable";
 import { getInjectable } from "@ogre-tools/injectable";
diff --git a/src/main/routes/helm/releases/get-release-route.injectable.ts b/src/main/routes/helm/releases/get-release-route.injectable.ts
index 18a613d032..e11ab64466 100644
--- a/src/main/routes/helm/releases/get-release-route.injectable.ts
+++ b/src/main/routes/helm/releases/get-release-route.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import type { Route } from "../../../router";
+import type { Route } from "../../../router/router";
 import { helmService } from "../../../helm/helm-service";
 import { routeInjectionToken } from "../../../router/router.injectable";
 import { getInjectable } from "@ogre-tools/injectable";
diff --git a/src/main/routes/helm/releases/get-release-values-route.injectable.ts b/src/main/routes/helm/releases/get-release-values-route.injectable.ts
index 0708cdbc5d..92227042e7 100644
--- a/src/main/routes/helm/releases/get-release-values-route.injectable.ts
+++ b/src/main/routes/helm/releases/get-release-values-route.injectable.ts
@@ -3,12 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import type { Route } from "../../../router";
+import type { Route } from "../../../router/router";
 import { helmService } from "../../../helm/helm-service";
 import { routeInjectionToken } from "../../../router/router.injectable";
 import { getInjectable } from "@ogre-tools/injectable";
 import { getBoolean } from "../../../utils/parse-query";
-import { contentTypes } from "../../../router-content-types";
+import { contentTypes } from "../../../router/router-content-types";
 
 const getReleaseRouteValuesInjectable = getInjectable({
   id: "get-release-values-route",
diff --git a/src/main/routes/helm/releases/install-chart-route.injectable.ts b/src/main/routes/helm/releases/install-chart-route.injectable.ts
index de0cef1876..879e39c4ac 100644
--- a/src/main/routes/helm/releases/install-chart-route.injectable.ts
+++ b/src/main/routes/helm/releases/install-chart-route.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import type { Route } from "../../../router";
+import type { Route } from "../../../router/router";
 import { helmService } from "../../../helm/helm-service";
 import { routeInjectionToken } from "../../../router/router.injectable";
 import { getInjectable } from "@ogre-tools/injectable";
diff --git a/src/main/routes/helm/releases/list-releases-route.injectable.ts b/src/main/routes/helm/releases/list-releases-route.injectable.ts
index 7b7cdbcb70..b73c618ff3 100644
--- a/src/main/routes/helm/releases/list-releases-route.injectable.ts
+++ b/src/main/routes/helm/releases/list-releases-route.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import type { Route } from "../../../router";
+import type { Route } from "../../../router/router";
 import { helmService } from "../../../helm/helm-service";
 import { routeInjectionToken } from "../../../router/router.injectable";
 import { getInjectable } from "@ogre-tools/injectable";
diff --git a/src/main/routes/helm/releases/rollback-release-route.injectable.ts b/src/main/routes/helm/releases/rollback-release-route.injectable.ts
index 6653c25632..1880dc7e1e 100644
--- a/src/main/routes/helm/releases/rollback-release-route.injectable.ts
+++ b/src/main/routes/helm/releases/rollback-release-route.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import type { Route } from "../../../router";
+import type { Route } from "../../../router/router";
 import { helmService } from "../../../helm/helm-service";
 import { routeInjectionToken } from "../../../router/router.injectable";
 import { getInjectable } from "@ogre-tools/injectable";
diff --git a/src/main/routes/helm/releases/update-release-route.injectable.ts b/src/main/routes/helm/releases/update-release-route.injectable.ts
index f9ae47a791..f97dc1a2ad 100644
--- a/src/main/routes/helm/releases/update-release-route.injectable.ts
+++ b/src/main/routes/helm/releases/update-release-route.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import type { Route } from "../../../router";
+import type { Route } from "../../../router/router";
 import { helmService } from "../../../helm/helm-service";
 import { routeInjectionToken } from "../../../router/router.injectable";
 import { getInjectable } from "@ogre-tools/injectable";
diff --git a/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts b/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts
index 5a8d86b292..c4eec032fe 100644
--- a/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts
+++ b/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts
@@ -5,7 +5,7 @@
 
 import { getInjectable } from "@ogre-tools/injectable";
 import { apiPrefix } from "../../../common/vars";
-import type { Route } from "../../router";
+import type { Route } from "../../router/router";
 import { routeInjectionToken } from "../../router/router.injectable";
 import type { Cluster } from "../../../common/cluster/cluster";
 import { CoreV1Api, V1Secret } from "@kubernetes/client-node";
diff --git a/src/main/routes/metrics/add-metrics-route.injectable.ts b/src/main/routes/metrics/add-metrics-route.injectable.ts
index add9f42083..4dc2158488 100644
--- a/src/main/routes/metrics/add-metrics-route.injectable.ts
+++ b/src/main/routes/metrics/add-metrics-route.injectable.ts
@@ -5,7 +5,7 @@
 
 import { getInjectable } from "@ogre-tools/injectable";
 import { apiPrefix } from "../../../common/vars";
-import type { LensApiRequest, Route } from "../../router";
+import type { LensApiRequest, Route } from "../../router/router";
 import { routeInjectionToken } from "../../router/router.injectable";
 import { ClusterMetadataKey, ClusterPrometheusMetadata } from "../../../common/cluster-types";
 import logger from "../../logger";
diff --git a/src/main/routes/metrics/get-metric-providers-route.injectable.ts b/src/main/routes/metrics/get-metric-providers-route.injectable.ts
index ad67d27065..8fcba9d984 100644
--- a/src/main/routes/metrics/get-metric-providers-route.injectable.ts
+++ b/src/main/routes/metrics/get-metric-providers-route.injectable.ts
@@ -5,7 +5,7 @@
 
 import { getInjectable } from "@ogre-tools/injectable";
 import { apiPrefix } from "../../../common/vars";
-import type { Route } from "../../router";
+import type { Route } from "../../router/router";
 import { routeInjectionToken } from "../../router/router.injectable";
 import { PrometheusProviderRegistry } from "../../prometheus";
 import type { MetricProviderInfo } from "../../../common/k8s-api/endpoints/metrics.api";
diff --git a/src/main/routes/port-forward/get-current-port-forward-route.injectable.ts b/src/main/routes/port-forward/get-current-port-forward-route.injectable.ts
index e0a571810b..a5b83edbf6 100644
--- a/src/main/routes/port-forward/get-current-port-forward-route.injectable.ts
+++ b/src/main/routes/port-forward/get-current-port-forward-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { routeInjectionToken } from "../../router/router.injectable";
-import type { LensApiRequest, Route } from "../../router";
+import type { LensApiRequest, Route } from "../../router/router";
 import { apiPrefix } from "../../../common/vars";
 import { PortForward } from "./functionality/port-forward";
 
diff --git a/src/main/routes/port-forward/start-port-forward-route.injectable.ts b/src/main/routes/port-forward/start-port-forward-route.injectable.ts
index 55c064b413..99f6624cd3 100644
--- a/src/main/routes/port-forward/start-port-forward-route.injectable.ts
+++ b/src/main/routes/port-forward/start-port-forward-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { routeInjectionToken } from "../../router/router.injectable";
-import type { LensApiRequest, Route } from "../../router";
+import type { LensApiRequest, Route } from "../../router/router";
 import { apiPrefix } from "../../../common/vars";
 import { PortForward, PortForwardArgs } from "./functionality/port-forward";
 import logger from "../../logger";
diff --git a/src/main/routes/port-forward/stop-current-port-forward-route.injectable.ts b/src/main/routes/port-forward/stop-current-port-forward-route.injectable.ts
index 4abe1dc046..b9fce502c1 100644
--- a/src/main/routes/port-forward/stop-current-port-forward-route.injectable.ts
+++ b/src/main/routes/port-forward/stop-current-port-forward-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { routeInjectionToken } from "../../router/router.injectable";
-import type { LensApiRequest, Route } from "../../router";
+import type { LensApiRequest, Route } from "../../router/router";
 import { apiPrefix } from "../../../common/vars";
 import { PortForward } from "./functionality/port-forward";
 import logger from "../../logger";
diff --git a/src/main/routes/resource-applier/apply-resource-route.injectable.ts b/src/main/routes/resource-applier/apply-resource-route.injectable.ts
index 9a3b200b16..b1db11cfa3 100644
--- a/src/main/routes/resource-applier/apply-resource-route.injectable.ts
+++ b/src/main/routes/resource-applier/apply-resource-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { routeInjectionToken } from "../../router/router.injectable";
-import type { Route } from "../../router";
+import type { Route } from "../../router/router";
 import { apiPrefix } from "../../../common/vars";
 import { ResourceApplier } from "../../resource-applier";
 
diff --git a/src/main/routes/resource-applier/patch-resource-route.injectable.ts b/src/main/routes/resource-applier/patch-resource-route.injectable.ts
index 23019fbb53..2ac26db726 100644
--- a/src/main/routes/resource-applier/patch-resource-route.injectable.ts
+++ b/src/main/routes/resource-applier/patch-resource-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { routeInjectionToken } from "../../router/router.injectable";
-import type { Route } from "../../router";
+import type { Route } from "../../router/router";
 import { apiPrefix } from "../../../common/vars";
 import { ResourceApplier } from "../../resource-applier";
 
diff --git a/src/main/routes/static-file-route.injectable.ts b/src/main/routes/static-file-route.injectable.ts
index 29af47c4dd..f35976f320 100644
--- a/src/main/routes/static-file-route.injectable.ts
+++ b/src/main/routes/static-file-route.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 { LensApiRequest, Route } from "../router";
-import { contentTypes, SupportedFileExtension } from "../router-content-types";
+import type { LensApiRequest, Route } from "../router/router";
+import { contentTypes, SupportedFileExtension } from "../router/router-content-types";
 import logger from "../logger";
 import { routeInjectionToken } from "../router/router.injectable";
 import { appName, publicPath } from "../../common/vars";
diff --git a/src/main/routes/versions/get-version-route.injectable.ts b/src/main/routes/versions/get-version-route.injectable.ts
index c0544c13e1..357c09f22d 100644
--- a/src/main/routes/versions/get-version-route.injectable.ts
+++ b/src/main/routes/versions/get-version-route.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 type { Route } from "../../router";
+import type { Route } from "../../router/router";
 import { routeInjectionToken } from "../../router/router.injectable";
 import { getAppVersion } from "../../../common/utils";