diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts
index b6141b90b2..9c2ae87ad0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts
@@ -4,8 +4,6 @@ export * from './backoffice-modal-container/backoffice-modal-container.element.j
 export * from './backoffice-notification-container/backoffice-notification-container.element.js';
 export * from './body-layout/body-layout.element.js';
 export * from './code-block/index.js';
-export * from './input-date/index.js';
-export * from './input-dropdown/index.js';
 export * from './dropdown/index.js';
 export * from './empty-state/index.js';
 export * from './entity-actions-bundle/index.js';
@@ -15,22 +13,25 @@ export * from './header-app/index.js';
 export * from './history/index.js';
 export * from './input-checkbox-list/index.js';
 export * from './input-color/index.js';
+export * from './input-date/index.js';
+export * from './input-dropdown/index.js';
 export * from './input-eye-dropper/index.js';
 export * from './input-list-base/index.js';
 export * from './input-markdown-editor/index.js';
 export * from './input-multi-url/index.js';
-export * from './input-tiny-mce/index.js';
 export * from './input-number-range/index.js';
 export * from './input-radio-button-list/index.js';
 export * from './input-section/index.js';
 export * from './input-slider/index.js';
+export * from './input-start-node/index.js';
+export * from './input-tiny-mce/index.js';
 export * from './input-toggle/index.js';
 export * from './input-upload-field/index.js';
+export * from './multiple-color-picker-input/index.js';
+export * from './multiple-text-string-input/index.js';
+export * from './popover-layout/index.js';
 export * from './property-type-based-property/index.js';
 export * from './ref-property-editor-ui/index.js';
 export * from './table/index.js';
 export * from './tooltip-menu/index.js';
 export * from './variant-selector/index.js';
-export * from './popover-layout/index.js';
-export * from './multiple-text-string-input/index.js';
-export * from './multiple-color-picker-input/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/input-content-type/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-start-node/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/input-content-type/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/components/input-start-node/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/input-content-type/input-content-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-start-node/input-content-type.element.ts
similarity index 93%
rename from src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/input-content-type/input-content-type.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/components/input-start-node/input-content-type.element.ts
index 3a51a0941a..d6db6cc9c5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/input-content-type/input-content-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-start-node/input-content-type.element.ts
@@ -13,8 +13,8 @@ export type StartNode = {
 	query?: string | null;
 };
 
-@customElement('umb-input-content-type')
-export class UmbInputContentTypeElement extends FormControlMixin(UmbLitElement) {
+@customElement('umb-input-start-node')
+export class UmbInputStartNodeElement extends FormControlMixin(UmbLitElement) {
 	protected getFormElement() {
 		return undefined;
 	}
@@ -110,10 +110,10 @@ export class UmbInputContentTypeElement extends FormControlMixin(UmbLitElement)
 	];
 }
 
-export default UmbInputContentTypeElement;
+export default UmbInputStartNodeElement;
 
 declare global {
 	interface HTMLElementTagNameMap {
-		'umb-input-content-type': UmbInputContentTypeElement;
+		'umb-input-start-node': UmbInputStartNodeElement;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/index.ts
deleted file mode 100644
index d377387e83..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './input-content-type/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/index.ts
index 6535bc4f1c..c587218a3d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/index.ts
@@ -1,4 +1,3 @@
 export * from './content-type-container-structure-helper.class.js';
 export * from './content-type-property-structure-helper.class.js';
 export * from './content-type-structure-manager.class.js';
-export * from './components/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.element.ts
index ea993e0e7a..de8ba4d70e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.element.ts
@@ -1,4 +1,4 @@
-import { StartNode, UmbInputContentTypeElement } from '@umbraco-cms/backoffice/content-type';
+import { StartNode, UmbInputStartNodeElement } from '@umbraco-cms/backoffice/components';
 import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
 import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
 import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
@@ -17,11 +17,12 @@ export class UmbPropertyEditorUITreePickerStartNodeElement extends UmbLitElement
 	public config?: UmbPropertyEditorConfigCollection;
 
 	#onChange(event: CustomEvent) {
-		const target = event.target as UmbInputContentTypeElement;
+		const target = event.target as UmbInputStartNodeElement;
 
 		this.value = {
 			type: target.type,
 			id: target.nodeId,
+			// TODO: Please check this makes sense, Check if we want to support XPath in this version, if not then make sure we handle DynamicRoot correct.
 			query: target.dynamicPath,
 		};
 
@@ -29,9 +30,7 @@ export class UmbPropertyEditorUITreePickerStartNodeElement extends UmbLitElement
 	}
 
 	render() {
-		return html`<umb-input-content-type
-			@change="${this.#onChange}"
-			.type=${this.value?.type}></umb-input-content-type>`;
+		return html`<umb-input-start-node @change="${this.#onChange}" .type=${this.value?.type}></umb-input-start-node>`;
 	}
 
 	static styles = [UmbTextStyles];