diff --git a/src/common/front-end-routing/routes/welcome/navigate-to-welcome.injectable.ts b/src/behaviours/welcome/common/navigate-to-welcome.injectable.ts
similarity index 83%
rename from src/common/front-end-routing/routes/welcome/navigate-to-welcome.injectable.ts
rename to src/behaviours/welcome/common/navigate-to-welcome.injectable.ts
index 46f5b42056..712ab80d4d 100644
--- a/src/common/front-end-routing/routes/welcome/navigate-to-welcome.injectable.ts
+++ b/src/behaviours/welcome/common/navigate-to-welcome.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import welcomeRouteInjectable from "./welcome-route.injectable";
-import { navigateToRouteInjectionToken } from "../../navigate-to-route-injection-token";
+import { navigateToRouteInjectionToken } from "../../../common/front-end-routing/navigate-to-route-injection-token";
 
 const navigateToWelcomeInjectable = getInjectable({
   id: "navigate-to-welcome",
diff --git a/src/common/catalog-entities/general-catalog-entities/implementations/welcome-catalog-entity.injectable.ts b/src/behaviours/welcome/common/welcome-catalog-entity.injectable.ts
similarity index 72%
rename from src/common/catalog-entities/general-catalog-entities/implementations/welcome-catalog-entity.injectable.ts
rename to src/behaviours/welcome/common/welcome-catalog-entity.injectable.ts
index 363dd73c5f..a0634f2fe2 100644
--- a/src/common/catalog-entities/general-catalog-entities/implementations/welcome-catalog-entity.injectable.ts
+++ b/src/behaviours/welcome/common/welcome-catalog-entity.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 { generalCatalogEntityInjectionToken } from "../general-catalog-entity-injection-token";
-import { GeneralEntity } from "../../index";
-import { buildURL } from "../../../utils/buildUrl";
-import welcomeRouteInjectable from "../../../front-end-routing/routes/welcome/welcome-route.injectable";
+import { generalCatalogEntityInjectionToken } from "../../../common/catalog-entities/general-catalog-entities/general-catalog-entity-injection-token";
+import { GeneralEntity } from "../../../common/catalog-entities";
+import { buildURL } from "../../../common/utils/buildUrl";
+import welcomeRouteInjectable from "./welcome-route.injectable";
 
 const welcomeCatalogEntityInjectable = getInjectable({
   id: "general-catalog-entity-for-welcome",
diff --git a/src/common/front-end-routing/routes/welcome/welcome-route.injectable.ts b/src/behaviours/welcome/common/welcome-route.injectable.ts
similarity index 81%
rename from src/common/front-end-routing/routes/welcome/welcome-route.injectable.ts
rename to src/behaviours/welcome/common/welcome-route.injectable.ts
index 75d722ab46..574d629d50 100644
--- a/src/common/front-end-routing/routes/welcome/welcome-route.injectable.ts
+++ b/src/behaviours/welcome/common/welcome-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { frontEndRouteInjectionToken } from "../../front-end-route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../common/front-end-routing/front-end-route-injection-token";
 
 const welcomeRouteInjectable = getInjectable({
   id: "welcome-route",
diff --git a/src/renderer/components/+welcome/__test__/welcome.test.tsx b/src/behaviours/welcome/renderer/__test__/welcome.test.tsx
similarity index 92%
rename from src/renderer/components/+welcome/__test__/welcome.test.tsx
rename to src/behaviours/welcome/renderer/__test__/welcome.test.tsx
index 13f338e7d4..8f02e57c1e 100644
--- a/src/renderer/components/+welcome/__test__/welcome.test.tsx
+++ b/src/behaviours/welcome/renderer/__test__/welcome.test.tsx
@@ -8,9 +8,9 @@ import { screen } from "@testing-library/react";
 import "@testing-library/jest-dom/extend-expect";
 import { defaultWidth, Welcome } from "../welcome";
 import { computed } from "mobx";
-import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
-import type { DiRender } from "../../test-utils/renderFor";
-import { renderFor } from "../../test-utils/renderFor";
+import { getDiForUnitTesting } from "../../../../renderer/getDiForUnitTesting";
+import type { DiRender } from "../../../../renderer/components/test-utils/renderFor";
+import { renderFor } from "../../../../renderer/components/test-utils/renderFor";
 import type { DiContainer } from "@ogre-tools/injectable";
 import rendererExtensionsInjectable from "../../../../extensions/renderer-extensions.injectable";
 import { LensRendererExtension } from "../../../../extensions/lens-renderer-extension";
diff --git a/src/renderer/components/+welcome/index.ts b/src/behaviours/welcome/renderer/index.ts
similarity index 100%
rename from src/renderer/components/+welcome/index.ts
rename to src/behaviours/welcome/renderer/index.ts
diff --git a/src/renderer/components/+welcome/welcome-banner-items/welcome-banner-items.injectable.ts b/src/behaviours/welcome/renderer/welcome-banner-items/welcome-banner-items.injectable.ts
similarity index 100%
rename from src/renderer/components/+welcome/welcome-banner-items/welcome-banner-items.injectable.ts
rename to src/behaviours/welcome/renderer/welcome-banner-items/welcome-banner-items.injectable.ts
diff --git a/src/renderer/components/+welcome/welcome-banner-items/welcome-banner-registration.ts b/src/behaviours/welcome/renderer/welcome-banner-items/welcome-banner-registration.ts
similarity index 100%
rename from src/renderer/components/+welcome/welcome-banner-items/welcome-banner-registration.ts
rename to src/behaviours/welcome/renderer/welcome-banner-items/welcome-banner-registration.ts
diff --git a/src/renderer/components/+welcome/welcome-menu-items/get-welcome-menu-items.ts b/src/behaviours/welcome/renderer/welcome-menu-items/get-welcome-menu-items.ts
similarity index 100%
rename from src/renderer/components/+welcome/welcome-menu-items/get-welcome-menu-items.ts
rename to src/behaviours/welcome/renderer/welcome-menu-items/get-welcome-menu-items.ts
diff --git a/src/renderer/components/+welcome/welcome-menu-items/welcome-menu-items.injectable.ts b/src/behaviours/welcome/renderer/welcome-menu-items/welcome-menu-items.injectable.ts
similarity index 100%
rename from src/renderer/components/+welcome/welcome-menu-items/welcome-menu-items.injectable.ts
rename to src/behaviours/welcome/renderer/welcome-menu-items/welcome-menu-items.injectable.ts
diff --git a/src/renderer/components/+welcome/welcome-menu-items/welcome-menu-registration.ts b/src/behaviours/welcome/renderer/welcome-menu-items/welcome-menu-registration.ts
similarity index 100%
rename from src/renderer/components/+welcome/welcome-menu-items/welcome-menu-registration.ts
rename to src/behaviours/welcome/renderer/welcome-menu-items/welcome-menu-registration.ts
diff --git a/src/renderer/components/+welcome/welcome-route-component.injectable.ts b/src/behaviours/welcome/renderer/welcome-route-component.injectable.ts
similarity index 70%
rename from src/renderer/components/+welcome/welcome-route-component.injectable.ts
rename to src/behaviours/welcome/renderer/welcome-route-component.injectable.ts
index 65fa0dfb00..ee26bbafe5 100644
--- a/src/renderer/components/+welcome/welcome-route-component.injectable.ts
+++ b/src/behaviours/welcome/renderer/welcome-route-component.injectable.ts
@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { Welcome } from "./welcome";
-import welcomeRouteInjectable from "../../../common/front-end-routing/routes/welcome/welcome-route.injectable";
-import { routeSpecificComponentInjectionToken } from "../../routes/route-specific-component-injection-token";
+import welcomeRouteInjectable from "../common/welcome-route.injectable";
+import { routeSpecificComponentInjectionToken } from "../../../renderer/routes/route-specific-component-injection-token";
 
 const welcomeRouteComponentInjectable = getInjectable({
   id: "welcome-route-component",
diff --git a/src/renderer/components/+welcome/welcome.scss b/src/behaviours/welcome/renderer/welcome.scss
similarity index 100%
rename from src/renderer/components/+welcome/welcome.scss
rename to src/behaviours/welcome/renderer/welcome.scss
diff --git a/src/renderer/components/+welcome/welcome.tsx b/src/behaviours/welcome/renderer/welcome.tsx
similarity index 98%
rename from src/renderer/components/+welcome/welcome.tsx
rename to src/behaviours/welcome/renderer/welcome.tsx
index 20bcaf04a6..73249bc076 100644
--- a/src/renderer/components/+welcome/welcome.tsx
+++ b/src/behaviours/welcome/renderer/welcome.tsx
@@ -9,7 +9,7 @@ import { observer } from "mobx-react";
 import type { IComputedValue } from "mobx";
 import type { CarouselProps } from "react-material-ui-carousel";
 import LegacyCarousel from "react-material-ui-carousel";
-import { Icon } from "../icon";
+import { Icon } from "../../../renderer/components/icon";
 import { productName, slackUrl } from "../../../common/vars";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import welcomeMenuItemsInjectable from "./welcome-menu-items/welcome-menu-items.injectable";