diff --git a/src/Umbraco.Web.UI.Client/src/app.ts b/src/Umbraco.Web.UI.Client/src/app.ts
index ba60d5c8b1..434bd01c62 100644
--- a/src/Umbraco.Web.UI.Client/src/app.ts
+++ b/src/Umbraco.Web.UI.Client/src/app.ts
@@ -11,9 +11,9 @@ import { UmbNodeStore } from './core/stores/node.store';
 import { UmbDataTypeStore } from './core/stores/data-type.store';
 
 // Load these in the correct components
-import './node-editor/node-editor-layout.element';
-import './node-editor/node-property-data-type.element';
-import './node-editor/node-property.element';
+import './editors/node-editor/node-editor-layout.element';
+import './editors/node-editor/node-property-data-type.element';
+import './editors/node-editor/node-property.element';
 
 const routes = [
   {
diff --git a/src/Umbraco.Web.UI.Client/src/node-editor/node-editor-layout.element.ts b/src/Umbraco.Web.UI.Client/src/editors/node-editor/node-editor-layout.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/node-editor/node-editor-layout.element.ts
rename to src/Umbraco.Web.UI.Client/src/editors/node-editor/node-editor-layout.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/node-editor/node-property-data-type.element.ts b/src/Umbraco.Web.UI.Client/src/editors/node-editor/node-property-data-type.element.ts
similarity index 93%
rename from src/Umbraco.Web.UI.Client/src/node-editor/node-property-data-type.element.ts
rename to src/Umbraco.Web.UI.Client/src/editors/node-editor/node-property-data-type.element.ts
index 11ef11f9dc..3007a3c4b3 100644
--- a/src/Umbraco.Web.UI.Client/src/node-editor/node-property-data-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/editors/node-editor/node-property-data-type.element.ts
@@ -1,12 +1,12 @@
 import { css, html, LitElement, PropertyValueMap } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, property, state } from 'lit/decorators.js';
-import { UmbContextConsumerMixin } from '../core/context';
-import { UmbDataTypeStore } from '../core/stores/data-type.store';
+import { UmbContextConsumerMixin } from '../../core/context';
+import { UmbDataTypeStore } from '../../core/stores/data-type.store';
 import { Subscription, map, switchMap } from 'rxjs';
-import { DataTypeEntity } from '../mocks/data/content.data';
-import { UmbExtensionManifest, UmbExtensionRegistry } from '../core/extension';
-import { createExtensionElement } from '../core/extension/create-extension-element.function';
+import { DataTypeEntity } from '../../mocks/data/content.data';
+import { UmbExtensionManifest, UmbExtensionRegistry } from '../../core/extension';
+import { createExtensionElement } from '../../core/extension/create-extension-element.function';
 
 @customElement('umb-node-property-data-type')
 class UmbNodePropertyDataType extends UmbContextConsumerMixin(LitElement) {
diff --git a/src/Umbraco.Web.UI.Client/src/node-editor/node-property.element.ts b/src/Umbraco.Web.UI.Client/src/editors/node-editor/node-property.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/node-editor/node-property.element.ts
rename to src/Umbraco.Web.UI.Client/src/editors/node-editor/node-property.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/content/content-dashboards.element.ts b/src/Umbraco.Web.UI.Client/src/extensions/content/content-dashboards.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/content/content-dashboards.element.ts
rename to src/Umbraco.Web.UI.Client/src/extensions/content/content-dashboards.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/content/content-editor.element.ts b/src/Umbraco.Web.UI.Client/src/extensions/content/content-editor.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/content/content-editor.element.ts
rename to src/Umbraco.Web.UI.Client/src/extensions/content/content-editor.element.ts
index ee7f12ed0e..6670a1f6ba 100644
--- a/src/Umbraco.Web.UI.Client/src/content/content-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/extensions/content/content-editor.element.ts
@@ -1,10 +1,10 @@
 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 { UmbNodeStore } from '../core/stores/node.store';
+import { UmbContextConsumerMixin } from '../../core/context';
+import { UmbNodeStore } from '../../core/stores/node.store';
 import { Subscription } from 'rxjs';
-import { DocumentNode } from '../mocks/data/content.data';
+import { DocumentNode } from '../../mocks/data/content.data';
 
 @customElement('umb-content-editor')
 export class UmbContentEditor extends UmbContextConsumerMixin(LitElement) {
@@ -63,6 +63,7 @@ export class UmbContentEditor extends UmbContextConsumerMixin(LitElement) {
     });
   }
 
+  // FLYT
   private _onPropertyValueChange(e: CustomEvent) {
     const target = e.target as any;
 
diff --git a/src/Umbraco.Web.UI.Client/src/content/content-section.element.ts b/src/Umbraco.Web.UI.Client/src/extensions/content/content-section.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/content/content-section.element.ts
rename to src/Umbraco.Web.UI.Client/src/extensions/content/content-section.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/content/content-tree.element.ts b/src/Umbraco.Web.UI.Client/src/extensions/content/content-tree.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/content/content-tree.element.ts
rename to src/Umbraco.Web.UI.Client/src/extensions/content/content-tree.element.ts
index 4181edf12b..5ad0d139e6 100644
--- a/src/Umbraco.Web.UI.Client/src/content/content-tree.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/extensions/content/content-tree.element.ts
@@ -1,7 +1,7 @@
 import { css, html, LitElement } from 'lit';
 import { customElement, state, property } from 'lit/decorators.js';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
-import { data } from '../mocks/data/content.data';
+import { data } from '../../mocks/data/content.data';
 
 @customElement('umb-content-tree')
 class UmbContentTree extends LitElement {
diff --git a/src/Umbraco.Web.UI.Client/src/dashboards/dashboard-redirect-management.element.ts b/src/Umbraco.Web.UI.Client/src/extensions/dashboards/dashboard-redirect-management.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/dashboards/dashboard-redirect-management.element.ts
rename to src/Umbraco.Web.UI.Client/src/extensions/dashboards/dashboard-redirect-management.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/dashboards/dashboard-welcome.element.ts b/src/Umbraco.Web.UI.Client/src/extensions/dashboards/dashboard-welcome.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/dashboards/dashboard-welcome.element.ts
rename to src/Umbraco.Web.UI.Client/src/extensions/dashboards/dashboard-welcome.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/property-editors/external-property-editor-test.js b/src/Umbraco.Web.UI.Client/src/extensions/property-editors/external-property-editor-test.js
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/property-editors/external-property-editor-test.js
rename to src/Umbraco.Web.UI.Client/src/extensions/property-editors/external-property-editor-test.js
diff --git a/src/Umbraco.Web.UI.Client/src/property-editors/property-editor-text.element.ts b/src/Umbraco.Web.UI.Client/src/extensions/property-editors/property-editor-text.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/property-editors/property-editor-text.element.ts
rename to src/Umbraco.Web.UI.Client/src/extensions/property-editors/property-editor-text.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/property-editors/property-editor-textarea.element.ts b/src/Umbraco.Web.UI.Client/src/extensions/property-editors/property-editor-textarea.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/property-editors/property-editor-textarea.element.ts
rename to src/Umbraco.Web.UI.Client/src/extensions/property-editors/property-editor-textarea.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/settings/settings-section.element.ts b/src/Umbraco.Web.UI.Client/src/extensions/settings/settings-section.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/settings/settings-section.element.ts
rename to src/Umbraco.Web.UI.Client/src/extensions/settings/settings-section.element.ts
index 40c2cacd66..2dbad6c07a 100644
--- a/src/Umbraco.Web.UI.Client/src/settings/settings-section.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/extensions/settings/settings-section.element.ts
@@ -2,8 +2,8 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { css, html, LitElement } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { Subscription } from 'rxjs';
-import { UmbContextConsumerMixin } from '../core/context';
-import { UmbExtensionManifest, UmbExtensionRegistry } from '../core/extension';
+import { UmbContextConsumerMixin } from '../../core/context';
+import { UmbExtensionManifest, UmbExtensionRegistry } from '../../core/extension';
 
 @customElement('umb-settings-section')
 export class UmbSettingsSection extends UmbContextConsumerMixin(LitElement) {
diff --git a/src/Umbraco.Web.UI.Client/src/index.ts b/src/Umbraco.Web.UI.Client/src/index.ts
index 08a6d3ba0c..9525aee31c 100644
--- a/src/Umbraco.Web.UI.Client/src/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/index.ts
@@ -32,7 +32,7 @@ const registerInternalManifests = async () => {
       alias: 'Umb.Section.Content',
       name: 'Content',
       elementName: 'umb-content-section',
-      js: () => import('./content/content-section.element'),
+      js: () => import('./extensions/content/content-section.element'),
       meta: {
         pathname: 'content', // TODO: how to we want to support pretty urls?
         weight: 50,
@@ -53,7 +53,7 @@ const registerInternalManifests = async () => {
       alias: 'Umb.Section.Settings',
       name: 'Settings',
       elementName: 'umb-settings-section',
-      js: () => import('./settings/settings-section.element'),
+      js: () => import('./extensions/settings/settings-section.element'),
       meta: {
         pathname: 'settings', // TODO: how to we want to support pretty urls?
         weight: 20,
@@ -64,7 +64,7 @@ const registerInternalManifests = async () => {
       alias: 'Umb.Dashboard.Welcome',
       name: 'Welcome',
       elementName: 'umb-dashboard-welcome',
-      js: () => import('./dashboards/dashboard-welcome.element'),
+      js: () => import('./extensions/dashboards/dashboard-welcome.element'),
       meta: {
         sections: ['Umb.Section.Content'],
         pathname: 'welcome', // TODO: how to we want to support pretty urls?
@@ -76,7 +76,7 @@ const registerInternalManifests = async () => {
       alias: 'Umb.Dashboard.RedirectManagement',
       name: 'Redirect Management',
       elementName: 'umb-dashboard-redirect-management',
-      js: () => import('./dashboards/dashboard-redirect-management.element'),
+      js: () => import('./extensions/dashboards/dashboard-redirect-management.element'),
       meta: {
         sections: ['Umb.Section.Content'],
         pathname: 'redirect-management', // TODO: how to we want to support pretty urls?
@@ -88,7 +88,7 @@ const registerInternalManifests = async () => {
       alias: 'Umb.PropertyEditorUI.Text',
       name: 'Text',
       //elementName: 'umb-property-editor-text',
-      js: () => import('./property-editors/property-editor-text.element'),
+      js: () => import('./extensions/property-editors/property-editor-text.element'),
       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('./property-editors/property-editor-textarea.element'),
+      js: () => import('./extensions/property-editors/property-editor-textarea.element'),
       meta: {
         icon: 'document',
         group: 'common',