diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/editor-node.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/editor-node.element.ts
similarity index 89%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/editor-node.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/editors/node/editor-node.element.ts
index fa74b37024..92380bbe92 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/editor-node.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/editor-node.element.ts
@@ -1,19 +1,19 @@
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { css, html, LitElement } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
-import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../core/context';
-import { UmbNodeStore } from '../../core/stores/node.store';
+import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context';
+import { UmbNodeStore } from '../../../core/stores/node.store';
 import { distinctUntilChanged, Subscription } from 'rxjs';
-import { NodeEntity } from '../../mocks/data/content.data';
-import { UmbNotificationService } from '../../core/services/notification.service';
-import { UmbNodeContext } from './node/node.context';
+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 '../../components/editor-entity.element';
 
 // Lazy load
 // TODO: Make this dynamic, use load-extensions method to loop over extensions for this node.
-import '../editor-views/editor-view-node-edit.element';
-import '../editor-views/editor-view-node-info.element';
+import '../../editor-views/editor-view-node-edit.element';
+import '../../editor-views/editor-view-node-info.element';
 
 @customElement('umb-editor-node')
 export class UmbEditorNodeElement extends UmbContextProviderMixin(UmbContextConsumerMixin(LitElement)) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts
index 0a8dc35b59..9437eb7963 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts
@@ -30,7 +30,7 @@ export class UmbContentSection extends LitElement {
 		},
 		{
 			path: 'node/:nodeId',
-			component: () => import('../../editors/editor-node.element'),
+			component: () => import('../../editors/node/editor-node.element'),
 			setup: (component: HTMLElement, info: IRoutingInfo) => {
 				this._currentNodeId = info.match.params.nodeId;
 				component.id = this._currentNodeId;