diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts
index 0769aec30e..fe44c32d7e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts
@@ -2,7 +2,7 @@ import { UmbDictionaryPickerContext } from '../../../dictionary/components/input
 import { UmbPackageRepository } from '../../package/repository/index.js';
 import { UmbPartialViewPickerContext } from '../../../templating/partial-views/components/input-partial-view/input-partial-view.context.js';
 import { UmbScriptPickerContext } from '../../../templating/scripts/components/input-script/input-script.context.js';
-import { UmbStylesheetPickerContext } from '../../../templating/stylesheets/components/stylesheet-input/stylesheet-input.context.js';
+import { UmbStylesheetPickerContext } from '../../../templating/stylesheets/global-components/stylesheet-input/stylesheet-input.context.js';
 import { UmbTemplatePickerContext } from '../../../templating/templates/global-components/input-template/input-template.context.js';
 import type { UmbCreatedPackageDefinition } from '../../types.js';
 import type { UmbDataTypeInputElement } from '../../../data-type/components/data-type-input/data-type-input.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-input/index.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-input/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-input/stylesheet-input.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/stylesheet-input.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-input/stylesheet-input.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/stylesheet-input.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-input/stylesheet-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/stylesheet-input.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-input/stylesheet-input.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/stylesheet-input.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-input/stylesheet-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/stylesheet-picker-modal.token.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-input/stylesheet-picker-modal.token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/stylesheet-picker-modal.token.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-rule-input/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-rule-input/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-rule-input/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-rule-input/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-rule-input/stylesheet-rule-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-rule-input/stylesheet-rule-input.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-rule-input/stylesheet-rule-input.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-rule-input/stylesheet-rule-input.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-rule-input/stylesheet-rule-settings-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-rule-input/stylesheet-rule-settings-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-rule-input/stylesheet-rule-settings-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-rule-input/stylesheet-rule-settings-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-rule-input/stylesheet-rule-settings-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-rule-input/stylesheet-rule-settings-modal.token.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-rule-input/stylesheet-rule-settings-modal.token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-rule-input/stylesheet-rule-settings-modal.token.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-rule-ref/stylesheet-rule-ref.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-rule-ref/stylesheet-rule-ref.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-rule-ref/stylesheet-rule-ref.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-rule-ref/stylesheet-rule-ref.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/index.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/index.ts
index c8d98dcffb..9e1a9d4dde 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/index.ts
@@ -1,4 +1,4 @@
-import './components/index.js';
+import './global-components/index.js';
 
 export * from './repository/index.js';
 export * from './entity.js';
@@ -6,9 +6,9 @@ export * from './entity.js';
 export { UmbStylesheetTreeRepository } from './tree/index.js';
 
 // Components
-export { UmbStylesheetRuleInputElement } from './components/index.js';
-export { UmbStylesheetInputElement } from './components/index.js';
-export { UMB_STYLESHEET_PICKER_MODAL } from './components/index.js';
+export { UmbStylesheetRuleInputElement } from './global-components/index.js';
+export { UmbStylesheetInputElement } from './global-components/index.js';
+export { UMB_STYLESHEET_PICKER_MODAL } from './global-components/index.js';
 
 // Utils
 export { UmbStylesheetRuleManager } from './utils/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/manifests.ts
index 61cf551469..5d262392ce 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/manifests.ts
@@ -3,7 +3,7 @@ import { manifests as menuManifests } from './menu/manifests.js';
 import { manifests as treeManifests } from './tree/manifests.js';
 import { manifests as workspaceManifests } from './workspace/manifests.js';
 import { manifests as entityActionManifests } from './entity-actions/manifests.js';
-import { manifests as componentManifests } from './components/manifests.js';
+import { manifests as componentManifests } from './global-components/manifests.js';
 import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
 export const manifests: Array<ManifestTypes> = [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/views/rich-text-rule/stylesheet-rich-text-rule-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/views/rich-text-rule/stylesheet-rich-text-rule-workspace-view.element.ts
index 2661159b09..3c821705f8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/views/rich-text-rule/stylesheet-rich-text-rule-workspace-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/views/rich-text-rule/stylesheet-rich-text-rule-workspace-view.element.ts
@@ -1,5 +1,5 @@
 import type { UmbStylesheetRule } from '../../../types.js';
-import type { UmbStylesheetRuleInputElement } from '../../../components/index.js';
+import type { UmbStylesheetRuleInputElement } from '../../../global-components/index.js';
 import { UmbStylesheetRuleManager } from '../../../utils/index.js';
 import { UMB_STYLESHEET_WORKSPACE_CONTEXT } from '../../stylesheet-workspace.context-token.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';