diff --git a/src/features/application-menu/application-menu.test.ts b/src/features/application-menu/application-menu.test.ts
index 7ce6149540..8a0bd5f3a8 100644
--- a/src/features/application-menu/application-menu.test.ts
+++ b/src/features/application-menu/application-menu.test.ts
@@ -6,7 +6,7 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import populateApplicationMenuInjectable from "./main/populate-application-menu.injectable";
 import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time";
-import { getCompositePaths } from "./main/menu-items/get-composite/get-composite-paths/get-composite-paths";
+import { getCompositePaths } from "./main/menu-items/composite/get-composite-paths/get-composite-paths";
 
 describe("application-menu", () => {
   let builder: ApplicationBuilder;
diff --git a/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts b/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts
index e2678138a2..4ec4373e95 100644
--- a/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts
+++ b/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts
@@ -6,7 +6,7 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import populateApplicationMenuInjectable from "./main/populate-application-menu.injectable";
 import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time";
-import { getCompositePaths } from "./main/menu-items/get-composite/get-composite-paths/get-composite-paths";
+import { getCompositePaths } from "./main/menu-items/composite/get-composite-paths/get-composite-paths";
 import { getInjectable } from "@ogre-tools/injectable";
 import applicationMenuItemInjectionToken from "./main/menu-items/application-menu-item-injection-token";
 import { runInAction } from "mobx";
diff --git a/src/features/application-menu/main/application-menu-item-composite.injectable.ts b/src/features/application-menu/main/application-menu-item-composite.injectable.ts
index 3125603f04..429ceaaea4 100644
--- a/src/features/application-menu/main/application-menu-item-composite.injectable.ts
+++ b/src/features/application-menu/main/application-menu-item-composite.injectable.ts
@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import applicationMenuItemsInjectable from "./application-menu-items.injectable";
-import type { Composite } from "./menu-items/get-composite/get-composite";
-import getComposite from "./menu-items/get-composite/get-composite";
+import type { Composite } from "./menu-items/composite/get-composite/get-composite";
+import getComposite from "./menu-items/composite/get-composite/get-composite";
 import { computed } from "mobx";
 import { pipeline } from "@ogre-tools/fp";
 import type { ApplicationMenuItemTypes } from "./menu-items/application-menu-item-injection-token";
diff --git a/src/features/application-menu/main/menu-items/get-composite/composite-has-descendant/composite-has-descendant.test.ts b/src/features/application-menu/main/menu-items/composite/composite-has-descendant/composite-has-descendant.test.ts
similarity index 92%
rename from src/features/application-menu/main/menu-items/get-composite/composite-has-descendant/composite-has-descendant.test.ts
rename to src/features/application-menu/main/menu-items/composite/composite-has-descendant/composite-has-descendant.test.ts
index b80aa90c4c..0c20840e18 100644
--- a/src/features/application-menu/main/menu-items/get-composite/composite-has-descendant/composite-has-descendant.test.ts
+++ b/src/features/application-menu/main/menu-items/composite/composite-has-descendant/composite-has-descendant.test.ts
@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { Composite } from "../get-composite";
-import getComposite from "../get-composite";
+import type { Composite } from "../get-composite/get-composite";
+import getComposite from "../get-composite/get-composite";
 import { compositeHasDescendant } from "./composite-has-descendant";
 
 describe("composite-has-descendant, given composite with children and grand children", () => {
diff --git a/src/features/application-menu/main/menu-items/get-composite/composite-has-descendant/composite-has-descendant.ts b/src/features/application-menu/main/menu-items/composite/composite-has-descendant/composite-has-descendant.ts
similarity index 89%
rename from src/features/application-menu/main/menu-items/get-composite/composite-has-descendant/composite-has-descendant.ts
rename to src/features/application-menu/main/menu-items/composite/composite-has-descendant/composite-has-descendant.ts
index a622ffaf1a..030f79ad74 100644
--- a/src/features/application-menu/main/menu-items/get-composite/composite-has-descendant/composite-has-descendant.ts
+++ b/src/features/application-menu/main/menu-items/composite/composite-has-descendant/composite-has-descendant.ts
@@ -2,7 +2,7 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { Composite } from "../get-composite";
+import type { Composite } from "../get-composite/get-composite";
 
 const compositeHasDescendant = <T>(
   predicate: (referenceComposite: Composite<T>) => boolean,
diff --git a/src/features/application-menu/main/menu-items/get-composite/find-composite/find-composite.test.ts b/src/features/application-menu/main/menu-items/composite/find-composite/find-composite.test.ts
similarity index 92%
rename from src/features/application-menu/main/menu-items/get-composite/find-composite/find-composite.test.ts
rename to src/features/application-menu/main/menu-items/composite/find-composite/find-composite.test.ts
index 6fbca5cf5e..510c075f53 100644
--- a/src/features/application-menu/main/menu-items/get-composite/find-composite/find-composite.test.ts
+++ b/src/features/application-menu/main/menu-items/composite/find-composite/find-composite.test.ts
@@ -2,8 +2,8 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { Composite } from "../get-composite";
-import getComposite from "../get-composite";
+import type { Composite } from "../get-composite/get-composite";
+import getComposite from "../get-composite/get-composite";
 import { findComposite } from "./find-composite";
 
 describe("find-composite", () => {
diff --git a/src/features/application-menu/main/menu-items/get-composite/find-composite/find-composite.ts b/src/features/application-menu/main/menu-items/composite/find-composite/find-composite.ts
similarity index 86%
rename from src/features/application-menu/main/menu-items/get-composite/find-composite/find-composite.ts
rename to src/features/application-menu/main/menu-items/composite/find-composite/find-composite.ts
index fbae187cc8..81ec5c6e74 100644
--- a/src/features/application-menu/main/menu-items/get-composite/find-composite/find-composite.ts
+++ b/src/features/application-menu/main/menu-items/composite/find-composite/find-composite.ts
@@ -2,7 +2,7 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { Composite } from "../get-composite";
+import type { Composite } from "../get-composite/get-composite";
 import { getCompositeNormalization } from "../get-composite-normalization/get-composite-normalization";
 
 export const findComposite =
diff --git a/src/features/application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization.test.ts b/src/features/application-menu/main/menu-items/composite/get-composite-normalization/get-composite-normalization.test.ts
similarity index 94%
rename from src/features/application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization.test.ts
rename to src/features/application-menu/main/menu-items/composite/get-composite-normalization/get-composite-normalization.test.ts
index ccea34e963..34a1eebad3 100644
--- a/src/features/application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization.test.ts
+++ b/src/features/application-menu/main/menu-items/composite/get-composite-normalization/get-composite-normalization.test.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getCompositeNormalization } from "./get-composite-normalization";
-import getComposite from "../get-composite";
+import getComposite from "../get-composite/get-composite";
 
 describe("get-composite-normalization", () => {
   it("given a composite, flattens it to path and composite", () => {
diff --git a/src/features/application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization.ts b/src/features/application-menu/main/menu-items/composite/get-composite-normalization/get-composite-normalization.ts
similarity index 91%
rename from src/features/application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization.ts
rename to src/features/application-menu/main/menu-items/composite/get-composite-normalization/get-composite-normalization.ts
index 8920adf5fc..a5d192c731 100644
--- a/src/features/application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization.ts
+++ b/src/features/application-menu/main/menu-items/composite/get-composite-normalization/get-composite-normalization.ts
@@ -2,7 +2,7 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { Composite } from "../get-composite";
+import type { Composite } from "../get-composite/get-composite";
 
 export const getCompositeNormalization = <T>(composite: Composite<T>) => {
   const _normalizeComposite = <T>(
diff --git a/src/features/application-menu/main/menu-items/get-composite/get-composite-paths/get-composite-paths.test.ts b/src/features/application-menu/main/menu-items/composite/get-composite-paths/get-composite-paths.test.ts
similarity index 95%
rename from src/features/application-menu/main/menu-items/get-composite/get-composite-paths/get-composite-paths.test.ts
rename to src/features/application-menu/main/menu-items/composite/get-composite-paths/get-composite-paths.test.ts
index 34e188639f..d4e1b9e13c 100644
--- a/src/features/application-menu/main/menu-items/get-composite/get-composite-paths/get-composite-paths.test.ts
+++ b/src/features/application-menu/main/menu-items/composite/get-composite-paths/get-composite-paths.test.ts
@@ -2,7 +2,7 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import getComposite from "../get-composite";
+import getComposite from "../get-composite/get-composite";
 import { getCompositePaths } from "./get-composite-paths";
 
 describe("get-composite-paths", () => {
diff --git a/src/features/application-menu/main/menu-items/get-composite/get-composite-paths/get-composite-paths.ts b/src/features/application-menu/main/menu-items/composite/get-composite-paths/get-composite-paths.ts
similarity index 88%
rename from src/features/application-menu/main/menu-items/get-composite/get-composite-paths/get-composite-paths.ts
rename to src/features/application-menu/main/menu-items/composite/get-composite-paths/get-composite-paths.ts
index 814263943a..1de672d6e1 100644
--- a/src/features/application-menu/main/menu-items/get-composite/get-composite-paths/get-composite-paths.ts
+++ b/src/features/application-menu/main/menu-items/composite/get-composite-paths/get-composite-paths.ts
@@ -4,7 +4,7 @@
  */
 import { pipeline } from "@ogre-tools/fp";
 import { map } from "lodash/fp";
-import type { Composite } from "../get-composite";
+import type { Composite } from "../get-composite/get-composite";
 import { getCompositeNormalization } from "../get-composite-normalization/get-composite-normalization";
 
 export const getCompositePaths = (
diff --git a/src/features/application-menu/main/menu-items/get-composite/get-composite.test.ts b/src/features/application-menu/main/menu-items/composite/get-composite/get-composite.test.ts
similarity index 99%
rename from src/features/application-menu/main/menu-items/get-composite/get-composite.test.ts
rename to src/features/application-menu/main/menu-items/composite/get-composite/get-composite.test.ts
index 02cadedc33..8e12f28a66 100644
--- a/src/features/application-menu/main/menu-items/get-composite/get-composite.test.ts
+++ b/src/features/application-menu/main/menu-items/composite/get-composite/get-composite.test.ts
@@ -6,7 +6,7 @@
 import { sortBy } from "lodash/fp";
 import type { Composite } from "./get-composite";
 import getComposite from "./get-composite";
-import { getCompositePaths } from "./get-composite-paths/get-composite-paths";
+import { getCompositePaths } from "../get-composite-paths/get-composite-paths";
 
 describe("get-composite", () => {
   it("given items and a specified root id, creates a composite", () => {
diff --git a/src/features/application-menu/main/menu-items/get-composite/get-composite.ts b/src/features/application-menu/main/menu-items/composite/get-composite/get-composite.ts
similarity index 100%
rename from src/features/application-menu/main/menu-items/get-composite/get-composite.ts
rename to src/features/application-menu/main/menu-items/composite/get-composite/get-composite.ts
diff --git a/src/features/application-menu/main/populate-application-menu.injectable.ts b/src/features/application-menu/main/populate-application-menu.injectable.ts
index 8a6dc010c6..a6b71e162d 100644
--- a/src/features/application-menu/main/populate-application-menu.injectable.ts
+++ b/src/features/application-menu/main/populate-application-menu.injectable.ts
@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { Menu } from "electron";
 import type { MenuItemOpts } from "./application-menu-items.injectable";
-import type { Composite } from "./menu-items/get-composite/get-composite";
+import type { Composite } from "./menu-items/composite/get-composite/get-composite";
 import type { ApplicationMenuItemTypes } from "./menu-items/application-menu-item-injection-token";
 import { pipeline } from "@ogre-tools/fp";
 import { map, sortBy } from "lodash/fp";
diff --git a/src/features/preferences/renderer/preference-items/current-preference-tab-composite.injectable.ts b/src/features/preferences/renderer/preference-items/current-preference-tab-composite.injectable.ts
index 9d0b217d0c..6ea3ef95d0 100644
--- a/src/features/preferences/renderer/preference-items/current-preference-tab-composite.injectable.ts
+++ b/src/features/preferences/renderer/preference-items/current-preference-tab-composite.injectable.ts
@@ -5,10 +5,10 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
 import type { PreferenceTab, PreferenceTypes } from "./preference-item-injection-token";
-import type { Composite } from "../../../application-menu/main/menu-items/get-composite/get-composite";
+import type { Composite } from "../../../application-menu/main/menu-items/composite/get-composite/get-composite";
 import { filter, map } from "lodash/fp";
 import { pipeline } from "@ogre-tools/fp";
-import { getCompositeNormalization } from "../../../application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization";
+import { getCompositeNormalization } from "../../../application-menu/main/menu-items/composite/get-composite-normalization/get-composite-normalization";
 import preferencesCompositeInjectable from "./preferences-composite.injectable";
 import type { PreferenceTabsRoot } from "./preference-tab-root";
 import currentPreferenceTabIdInjectable from "./current-preference-tab-id.injectable";
diff --git a/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts b/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts
index d0af642dd8..732379eafa 100644
--- a/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts
+++ b/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts
@@ -7,7 +7,7 @@ import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-f
 import { computed } from "mobx";
 import type { PreferenceTypes } from "./preference-item-injection-token";
 import { preferenceItemInjectionToken } from "./preference-item-injection-token";
-import getComposite from "../../../application-menu/main/menu-items/get-composite/get-composite";
+import getComposite from "../../../application-menu/main/menu-items/composite/get-composite/get-composite";
 import { filter } from "lodash/fp";
 import { pipeline } from "@ogre-tools/fp";
 import { preferenceTabsRoot } from "./preference-tab-root";
diff --git a/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx b/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx
index 783bedd80b..36ed56a671 100644
--- a/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx
+++ b/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx
@@ -4,7 +4,7 @@
  */
 import { Tabs } from "../../../../renderer/components/tabs";
 import React from "react";
-import type { Composite } from "../../../application-menu/main/menu-items/get-composite/get-composite";
+import type { Composite } from "../../../application-menu/main/menu-items/composite/get-composite/get-composite";
 import type { PreferenceTypes } from "../preference-items/preference-item-injection-token";
 import { Map } from "../../../../renderer/components/map/map";
 import { withInjectables } from "@ogre-tools/injectable-react";
@@ -12,7 +12,7 @@ import type { IComputedValue } from "mobx";
 import preferencesCompositeInjectable from "../preference-items/preferences-composite.injectable";
 import { observer } from "mobx-react";
 import { PreferencesNavigationTab } from "./preferences-navigation-tab";
-import { compositeHasDescendant } from "../../../application-menu/main/menu-items/get-composite/composite-has-descendant/composite-has-descendant";
+import { compositeHasDescendant } from "../../../application-menu/main/menu-items/composite/composite-has-descendant/composite-has-descendant";
 import type { PreferenceTabsRoot } from "../preference-items/preference-tab-root";
 import { Icon } from "../../../../renderer/components/icon";
 
diff --git a/src/features/preferences/renderer/preferences.tsx b/src/features/preferences/renderer/preferences.tsx
index 96702bb51d..a9bb01106e 100644
--- a/src/features/preferences/renderer/preferences.tsx
+++ b/src/features/preferences/renderer/preferences.tsx
@@ -9,7 +9,7 @@ import { SettingLayout } from "../../../renderer/components/layout/setting-layou
 import { withInjectables } from "@ogre-tools/injectable-react";
 import closePreferencesInjectable from "./close-preferences/close-preferences.injectable";
 import currentPreferenceTabCompositeInjectable from "./preference-items/current-preference-tab-composite.injectable";
-import type { Composite } from "../../application-menu/main/menu-items/get-composite/get-composite";
+import type { Composite } from "../../application-menu/main/menu-items/composite/get-composite/get-composite";
 import type { PreferenceTypes, PreferenceTab } from "./preference-items/preference-item-injection-token";
 import type { IComputedValue } from "mobx";
 import { Map } from "../../../renderer/components/map/map";
diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx
index 3fcc4ca229..2de507b332 100644
--- a/src/renderer/components/test-utils/get-application-builder.tsx
+++ b/src/renderer/components/test-utils/get-application-builder.tsx
@@ -65,10 +65,10 @@ import namespaceApiInjectable from "../../../common/k8s-api/endpoints/namespace.
 import { Namespace } from "../../../common/k8s-api/endpoints";
 import { overrideFsWithFakes } from "../../../test-utils/override-fs-with-fakes";
 import applicationMenuItemCompositeInjectable from "../../../features/application-menu/main/application-menu-item-composite.injectable";
-import { getCompositePaths } from "../../../features/application-menu/main/menu-items/get-composite/get-composite-paths/get-composite-paths";
-import { getCompositeNormalization } from "../../../features/application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization";
+import { getCompositePaths } from "../../../features/application-menu/main/menu-items/composite/get-composite-paths/get-composite-paths";
+import { getCompositeNormalization } from "../../../features/application-menu/main/menu-items/composite/get-composite-normalization/get-composite-normalization";
 import type { ClickableMenuItem } from "../../../features/application-menu/main/menu-items/application-menu-item-injection-token";
-import type { Composite } from "../../../features/application-menu/main/menu-items/get-composite/get-composite";
+import type { Composite } from "../../../features/application-menu/main/menu-items/composite/get-composite/get-composite";
 import { getSingleElement } from "./discovery-of-html-elements";
 
 type Callback = (di: DiContainer) => void | Promise<void>;