Simplify directory structures for runnables

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

src/main/app-paths/setup-app-paths.injectable.ts

@@ -15,9 +15,7 @@ import { pipeline } from "@ogre-tools/fp";
 import { appPathsIpcChannel } from "../../common/app-paths/app-path-injection-token";
 import registerChannelInjectable from "./register-channel/register-channel.injectable";
 import joinPathsInjectable from "../../common/path/join-paths.injectable";
-import {
+import { beforeElectronIsReadyInjectionToken } from "../start-main-application/runnable-tokens/before-electron-is-ready-injection-token";
-  beforeElectronIsReadyInjectionToken,
-} from "../start-main-application/before-electron-is-ready/before-electron-is-ready-injection-token";
 
 const setupAppPathsInjectable = getInjectable({
   id: "setup-app-paths",

src/main/catalog-sync-to-renderer/start-catalog-sync.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 { afterRootFrameIsReadyInjectionToken } from "../start-main-application/after-root-frame-is-ready/after-root-frame-is-ready-injection-token";
+import { afterRootFrameIsReadyInjectionToken } from "../start-main-application/runnable-tokens/after-root-frame-is-ready-injection-token";
 import catalogSyncToRendererInjectable from "./catalog-sync-to-renderer.injectable";
 
 const startCatalogSyncInjectable = getInjectable({

src/main/catalog-sync-to-renderer/stop-catalog-sync.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import catalogSyncToRendererInjectable from "./catalog-sync-to-renderer.injectable";
-import { beforeQuitOfFrontEndInjectionToken } from "../start-main-application/before-quit-of-front-end/before-quit-of-front-end-injection-token";
+import { beforeQuitOfFrontEndInjectionToken } from "../start-main-application/runnable-tokens/before-quit-of-front-end-injection-token";
 
 const stopCatalogSyncInjectable = getInjectable({
   id: "stop-catalog-sync",

src/main/electron-app/runnables/clean-up-deep-linking.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 { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/before-quit-of-back-end/before-quit-of-back-end-injection-token";
+import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
 import lensProtocolRouterMainInjectable from "../../protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable";
 
 const cleanUpDeepLinkingInjectable = getInjectable({

src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.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 { beforeQuitOfFrontEndInjectionToken } from "../../start-main-application/before-quit-of-front-end/before-quit-of-front-end-injection-token";
+import { beforeQuitOfFrontEndInjectionToken } from "../../../start-main-application/runnable-tokens/before-quit-of-front-end-injection-token";
-import electronAppInjectable from "../electron-app.injectable";
+import electronAppInjectable from "../../electron-app.injectable";
-import { lensWindowInjectionToken } from "../../start-main-application/lens-window/application-window/lens-window-injection-token";
+import { lensWindowInjectionToken } from "../../../start-main-application/lens-window/application-window/lens-window-injection-token";
 import { pipeline } from "@ogre-tools/fp";
 import { filter, isEmpty } from "lodash/fp";
 

src/main/electron-app/runnables/dock-visibility/show-dock-for-first-opened-window.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 electronAppInjectable from "../electron-app.injectable";
+import electronAppInjectable from "../../electron-app.injectable";
-import { afterWindowIsOpenedInjectionToken } from "../../start-main-application/after-window-is-opened/after-window-is-opened-injection-token";
+import { afterWindowIsOpenedInjectionToken } from "../../../start-main-application/runnable-tokens/after-window-is-opened-injection-token";
 
 const showDockForFirstOpenedWindowInjectable = getInjectable({
   id: "show-dock-for-first-opened-window",

src/main/electron-app/runnables/enforce-single-application-instance.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 { beforeElectronIsReadyInjectionToken } from "../../start-main-application/before-electron-is-ready/before-electron-is-ready-injection-token";
+import { beforeElectronIsReadyInjectionToken } from "../../start-main-application/runnable-tokens/before-electron-is-ready-injection-token";
 import requestSingleInstanceLockInjectable from "../features/request-single-instance-lock.injectable";
 import exitAppInjectable from "../features/exit-app.injectable";
 

src/main/electron-app/runnables/setup-application-name.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import appNameInjectable from "../../app-paths/app-name/app-name.injectable";
-import { beforeElectronIsReadyInjectionToken } from "../../start-main-application/before-electron-is-ready/before-electron-is-ready-injection-token";
+import { beforeElectronIsReadyInjectionToken } from "../../start-main-application/runnable-tokens/before-electron-is-ready-injection-token";
 import electronAppInjectable from "../electron-app.injectable";
 
 const setupApplicationNameInjectable = getInjectable({

src/main/electron-app/runnables/setup-deep-linking.injectable.ts

@@ -9,9 +9,8 @@ import loggerInjectable from "../../../common/logger.injectable";
 import commandLineArgumentsInjectable from "../../utils/command-line-arguments.injectable";
 import { pipeline } from "@ogre-tools/fp";
 import { find, startsWith, toLower, map } from "lodash/fp";
-import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/when-application-is-loading/when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/when-application-is-loading-injection-token";
-import showApplicationWindowInjectable
+import showApplicationWindowInjectable from "../../start-main-application/lens-window/show-application-window.injectable";
-  from "../../start-main-application/lens-window/show-application-window.injectable";
 
 const setupDeepLinkingInjectable = getInjectable({
   id: "setup-deep-linking",

src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import loggerInjectable from "../../../common/logger.injectable";
-import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/when-application-is-loading/when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/when-application-is-loading-injection-token";
 
 const setupDeveloperToolsInDevelopmentEnvironmentInjectable = getInjectable({
   id: "setup-developer-tools-in-development-environment",

src/main/electron-app/runnables/setup-device-shutdown.injectable.ts

@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import powerMonitorInjectable from "../features/power-monitor.injectable";
 import exitAppInjectable from "../features/exit-app.injectable";
-import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/when-application-is-loading/when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/when-application-is-loading-injection-token";
 
 const setupDeviceShutdownInjectable = getInjectable({
   id: "setup-device-shutdown",

src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts

@@ -11,7 +11,7 @@ import applicationMenuItemsInjectable from "../../../menu/application-menu-items
 import getAbsolutePathInjectable from "../../../../common/path/get-absolute-path.injectable";
 import catalogEntityRegistryInjectable from "../../../catalog/catalog-entity-registry.injectable";
 import clusterStoreInjectable from "../../../../common/cluster-store/cluster-store.injectable";
-import { whenApplicationIsLoadingInjectionToken } from "../../../start-main-application/when-application-is-loading/when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../../../start-main-application/runnable-tokens/when-application-is-loading-injection-token";
 
 const setupIpcMainHandlersInjectable = getInjectable({
   id: "setup-ipc-main-handlers",

src/main/electron-app/runnables/setup-main-window-visibility-after-activation.injectable.ts

@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import electronAppInjectable from "../electron-app.injectable";
 import loggerInjectable from "../../../common/logger.injectable";
-import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/when-application-is-loading/when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/when-application-is-loading-injection-token";
 import showApplicationWindowInjectable from "../../start-main-application/lens-window/show-application-window.injectable";
 
 const setupMainWindowVisibilityAfterActivationInjectable = getInjectable({

src/main/electron-app/runnables/setup-os-theme-updates.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { broadcastNativeThemeOnUpdate } from "../../native-theme";
-import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/when-application-is-loading/when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/when-application-is-loading-injection-token";
 
 const setupOsThemeUpdatesInjectable = getInjectable({
   id: "setup-os-theme-updates",

src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts

@@ -3,10 +3,10 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { beforeElectronIsReadyInjectionToken } from "../../start-main-application/before-electron-is-ready/before-electron-is-ready-injection-token";
+import { beforeElectronIsReadyInjectionToken } from "../../start-main-application/runnable-tokens/before-electron-is-ready-injection-token";
 import electronAppInjectable from "../electron-app.injectable";
 import { runManyFor } from "../../../common/runnable/run-many-for";
-import { afterWindowIsOpenedInjectionToken } from "../../start-main-application/after-window-is-opened/after-window-is-opened-injection-token";
+import { afterWindowIsOpenedInjectionToken } from "../../start-main-application/runnable-tokens/after-window-is-opened-injection-token";
 
 const setupRunnablesAfterWindowIsOpenedInjectable = getInjectable({
   id: "setup-runnables-after-window-is-opened",

src/main/electron-app/runnables/setup-runnables-before-closing-of-application.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 { beforeElectronIsReadyInjectionToken } from "../../start-main-application/before-electron-is-ready/before-electron-is-ready-injection-token";
+import { beforeElectronIsReadyInjectionToken } from "../../start-main-application/runnable-tokens/before-electron-is-ready-injection-token";
-import { beforeQuitOfFrontEndInjectionToken } from "../../start-main-application/before-quit-of-front-end/before-quit-of-front-end-injection-token";
+import { beforeQuitOfFrontEndInjectionToken } from "../../start-main-application/runnable-tokens/before-quit-of-front-end-injection-token";
-import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/before-quit-of-back-end/before-quit-of-back-end-injection-token";
+import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
 import electronAppInjectable from "../electron-app.injectable";
 import isIntegrationTestingInjectable from "../../../common/vars/is-integration-testing.injectable";
 import autoUpdaterInjectable from "../features/auto-updater.injectable";

src/main/electron-app/runnables/setup-update-checking.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 { afterRootFrameIsReadyInjectionToken } from "../../start-main-application/after-root-frame-is-ready/after-root-frame-is-ready-injection-token";
+import { afterRootFrameIsReadyInjectionToken } from "../../start-main-application/runnable-tokens/after-root-frame-is-ready-injection-token";
 import { startUpdateChecking } from "../../app-updater";
 import isAutoUpdateEnabledInjectable from "../../is-auto-update-enabled.injectable";
 

src/main/getDiForUnitTesting.ts

@@ -38,25 +38,25 @@ import appEventBusInjectable from "../common/app-event-bus/app-event-bus.injecta
 import { EventEmitter } from "../common/event-emitter";
 import type { AppEvent } from "../common/app-event-bus/event-bus";
 import commandLineArgumentsInjectable from "./utils/command-line-arguments.injectable";
-import initializeExtensionsInjectable from "./start-main-application/when-application-is-loading/implementations/initialize-extensions.injectable";
+import initializeExtensionsInjectable from "./start-main-application/runnables/initialize-extensions.injectable";
 import lensResourcesDirInjectable from "../common/vars/lens-resources-dir.injectable";
 import registerFileProtocolInjectable from "./electron-app/features/register-file-protocol.injectable";
 import environmentVariablesInjectable from "../common/utils/environment-variables.injectable";
 import { CatalogCategoryRegistry } from "../common/catalog";
 import catalogCategoryRegistryInjectable from "../common/catalog/catalog-category-registry.injectable";
-import setupIpcMainHandlersInjectable from "./electron-app/after-application-is-ready/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable";
+import setupIpcMainHandlersInjectable from "./electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable";
-import setupLensProxyInjectable from "./start-main-application/before-application-is-loading/implementations/setup-lens-proxy.injectable";
+import setupLensProxyInjectable from "./start-main-application/runnables/setup-lens-proxy.injectable";
-import setupRunnablesForAfterRootFrameIsReadyInjectable from "./start-main-application/when-application-is-loading/implementations/setup-runnables-for-after-root-frame-is-ready.injectable";
+import setupRunnablesForAfterRootFrameIsReadyInjectable from "./start-main-application/runnables/setup-runnables-for-after-root-frame-is-ready.injectable";
-import setupOsThemeUpdatesInjectable from "./electron-app/after-application-is-ready/setup-os-theme-updates.injectable";
+import setupOsThemeUpdatesInjectable from "./electron-app/runnables/setup-os-theme-updates.injectable";
-import setupSentryInjectable from "./start-main-application/when-application-is-loading/implementations/setup-sentry.injectable";
+import setupSentryInjectable from "./start-main-application/runnables/setup-sentry.injectable";
-import setupShellInjectable from "./start-main-application/when-application-is-loading/implementations/setup-shell.injectable";
+import setupShellInjectable from "./start-main-application/runnables/setup-shell.injectable";
-import setupSyncingOfWeblinksInjectable from "./start-main-application/when-application-is-loading/implementations/setup-syncing-of-weblinks.injectable";
+import setupSyncingOfWeblinksInjectable from "./start-main-application/runnables/setup-syncing-of-weblinks.injectable";
 import stopServicesAndExitAppInjectable from "./stop-services-and-exit-app.injectable";
 import trayInjectable from "./tray/tray.injectable";
 import applicationMenuInjectable from "./menu/application-menu.injectable";
 import isDevelopmentInjectable from "../common/vars/is-development.injectable";
-import setupSystemCaInjectable from "./start-main-application/before-application-is-loading/implementations/setup-system-ca.injectable";
+import setupSystemCaInjectable from "./start-main-application/runnables/setup-system-ca.injectable";
-import setupDeepLinkingInjectable from "./electron-app/after-application-is-ready/setup-deep-linking.injectable";
+import setupDeepLinkingInjectable from "./electron-app/runnables/setup-deep-linking.injectable";
 import exitAppInjectable from "./electron-app/features/exit-app.injectable";
 import getCommandLineSwitchInjectable from "./electron-app/features/get-command-line-switch.injectable";
 import requestSingleInstanceLockInjectable from "./electron-app/features/request-single-instance-lock.injectable";
@@ -64,10 +64,10 @@ import disableHardwareAccelerationInjectable from "./electron-app/features/disab
 import shouldStartHiddenInjectable from "./electron-app/features/should-start-hidden.injectable";
 import getElectronAppPathInjectable from "./app-paths/get-electron-app-path/get-electron-app-path.injectable";
 import setElectronAppPathInjectable from "./app-paths/set-electron-app-path/set-electron-app-path.injectable";
-import setupMainWindowVisibilityAfterActivationInjectable from "./electron-app/after-application-is-ready/setup-main-window-visibility-after-activation.injectable";
+import setupMainWindowVisibilityAfterActivationInjectable from "./electron-app/runnables/setup-main-window-visibility-after-activation.injectable";
-import setupDeviceShutdownInjectable from "./electron-app/after-application-is-ready/setup-device-shutdown.injectable";
+import setupDeviceShutdownInjectable from "./electron-app/runnables/setup-device-shutdown.injectable";
-import setupApplicationNameInjectable from "./electron-app/before-application-is-ready/setup-application-name.injectable";
+import setupApplicationNameInjectable from "./electron-app/runnables/setup-application-name.injectable";
-import setupRunnablesBeforeClosingOfApplicationInjectable from "./electron-app/before-application-is-ready/setup-runnables-before-closing-of-application.injectable";
+import setupRunnablesBeforeClosingOfApplicationInjectable from "./electron-app/runnables/setup-runnables-before-closing-of-application.injectable";
 import showMessagePopupInjectable from "./electron-app/features/show-message-popup.injectable";
 import clusterFramesInjectable from "../common/cluster-frames.injectable";
 import type { ClusterFrameInfo } from "../common/cluster-frames";
@@ -82,7 +82,7 @@ import ipcMainInjectable from "./app-paths/register-channel/ipc-main/ipc-main.in
 import createElectronWindowForInjectable
   from "./start-main-application/lens-window/application-window/create-electron-window-for.injectable";
 import setupRunnablesAfterWindowIsOpenedInjectable
-  from "./electron-app/before-application-is-ready/setup-runnables-after-window-is-opened.injectable";
+  from "./electron-app/runnables/setup-runnables-after-window-is-opened.injectable";
 import sendToChannelInElectronBrowserWindowInjectable
   from "./start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable";
 

src/main/menu/start-application-menu.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import applicationMenuInjectable from "./application-menu.injectable";
-import { whenApplicationIsLoadingInjectionToken } from "../start-main-application/when-application-is-loading/when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../start-main-application/runnable-tokens/when-application-is-loading-injection-token";
 
 const startApplicationMenuInjectable = getInjectable({
   id: "start-application-menu",

src/main/menu/stop-application-menu.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import applicationMenuInjectable from "./application-menu.injectable";
-import { beforeQuitOfBackEndInjectionToken } from "../start-main-application/before-quit-of-back-end/before-quit-of-back-end-injection-token";
+import { beforeQuitOfBackEndInjectionToken } from "../start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
 
 const stopApplicationMenuInjectable = getInjectable({
   id: "stop-application-menu",

src/main/start-main-application/lens-window/current-cluster-frame/setup-listener-for-current-cluster-frame.injectable.ts

@@ -7,7 +7,7 @@ import { IpcRendererNavigationEvents } from "../../../../renderer/navigation/eve
 import type { ClusterId } from "../../../../common/cluster-types";
 
 import { getInjectable } from "@ogre-tools/injectable";
-import { whenApplicationIsLoadingInjectionToken } from "../../when-application-is-loading/when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../../runnable-tokens/when-application-is-loading-injection-token";
 import currentClusterFrameClusterIdStateInjectable from "./current-cluster-frame-cluster-id-state.injectable";
 
 const setupListenerForCurrentClusterFrameInjectable = getInjectable({

src/main/start-main-application/runnables/clean-up-shell-sessions.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 { beforeQuitOfBackEndInjectionToken } from "../before-quit-of-back-end-injection-token";
+import { beforeQuitOfBackEndInjectionToken } from "../runnable-tokens/before-quit-of-back-end-injection-token";
-import { ShellSession } from "../../../shell-session/shell-session";
+import { ShellSession } from "../../shell-session/shell-session";
 
 const cleanUpShellSessionsInjectable = getInjectable({
   id: "clean-up-shell-sessions",

src/main/start-main-application/runnables/emit-close-to-command-bus.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 appEventBusInjectable from "../../../../common/app-event-bus/app-event-bus.injectable";
+import appEventBusInjectable from "../../../common/app-event-bus/app-event-bus.injectable";
-import { beforeQuitOfFrontEndInjectionToken } from "../before-quit-of-front-end-injection-token";
+import { beforeQuitOfFrontEndInjectionToken } from "../runnable-tokens/before-quit-of-front-end-injection-token";
 
 const emitCloseToCommandBusInjectable = getInjectable({
   id: "emit-close-to-command-bus",

src/main/start-main-application/runnables/emit-service-start-to-command-bus.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 appEventBusInjectable from "../../../../common/app-event-bus/app-event-bus.injectable";
+import appEventBusInjectable from "../../../common/app-event-bus/app-event-bus.injectable";
-import { afterApplicationIsLoadedInjectionToken } from "../after-application-is-loaded-injection-token";
+import { afterApplicationIsLoadedInjectionToken } from "../runnable-tokens/after-application-is-loaded-injection-token";
 
 const emitServiceStartToCommandBusInjectable = getInjectable({
   id: "emit-service-start-to-command-bus",

src/main/start-main-application/runnables/flag-renderer/flag-renderer-as-loaded.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 { afterRootFrameIsReadyInjectionToken } from "../after-root-frame-is-ready-injection-token";
+import { afterRootFrameIsReadyInjectionToken } from "../../runnable-tokens/after-root-frame-is-ready-injection-token";
 import lensProtocolRouterMainInjectable from "../../../protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable";
 import { runInAction } from "mobx";
 

src/main/start-main-application/runnables/flag-renderer/flag-renderer-as-not-loaded.injectable.ts

@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { runInAction } from "mobx";
 import lensProtocolRouterMainInjectable  from "../../../protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable";
-import { beforeQuitOfFrontEndInjectionToken } from "../before-quit-of-front-end-injection-token";
+import { beforeQuitOfFrontEndInjectionToken } from "../../runnable-tokens/before-quit-of-front-end-injection-token";
 
 const flagRendererAsNotLoadedInjectable = getInjectable({
   id: "stop-deep-linking",

src/main/start-main-application/runnables/initialize-extensions.injectable.ts

@@ -3,13 +3,13 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type { InstalledExtension } from "../../../../extensions/extension-discovery/extension-discovery";
+import type { InstalledExtension } from "../../../extensions/extension-discovery/extension-discovery";
-import type { LensExtensionId } from "../../../../extensions/lens-extension";
+import type { LensExtensionId } from "../../../extensions/lens-extension";
-import loggerInjectable from "../../../../common/logger.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
-import extensionDiscoveryInjectable from "../../../../extensions/extension-discovery/extension-discovery.injectable";
+import extensionDiscoveryInjectable from "../../../extensions/extension-discovery/extension-discovery.injectable";
-import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
+import extensionLoaderInjectable from "../../../extensions/extension-loader/extension-loader.injectable";
-import showErrorPopupInjectable from "../../../electron-app/features/show-error-popup.injectable";
+import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable";
-import { whenApplicationIsLoadingInjectionToken } from "../when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token";
 
 const initializeExtensionsInjectable = getInjectable({
   id: "initialize-extensions",

src/main/start-main-application/runnables/kube-config-sync/start-kube-config-sync.injectable.ts

@@ -3,12 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { afterRootFrameIsReadyInjectionToken } from "../after-root-frame-is-ready-injection-token";
+import { afterRootFrameIsReadyInjectionToken } from "../../runnable-tokens/after-root-frame-is-ready-injection-token";
 import directoryForKubeConfigsInjectable from "../../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
 import kubeconfigSyncManagerInjectable from "../../../catalog-sources/kubeconfig-sync-manager/kubeconfig-sync-manager.injectable";
 import ensureDirInjectable from "../../../../common/fs/ensure-dir.injectable";
 
-const startKubeconfigSyncInjectable = getInjectable({
+const startKubeConfigSyncInjectable = getInjectable({
   id: "start-kubeconfig-sync",
 
   instantiate: (di) => {
@@ -28,4 +28,4 @@ const startKubeconfigSyncInjectable = getInjectable({
   injectionToken: afterRootFrameIsReadyInjectionToken,
 });
 
-export default startKubeconfigSyncInjectable;
+export default startKubeConfigSyncInjectable;

src/main/start-main-application/runnables/kube-config-sync/stop-kube-config-sync.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import kubeconfigSyncManagerInjectable from "../../../catalog-sources/kubeconfig-sync-manager/kubeconfig-sync-manager.injectable";
-import { beforeQuitOfFrontEndInjectionToken } from "../before-quit-of-front-end-injection-token";
+import { beforeQuitOfFrontEndInjectionToken } from "../../runnable-tokens/before-quit-of-front-end-injection-token";
 
 const stopKubeConfigSyncInjectable = getInjectable({
   id: "stop-kube-config-sync",

src/main/start-main-application/runnables/setup-detector-registry.injectable.ts

@@ -3,13 +3,13 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { ClusterIdDetector } from "../../../cluster-detectors/cluster-id-detector";
+import { ClusterIdDetector } from "../../cluster-detectors/cluster-id-detector";
-import { LastSeenDetector } from "../../../cluster-detectors/last-seen-detector";
+import { LastSeenDetector } from "../../cluster-detectors/last-seen-detector";
-import { VersionDetector } from "../../../cluster-detectors/version-detector";
+import { VersionDetector } from "../../cluster-detectors/version-detector";
-import { DistributionDetector } from "../../../cluster-detectors/distribution-detector";
+import { DistributionDetector } from "../../cluster-detectors/distribution-detector";
-import { NodesCountDetector } from "../../../cluster-detectors/nodes-count-detector";
+import { NodesCountDetector } from "../../cluster-detectors/nodes-count-detector";
-import detectorRegistryInjectable from "../../../cluster-detectors/detector-registry.injectable";
+import detectorRegistryInjectable from "../../cluster-detectors/detector-registry.injectable";
-import { whenApplicationIsLoadingInjectionToken } from "../when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token";
 
 const setupDetectorRegistryInjectable = getInjectable({
   id: "setup-detector-registry",

src/main/start-main-application/runnables/setup-file-protocol.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 registerFileProtocolInjectable from "../../../electron-app/features/register-file-protocol.injectable";
+import registerFileProtocolInjectable from "../../electron-app/features/register-file-protocol.injectable";
-import staticFilesDirectoryInjectable from "../../../../common/vars/static-files-directory.injectable";
+import staticFilesDirectoryInjectable from "../../../common/vars/static-files-directory.injectable";
-import { beforeApplicationIsLoadingInjectionToken } from "../before-application-is-loading-injection-token";
+import { beforeApplicationIsLoadingInjectionToken } from "../runnable-tokens/before-application-is-loading-injection-token";
 
 const setupFileProtocolInjectable = getInjectable({
   id: "setup-file-protocol",

src/main/start-main-application/runnables/setup-hardware-acceleration.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 environmentVariablesInjectable from "../../../../common/utils/environment-variables.injectable";
+import environmentVariablesInjectable from "../../../common/utils/environment-variables.injectable";
-import disableHardwareAccelerationInjectable from "../../../electron-app/features/disable-hardware-acceleration.injectable";
+import disableHardwareAccelerationInjectable from "../../electron-app/features/disable-hardware-acceleration.injectable";
-import { beforeElectronIsReadyInjectionToken } from "../before-electron-is-ready-injection-token";
+import { beforeElectronIsReadyInjectionToken } from "../runnable-tokens/before-electron-is-ready-injection-token";
 
 const setupHardwareAccelerationInjectable = getInjectable({
   id: "setup-hardware-acceleration",

src/main/start-main-application/runnables/setup-hotbar-store.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 hotbarStoreInjectable from "../../../../common/hotbar-store.injectable";
+import hotbarStoreInjectable from "../../../common/hotbar-store.injectable";
 import setupSyncingOfGeneralCatalogEntitiesInjectable from "./setup-syncing-of-general-catalog-entities.injectable";
-import { whenApplicationIsLoadingInjectionToken } from "../when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token";
 
 const setupHotbarStoreInjectable = getInjectable({
   id: "setup-hotbar-store",

src/main/start-main-application/runnables/setup-immer.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import * as Immer from "immer";
-import { beforeElectronIsReadyInjectionToken } from "../before-electron-is-ready-injection-token";
+import { beforeElectronIsReadyInjectionToken } from "../runnable-tokens/before-electron-is-ready-injection-token";
 
 const setupImmerInjectable = getInjectable({
   id: "setup-immer",

src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts

@@ -3,17 +3,14 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import {
+import { getAppVersion, getAppVersionFromProxyServer } from "../../../common/utils";
-  getAppVersion,
+import exitAppInjectable from "../../electron-app/features/exit-app.injectable";
-  getAppVersionFromProxyServer,
+import lensProxyInjectable from "../../lens-proxy.injectable";
-} from "../../../../common/utils";
+import loggerInjectable from "../../../common/logger.injectable";
-import exitAppInjectable from "../../../electron-app/features/exit-app.injectable";
+import lensProxyPortNumberStateInjectable from "../../lens-proxy-port-number-state.injectable";
-import lensProxyInjectable from "../../../lens-proxy.injectable";
+import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
-import loggerInjectable from "../../../../common/logger.injectable";
+import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable";
-import lensProxyPortNumberStateInjectable from "../../../lens-proxy-port-number-state.injectable";
+import { beforeApplicationIsLoadingInjectionToken } from "../runnable-tokens/before-application-is-loading-injection-token";
-import isWindowsInjectable from "../../../../common/vars/is-windows.injectable";
-import showErrorPopupInjectable from "../../../electron-app/features/show-error-popup.injectable";
-import { beforeApplicationIsLoadingInjectionToken } from "../before-application-is-loading-injection-token";
 
 const setupLensProxyInjectable = getInjectable({
   id: "setup-lens-proxy",

src/main/start-main-application/runnables/setup-mobx.injectable.ts

@@ -4,7 +4,7 @@
  */
 import * as Mobx from "mobx";
 import { getInjectable } from "@ogre-tools/injectable";
-import { beforeElectronIsReadyInjectionToken } from "../before-electron-is-ready-injection-token";
+import { beforeElectronIsReadyInjectionToken } from "../runnable-tokens/before-electron-is-ready-injection-token";
 
 const setupMobxInjectable = getInjectable({
   id: "setup-mobx",

src/main/start-main-application/runnables/setup-prometheus-registry.injectable.ts

@@ -3,12 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { PrometheusLens } from "../../../prometheus/lens";
+import { PrometheusLens } from "../../prometheus/lens";
-import { PrometheusHelm } from "../../../prometheus/helm";
+import { PrometheusHelm } from "../../prometheus/helm";
-import { PrometheusOperator } from "../../../prometheus/operator";
+import { PrometheusOperator } from "../../prometheus/operator";
-import { PrometheusStacklight } from "../../../prometheus/stacklight";
+import { PrometheusStacklight } from "../../prometheus/stacklight";
-import prometheusProviderRegistryInjectable from "../../../prometheus/prometheus-provider-registry.injectable";
+import prometheusProviderRegistryInjectable from "../../prometheus/prometheus-provider-registry.injectable";
-import { whenApplicationIsLoadingInjectionToken } from "../when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token";
 
 const setupPrometheusRegistryInjectable = getInjectable({
   id: "setup-prometheus-registry",

src/main/start-main-application/runnables/setup-proxy-env.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 { beforeElectronIsReadyInjectionToken } from "../before-electron-is-ready-injection-token";
+import { beforeElectronIsReadyInjectionToken } from "../runnable-tokens/before-electron-is-ready-injection-token";
-import getCommandLineSwitchInjectable from "../../../electron-app/features/get-command-line-switch.injectable";
+import getCommandLineSwitchInjectable from "../../electron-app/features/get-command-line-switch.injectable";
 
 const setupProxyEnvInjectable = getInjectable({
   id: "setup-proxy-env",

src/main/start-main-application/runnables/setup-reactions-in-user-store.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 userStoreInjectable from "../../../../common/user-store/user-store.injectable";
+import userStoreInjectable from "../../../common/user-store/user-store.injectable";
-import { whenApplicationIsLoadingInjectionToken } from "../when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token";
 
 const setupReactionsInUserStoreInjectable = getInjectable({
   id: "setup-reactions-in-user-store",

src/main/start-main-application/runnables/setup-runnables-for-after-root-frame-is-ready.injectable.ts

@@ -3,11 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { ipcMainOn } from "../../../../common/ipc";
+import { ipcMainOn } from "../../../common/ipc";
-import { IpcRendererNavigationEvents } from "../../../../renderer/navigation/events";
+import { IpcRendererNavigationEvents } from "../../../renderer/navigation/events";
-import { afterRootFrameIsReadyInjectionToken } from "../../after-root-frame-is-ready/after-root-frame-is-ready-injection-token";
+import { afterRootFrameIsReadyInjectionToken } from "../runnable-tokens/after-root-frame-is-ready-injection-token";
-import { runManyFor } from "../../../../common/runnable/run-many-for";
+import { runManyFor } from "../../../common/runnable/run-many-for";
-import { whenApplicationIsLoadingInjectionToken } from "../when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token";
 
 const setupRunnablesForAfterRootFrameIsReadyInjectable = getInjectable({
   id: "setup-runnables-for-after-root-frame-is-ready",

src/main/start-main-application/runnables/setup-sentry.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 { initializeSentryReporting } from "../../../../common/sentry";
+import { initializeSentryReporting } from "../../../common/sentry";
 import { init } from "@sentry/electron/main";
-import { whenApplicationIsLoadingInjectionToken } from "../when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token";
 
 const setupSentryInjectable = getInjectable({
   id: "setup-sentry",

src/main/start-main-application/runnables/setup-shell.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 { shellSync } from "../../../shell-sync";
+import { shellSync } from "../../shell-sync";
-import loggerInjectable from "../../../../common/logger.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
-import { whenApplicationIsLoadingInjectionToken } from "../when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token";
 
 const setupShellInjectable = getInjectable({
   id: "setup-shell",

src/main/start-main-application/runnables/setup-syncing-of-general-catalog-entities.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 syncGeneralCatalogEntitiesInjectable from "../../../catalog-sources/sync-general-catalog-entities.injectable";
+import syncGeneralCatalogEntitiesInjectable from "../../catalog-sources/sync-general-catalog-entities.injectable";
-import { whenApplicationIsLoadingInjectionToken } from "../when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token";
 
 const setupSyncingOfGeneralCatalogEntitiesInjectable = getInjectable({
   id: "setup-syncing-of-general-catalog-entities",

src/main/start-main-application/runnables/setup-syncing-of-weblinks.injectable.ts

@@ -3,10 +3,10 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { syncWeblinks } from "../../../catalog-sources";
+import { syncWeblinks } from "../../catalog-sources";
-import weblinkStoreInjectable from "../../../../common/weblink-store.injectable";
+import weblinkStoreInjectable from "../../../common/weblink-store.injectable";
-import catalogEntityRegistryInjectable from "../../../catalog/catalog-entity-registry.injectable";
+import catalogEntityRegistryInjectable from "../../catalog/catalog-entity-registry.injectable";
-import { whenApplicationIsLoadingInjectionToken } from "../when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token";
 
 const setupSyncingOfWeblinksInjectable = getInjectable({
   id: "setup-syncing-of-weblinks",

src/main/start-main-application/runnables/setup-system-ca.injectable.ts

@@ -2,9 +2,9 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { injectSystemCAs } from "../../../../common/system-ca";
+import { injectSystemCAs } from "../../../common/system-ca";
 import { getInjectable } from "@ogre-tools/injectable";
-import { beforeApplicationIsLoadingInjectionToken } from "../before-application-is-loading-injection-token";
+import { beforeApplicationIsLoadingInjectionToken } from "../runnable-tokens/before-application-is-loading-injection-token";
 
 const setupSystemCaInjectable = getInjectable({
   id: "setup-system-ca",

src/main/start-main-application/runnables/stop-cluster-manager.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 clusterManagerInjectable from "../../../cluster-manager.injectable";
+import clusterManagerInjectable from "../../cluster-manager.injectable";
-import { beforeQuitOfFrontEndInjectionToken } from "../before-quit-of-front-end-injection-token";
+import { beforeQuitOfFrontEndInjectionToken } from "../runnable-tokens/before-quit-of-front-end-injection-token";
 
 const stopClusterManagerInjectable = getInjectable({
   id: "stop-cluster-manager",

src/main/start-main-application/start-main-application.injectable.ts

@@ -6,10 +6,10 @@ import { getInjectable } from "@ogre-tools/injectable";
 
 import { runManyFor } from "../../common/runnable/run-many-for";
 import { runManySyncFor } from "../../common/runnable/run-many-sync-for";
-import { beforeElectronIsReadyInjectionToken } from "./before-electron-is-ready/before-electron-is-ready-injection-token";
+import { beforeElectronIsReadyInjectionToken } from "./runnable-tokens/before-electron-is-ready-injection-token";
-import { beforeApplicationIsLoadingInjectionToken } from "./before-application-is-loading/before-application-is-loading-injection-token";
+import { beforeApplicationIsLoadingInjectionToken } from "./runnable-tokens/before-application-is-loading-injection-token";
-import { whenApplicationIsLoadingInjectionToken } from "./when-application-is-loading/when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "./runnable-tokens/when-application-is-loading-injection-token";
-import { afterApplicationIsLoadedInjectionToken } from "./after-application-is-loaded/after-application-is-loaded-injection-token";
+import { afterApplicationIsLoadedInjectionToken } from "./runnable-tokens/after-application-is-loaded-injection-token";
 import applicationIsLoadingWindowInjectable from "./lens-window/application-is-loading-window/application-is-loading-window.injectable";
 
 import applicationWindowInjectable from "./lens-window/application-window/application-window.injectable";

src/main/tray/start-tray.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import trayInjectable from "./tray.injectable";
-import { whenApplicationIsLoadingInjectionToken } from "../start-main-application/when-application-is-loading/when-application-is-loading-injection-token";
+import { whenApplicationIsLoadingInjectionToken } from "../start-main-application/runnable-tokens/when-application-is-loading-injection-token";
 
 const startTrayInjectable = getInjectable({
   id: "start-tray",

src/main/tray/stop-tray.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import trayInjectable from "./tray.injectable";
-import { beforeQuitOfBackEndInjectionToken } from "../start-main-application/before-quit-of-back-end/before-quit-of-back-end-injection-token";
+import { beforeQuitOfBackEndInjectionToken } from "../start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
 
 const stopTrayInjectable = getInjectable({
   id: "stop-tray",