diff --git a/src/components/data-board-external-tool-element/index.ts b/src/components/data-board-external-tool-element/index.ts
deleted file mode 100644
index 7203a1a816..0000000000
--- a/src/components/data-board-external-tool-element/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ExternalToolElementDisplayState.composable";
diff --git a/src/components/data-board-external-tool-element/ExternalToolElementDisplayState.composable.ts b/src/components/data-external-tool/ExternalToolElementDisplayState.composable.ts
similarity index 75%
rename from src/components/data-board-external-tool-element/ExternalToolElementDisplayState.composable.ts
rename to src/components/data-external-tool/ExternalToolElementDisplayState.composable.ts
index 77a6ac100c..c96fb9423c 100644
--- a/src/components/data-board-external-tool-element/ExternalToolElementDisplayState.composable.ts
+++ b/src/components/data-external-tool/ExternalToolElementDisplayState.composable.ts
@@ -1,7 +1,7 @@
-import { useErrorHandler } from "@/components/error-handling/ErrorHandler.composable";
-import { ExternalToolDisplayData } from "@/store/external-tool";
-import { useContextExternalToolApi } from "@data-external-tool";
 import { ref, Ref } from "vue";
+import { ExternalToolDisplayData } from "../../store/external-tool";
+import { useErrorHandler } from "../error-handling/ErrorHandler.composable";
+import { useContextExternalToolApi } from "./index";
 
 export const useExternalToolElementDisplayState = () => {
 	const { handleError } = useErrorHandler();
diff --git a/src/components/data-board-external-tool-element/ExternalToolElementDisplayState.composable.unit.ts b/src/components/data-external-tool/ExternalToolElementDisplayState.composable.unit.ts
similarity index 94%
rename from src/components/data-board-external-tool-element/ExternalToolElementDisplayState.composable.unit.ts
rename to src/components/data-external-tool/ExternalToolElementDisplayState.composable.unit.ts
index 53db87a5ac..1fe5ff37ed 100644
--- a/src/components/data-board-external-tool-element/ExternalToolElementDisplayState.composable.unit.ts
+++ b/src/components/data-external-tool/ExternalToolElementDisplayState.composable.unit.ts
@@ -1,9 +1,9 @@
-import { useErrorHandler } from "@/components/error-handling/ErrorHandler.composable";
 import { ExternalToolDisplayData } from "@/store/external-tool";
 import { externalToolDisplayDataFactory } from "@@/tests/test-utils";
-import { useContextExternalToolApi } from "@data-external-tool";
 import { createMock, DeepMocked } from "@golevelup/ts-jest";
+import { useErrorHandler } from "../error-handling/ErrorHandler.composable";
 import { useExternalToolElementDisplayState } from "./ExternalToolElementDisplayState.composable";
+import { useContextExternalToolApi } from "./index";
 
 jest.mock("@data-external-tool");
 jest.mock("@/components/error-handling/ErrorHandler.composable");
diff --git a/src/components/data-external-tool/index.ts b/src/components/data-external-tool/index.ts
index a86cde4ed7..f64b0c1f8f 100644
--- a/src/components/data-external-tool/index.ts
+++ b/src/components/data-external-tool/index.ts
@@ -1 +1,2 @@
 export * from "./ContextExternalToolApi.composable";
+export * from "./ExternalToolElementDisplayState.composable";
diff --git a/src/components/feature-board-external-tool-element/ExternalToolElement.unit.ts b/src/components/feature-board-external-tool-element/ExternalToolElement.unit.ts
index 7bc7a6f274..54651ab219 100644
--- a/src/components/feature-board-external-tool-element/ExternalToolElement.unit.ts
+++ b/src/components/feature-board-external-tool-element/ExternalToolElement.unit.ts
@@ -13,7 +13,7 @@ import {
 } from "@@/tests/test-utils";
 import createComponentMocks from "@@/tests/test-utils/componentMocks";
 import { useBoardFocusHandler, useContentElementState } from "@data-board";
-import { useExternalToolElementDisplayState } from "@data-board-external-tool-element";
+import { useExternalToolElementDisplayState } from "@data-external-tool";
 import { createMock, DeepMocked } from "@golevelup/ts-jest";
 import { mdiPuzzleOutline } from "@mdi/js";
 import { useDeleteConfirmationDialog } from "@ui-confirmation-dialog";
@@ -22,7 +22,7 @@ import Vue, { ref } from "vue";
 import ExternalToolElement from "./ExternalToolElement.vue";
 
 jest.mock("@data-board");
-jest.mock("@data-board-external-tool-element");
+jest.mock("@data-external-tool");
 jest.mock("@ui-confirmation-dialog");
 
 const EMPTY_TEST_ELEMENT: ExternalToolElementResponse = {
diff --git a/src/components/feature-board-external-tool-element/ExternalToolElement.vue b/src/components/feature-board-external-tool-element/ExternalToolElement.vue
index a81a89ed7f..39b7fa00f4 100644
--- a/src/components/feature-board-external-tool-element/ExternalToolElement.vue
+++ b/src/components/feature-board-external-tool-element/ExternalToolElement.vue
@@ -59,7 +59,7 @@ import { useI18n } from "@/composables/i18n.composable";
 import { ExternalToolElementResponse } from "@/serverApi/v3";
 import { ContextExternalTool } from "@/store/external-tool/context-external-tool";
 import { useBoardFocusHandler, useContentElementState } from "@data-board";
-import { useExternalToolElementDisplayState } from "@data-board-external-tool-element";
+import { useExternalToolElementDisplayState } from "@data-external-tool";
 import { mdiPuzzleOutline } from "@mdi/js";
 import {
 	computed,
diff --git a/tsconfig.json b/tsconfig.json
index 872d8998ee..1b7c928128 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -19,7 +19,6 @@
 		"paths": {
 			"@data-board": ["src/components/data-board"],
 			"@data-external-tool": ["src/components/data-external-tool"],
-			"@data-board-external-tool-element": ["src/components/data-board-external-tool-element"],
 			"@feature-board-file-element": [
 				"src/components/feature-board-file-element"
 			],
diff --git a/vue.config.js b/vue.config.js
index 3a742e265c..ab7b9116e2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -22,9 +22,6 @@ module.exports = defineConfig({
 			alias: {
 				"@data-board": getDir("src/components/data-board"),
 				"@data-external-tool": getDir("src/components/data-external-tool"),
-				"@data-board-external-tool-element": getDir(
-					"src/components/data-board-external-tool-element"
-				),
 				"@feature-board-file-element": getDir(
 					"src/components/feature-board-file-element"
 				),