diff --git a/src/Umbraco.Web.UI.Client/src/app.ts b/src/Umbraco.Web.UI.Client/src/app.ts
index ac85486b9d..340af86198 100644
--- a/src/Umbraco.Web.UI.Client/src/app.ts
+++ b/src/Umbraco.Web.UI.Client/src/app.ts
@@ -9,9 +9,9 @@ import { getInitStatus } from './core/api/fetcher';
 import { UmbContextProviderMixin } from './core/context';
 
 // Load these in the correct components
-import './editors/editor-layout.element';
-import './editors/editor-property-layout.element';
-import './editors/node-editor/node-property.element';
+import './backoffice/components/editor-layout.element';
+import './backoffice/components/editor-property-layout.element';
+import './backoffice/components/node-editor/node-property.element';
 
 const routes = [
   {
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 4e60c3660f..02c5dc02ff 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
@@ -1,6 +1,6 @@
-import '../section/section-sidebar.element';
-import './backoffice-header.element';
-import './backoffice-main.element';
+import './components/section-sidebar.element';
+import './components/backoffice-header.element';
+import './components/backoffice-main.element';
 
 import { defineElement } from '@umbraco-ui/uui-base/lib/registration';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-header-sections.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-header-sections.element.ts
similarity index 96%
rename from src/Umbraco.Web.UI.Client/src/backoffice/backoffice-header-sections.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-header-sections.element.ts
index 5766dd00ac..41e3d4f7a9 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-header-sections.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-header-sections.element.ts
@@ -5,9 +5,9 @@ import { when } from 'lit/directives/when.js';
 import { isPathActive, path } from 'router-slot';
 import { map, Subscription } from 'rxjs';
 
-import { getUserSections } from '../core/api/fetcher';
-import { UmbContextConsumerMixin } from '../core/context';
-import { UmbExtensionManifestSection, UmbExtensionRegistry } from '../core/extension';
+import { getUserSections } from '../../core/api/fetcher';
+import { UmbContextConsumerMixin } from '../../core/context';
+import { UmbExtensionManifestSection, UmbExtensionRegistry } from '../../core/extension';
 
 @customElement('umb-backoffice-header-sections')
 export class UmbBackofficeHeaderSections extends UmbContextConsumerMixin(LitElement) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-header-tools.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-header-tools.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/backoffice-header-tools.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-header-tools.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-header.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-header.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/backoffice-header.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-header.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-main.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-main.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/backoffice/backoffice-main.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-main.element.ts
index 4ad739c565..3f91a840a8 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-main.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-main.element.ts
@@ -4,8 +4,8 @@ import { css, html, LitElement } from 'lit';
 import { state } from 'lit/decorators.js';
 import { map, Subscription } from 'rxjs';
 
-import { UmbContextConsumerMixin } from '../core/context';
-import { createExtensionElement, UmbExtensionManifestSection, UmbExtensionRegistry } from '../core/extension';
+import { UmbContextConsumerMixin } from '../../core/context';
+import { createExtensionElement, UmbExtensionManifestSection, UmbExtensionRegistry } from '../../core/extension';
 
 @defineElement('umb-backoffice-main')
 export class UmbBackofficeMain extends UmbContextConsumerMixin(LitElement) {
diff --git a/src/Umbraco.Web.UI.Client/src/editors/editor-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/editor-layout.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/editors/editor-layout.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/components/editor-layout.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/editors/editor-property-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/editor-property-layout.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/editors/editor-property-layout.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/components/editor-property-layout.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/editors/node-editor/node-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/node-editor/node-property.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/editors/node-editor/node-property.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/components/node-editor/node-property.element.ts
index e1a37095cd..222bc1375a 100644
--- a/src/Umbraco.Web.UI.Client/src/editors/node-editor/node-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/node-editor/node-property.element.ts
@@ -4,10 +4,10 @@ import { customElement, property, state } from 'lit/decorators.js';
 import { EMPTY, of, Subscription } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
-import { UmbContextConsumerMixin } from '../../core/context';
-import { createExtensionElement, UmbExtensionManifest, UmbExtensionRegistry } from '../../core/extension';
-import { UmbDataTypeStore } from '../../core/stores/data-type.store';
-import { DataTypeEntity } from '../../mocks/data/content.data';
+import { UmbContextConsumerMixin } from '../../../core/context';
+import { createExtensionElement, UmbExtensionManifest, UmbExtensionRegistry } from '../../../core/extension';
+import { UmbDataTypeStore } from '../../../core/stores/data-type.store';
+import { DataTypeEntity } from '../../../mocks/data/content.data';
 
 @customElement('umb-node-property')
 class UmbNodeProperty extends UmbContextConsumerMixin(LitElement) {
diff --git a/src/Umbraco.Web.UI.Client/src/section/section-dashboards.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/section-dashboards.element.ts
similarity index 96%
rename from src/Umbraco.Web.UI.Client/src/section/section-dashboards.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/components/section-dashboards.element.ts
index e25094ae53..95c40b3988 100644
--- a/src/Umbraco.Web.UI.Client/src/section/section-dashboards.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/section-dashboards.element.ts
@@ -4,8 +4,8 @@ import { customElement, state } from 'lit/decorators.js';
 import { IRoutingInfo } from 'router-slot';
 import { map, Subscription } from 'rxjs';
 
-import { UmbContextConsumerMixin } from '../core/context';
-import { createExtensionElement, UmbExtensionManifestDashboard, UmbExtensionRegistry } from '../core/extension';
+import { UmbContextConsumerMixin } from '../../core/context';
+import { createExtensionElement, UmbExtensionManifestDashboard, UmbExtensionRegistry } from '../../core/extension';
 
 @customElement('umb-section-dashboards')
 export class UmbSectionDashboards extends UmbContextConsumerMixin(LitElement) {
diff --git a/src/Umbraco.Web.UI.Client/src/section/section-sidebar.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/section-sidebar.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/section/section-sidebar.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/components/section-sidebar.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/extensions/dashboards/dashboard-redirect-management.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/dashboard-redirect-management.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/extensions/dashboards/dashboard-redirect-management.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/dashboards/dashboard-redirect-management.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/extensions/dashboards/dashboard-welcome.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/dashboard-welcome.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/extensions/dashboards/dashboard-welcome.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/dashboards/dashboard-welcome.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/extensions/property-editors/external-property-editor-test.js b/src/Umbraco.Web.UI.Client/src/backoffice/property-editors/external-property-editor-test.js
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/extensions/property-editors/external-property-editor-test.js
rename to src/Umbraco.Web.UI.Client/src/backoffice/property-editors/external-property-editor-test.js
diff --git a/src/Umbraco.Web.UI.Client/src/extensions/property-editors/property-editor-context-example.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-editors/property-editor-context-example.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/extensions/property-editors/property-editor-context-example.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/property-editors/property-editor-context-example.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/extensions/property-editors/property-editor-text.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-editors/property-editor-text.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/extensions/property-editors/property-editor-text.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/property-editors/property-editor-text.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/extensions/property-editors/property-editor-textarea.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-editors/property-editor-textarea.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/extensions/property-editors/property-editor-textarea.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/property-editors/property-editor-textarea.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-editor.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-editor.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-editor.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-editor.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-section.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-section.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts
index 62deeddc8d..cd1727ecc6 100644
--- a/src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-section.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts
@@ -23,7 +23,7 @@ export class UmbContentSection extends LitElement {
   private _routes: Array<IRoute> = [
     {
       path: 'dashboard',
-      component: () => import('../../../section/section-dashboards.element'),
+      component: () => import('../../components/section-dashboards.element'),
       setup: () => {
         this._currentNodeId = undefined;
       },
diff --git a/src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-tree.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-tree.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-tree.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-tree.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/extensions/sections/content/editor-views/content-edit-editor-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/editor-views/content-edit-editor-view.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/extensions/sections/content/editor-views/content-edit-editor-view.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/sections/content/editor-views/content-edit-editor-view.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/extensions/sections/content/editor-views/content-info-editor-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/editor-views/content-info-editor-view.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/extensions/sections/content/editor-views/content-info-editor-view.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/sections/content/editor-views/content-info-editor-view.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/extensions/sections/settings/settings-section.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/settings/settings-section.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/extensions/sections/settings/settings-section.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/sections/settings/settings-section.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/index.ts b/src/Umbraco.Web.UI.Client/src/index.ts
index bbd30dc054..e07890f5d5 100644
--- a/src/Umbraco.Web.UI.Client/src/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/index.ts
@@ -33,7 +33,7 @@ const registerInternalManifests = async () => {
       alias: 'Umb.Section.Content',
       name: 'Content',
       elementName: 'umb-content-section',
-      js: () => import('./extensions/sections/content/content-section.element'),
+      js: () => import('./backoffice/sections/content/content-section.element'),
       meta: {
         pathname: 'content', // TODO: how to we want to support pretty urls?
         weight: 50,
@@ -54,7 +54,7 @@ const registerInternalManifests = async () => {
       alias: 'Umb.Section.Settings',
       name: 'Settings',
       elementName: 'umb-settings-section',
-      js: () => import('./extensions/sections/settings/settings-section.element'),
+      js: () => import('./backoffice/sections/settings/settings-section.element'),
       meta: {
         pathname: 'settings', // TODO: how to we want to support pretty urls?
         weight: 20,
@@ -65,7 +65,7 @@ const registerInternalManifests = async () => {
       alias: 'Umb.Dashboard.Welcome',
       name: 'Welcome',
       elementName: 'umb-dashboard-welcome',
-      js: () => import('./extensions/dashboards/dashboard-welcome.element'),
+      js: () => import('./backoffice/dashboards/dashboard-welcome.element'),
       meta: {
         sections: ['Umb.Section.Content'],
         pathname: 'welcome', // TODO: how to we want to support pretty urls?
@@ -77,7 +77,7 @@ const registerInternalManifests = async () => {
       alias: 'Umb.Dashboard.RedirectManagement',
       name: 'Redirect Management',
       elementName: 'umb-dashboard-redirect-management',
-      js: () => import('./extensions/dashboards/dashboard-redirect-management.element'),
+      js: () => import('./backoffice/dashboards/dashboard-redirect-management.element'),
       meta: {
         sections: ['Umb.Section.Content'],
         pathname: 'redirect-management', // TODO: how to we want to support pretty urls?
@@ -89,7 +89,7 @@ const registerInternalManifests = async () => {
       alias: 'Umb.PropertyEditorUI.Text',
       name: 'Text',
       //elementName: 'umb-property-editor-text',
-      js: () => import('./extensions/property-editors/property-editor-text.element'),
+      js: () => import('./backoffice/property-editors/property-editor-text.element'),
       meta: {
         icon: 'document',
         group: 'common',
@@ -100,7 +100,7 @@ const registerInternalManifests = async () => {
       alias: 'External.PropertyEditorUI.Test',
       name: 'Text',
       //elementName: 'external-property-editor-test', //Gets the element name from JS file.
-      js: '/src/extensions/property-editors/external-property-editor-test.js',
+      js: '/src/backoffice/property-editors/external-property-editor-test.js',
       meta: {
         icon: 'document',
         group: 'common',
@@ -123,7 +123,7 @@ const registerInternalManifests = async () => {
       alias: 'Umb.PropertyEditorUI.Textarea',
       name: 'Textarea',
       elementName: 'umb-property-editor-textarea',
-      js: () => import('./extensions/property-editors/property-editor-textarea.element'),
+      js: () => import('./backoffice/property-editors/property-editor-textarea.element'),
       meta: {
         icon: 'document',
         group: 'common',
@@ -133,7 +133,7 @@ const registerInternalManifests = async () => {
       type: 'propertyEditorUI',
       alias: 'Umb.PropertyEditorUI.ContextExample',
       name: 'Context Example',
-      js: () => import('./extensions/property-editors/property-editor-context-example.element'),
+      js: () => import('./backoffice/property-editors/property-editor-context-example.element'),
       meta: {
         icon: 'document',
         group: 'common',
@@ -144,7 +144,7 @@ const registerInternalManifests = async () => {
       alias: 'Umb.EditorView.ContentEdit',
       name: 'Content',
       elementName: 'umb-content-edit-editor-view',
-      js: () => import('./extensions/sections/content/editor-views/content-edit-editor-view.element'),
+      js: () => import('./backoffice/sections/content/editor-views/content-edit-editor-view.element'),
       meta: {
         pathname: 'content',
         weight: 100,
@@ -156,7 +156,7 @@ const registerInternalManifests = async () => {
       alias: 'Umb.EditorView.ContentInfo',
       name: 'Info',
       elementName: 'umb-content-info-editor-view',
-      js: () => import('./extensions/sections/content/editor-views/content-info-editor-view.element'),
+      js: () => import('./backoffice/sections/content/editor-views/content-info-editor-view.element'),
       meta: {
         pathname: 'info',
         weight: 90,