diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
index e7ba1b4c31..2f09ccd845 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
@@ -11,7 +11,7 @@ import { UmbNodeStore } from '../core/stores/node.store';
 import './components/backoffice-header.element';
 import './components/backoffice-main.element';
 import './components/backoffice-notification-container.element';
-import './components/editor-layout.element';
+import './editors/shared/editor-layout.element';
 import './components/editor-property-layout.element';
 import './components/node-property.element';
 import './components/section-layout.element';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts
index 555e0c8b7c..104e160edf 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts
@@ -9,7 +9,7 @@ import { UmbDataTypeStore } from '../../../core/stores/data-type.store';
 import { DataTypeEntity } from '../../../mocks/data/data-type.data';
 import { UmbDataTypeContext } from './data-type.context';
 
-import '../../components/editor-entity.element';
+import '../shared/editor-entity.element';
 
 // Lazy load
 // TODO: Make this dynamic, use load-extensions method to loop over extensions for this node.
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts
index d9284e1d8f..b64e2453d9 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts
@@ -10,7 +10,7 @@ import { UmbDocumentTypeStore } from '../../../core/stores/document-type.store';
 import { DocumentTypeEntity } from '../../../mocks/data/document-type.data';
 import { UmbDocumentTypeContext } from './document-type.context';
 
-import '../../components/editor-entity.element';
+import '../shared/editor-entity.element';
 
 // Lazy load
 // TODO: Make this dynamic, use load-extensions method to loop over extensions for this node.
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/editor-node.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/editor-node.element.ts
index a89201e638..b497bea585 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/editor-node.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/editor-node.element.ts
@@ -8,7 +8,7 @@ import { NodeEntity } from '../../../mocks/data/content.data';
 import { UmbNotificationService } from '../../../core/services/notification.service';
 import { UmbNodeContext } from './node.context';
 
-import '../../components/editor-entity.element';
+import '../shared/editor-entity.element';
 
 // Lazy load
 // TODO: Make this dynamic, use load-extensions method to loop over extensions for this node.
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/editor-entity.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity.element.ts
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/backoffice/components/editor-entity.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity.element.ts
index 97bd186b73..3ae5b57a77 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/components/editor-entity.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity.element.ts
@@ -1,8 +1,8 @@
 import { css, html, LitElement } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, property, state } from 'lit/decorators.js';
-import { UmbContextConsumerMixin } from '../../core/context';
-import { UmbExtensionManifestEditorView, UmbExtensionRegistry } from '../../core/extension';
+import { UmbContextConsumerMixin } from '../../../core/context';
+import { UmbExtensionManifestEditorView, UmbExtensionRegistry } from '../../../core/extension';
 import { map, Subscription } from 'rxjs';
 import { IRoute, IRoutingInfo, RouterSlot } from 'router-slot';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/editor-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-layout.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/components/editor-layout.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-layout.element.ts