diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/manifests.ts
index 4a593776bc..806ce0f556 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/manifests.ts
@@ -1,42 +1,4 @@
-import type {
-	ManifestWorkspaces,
-	ManifestWorkspaceActions,
-	ManifestWorkspaceView,
-	ManifestTypes,
-} from '@umbraco-cms/backoffice/extension-registry';
-import { UmbSubmitWorkspaceAction } from '@umbraco-cms/backoffice/workspace';
+import { manifests as userGroupManifests } from './user-group/manifests.js';
+import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry';
 
-const workspace: ManifestWorkspaces = {
-	type: 'workspace',
-	kind: 'routable',
-	alias: 'Umb.Workspace.UserGroup',
-	name: 'User Group Workspace',
-	api: () => import('./user-group-workspace.context.js'),
-	meta: {
-		entityType: 'user-group',
-	},
-};
-
-const workspaceViews: Array<ManifestWorkspaceView> = [];
-const workspaceActions: Array<ManifestWorkspaceActions> = [
-	{
-		type: 'workspaceAction',
-		kind: 'default',
-		alias: 'Umb.WorkspaceAction.UserGroup.Save',
-		name: 'Save User Group Workspace Action',
-		api: UmbSubmitWorkspaceAction,
-		meta: {
-			label: '#buttons_save',
-			look: 'primary',
-			color: 'positive',
-		},
-		conditions: [
-			{
-				alias: 'Umb.Condition.WorkspaceAlias',
-				match: workspace.alias,
-			},
-		],
-	},
-];
-
-export const manifests: Array<ManifestTypes> = [workspace, ...workspaceViews, ...workspaceActions];
+export const manifests: Array<ManifestTypes | UmbBackofficeManifestKind> = [...userGroupManifests];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-entity-user-permission-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/components/user-group-entity-user-permission-list.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-entity-user-permission-list.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/components/user-group-entity-user-permission-list.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-granular-permission-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/components/user-group-granular-permission-list.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-granular-permission-list.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/components/user-group-granular-permission-list.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/constants.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/constants.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/constants.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/manifests.ts
new file mode 100644
index 0000000000..4a593776bc
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/manifests.ts
@@ -0,0 +1,42 @@
+import type {
+	ManifestWorkspaces,
+	ManifestWorkspaceActions,
+	ManifestWorkspaceView,
+	ManifestTypes,
+} from '@umbraco-cms/backoffice/extension-registry';
+import { UmbSubmitWorkspaceAction } from '@umbraco-cms/backoffice/workspace';
+
+const workspace: ManifestWorkspaces = {
+	type: 'workspace',
+	kind: 'routable',
+	alias: 'Umb.Workspace.UserGroup',
+	name: 'User Group Workspace',
+	api: () => import('./user-group-workspace.context.js'),
+	meta: {
+		entityType: 'user-group',
+	},
+};
+
+const workspaceViews: Array<ManifestWorkspaceView> = [];
+const workspaceActions: Array<ManifestWorkspaceActions> = [
+	{
+		type: 'workspaceAction',
+		kind: 'default',
+		alias: 'Umb.WorkspaceAction.UserGroup.Save',
+		name: 'Save User Group Workspace Action',
+		api: UmbSubmitWorkspaceAction,
+		meta: {
+			label: '#buttons_save',
+			look: 'primary',
+			color: 'positive',
+		},
+		conditions: [
+			{
+				alias: 'Umb.Condition.WorkspaceAlias',
+				match: workspace.alias,
+			},
+		],
+	},
+];
+
+export const manifests: Array<ManifestTypes> = [workspace, ...workspaceViews, ...workspaceActions];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts
similarity index 98%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace-editor.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts
index a4d129dd04..01835e7c2a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts
@@ -1,5 +1,5 @@
-import type { UmbUserGroupDetailModel } from '../index.js';
-import { UMB_USER_GROUP_ROOT_WORKSPACE_PATH } from '../paths.js';
+import type { UmbUserGroupDetailModel } from '../../index.js';
+import { UMB_USER_GROUP_ROOT_WORKSPACE_PATH } from '../../paths.js';
 import { UMB_USER_GROUP_WORKSPACE_CONTEXT } from './user-group-workspace.context-token.js';
 import { UMB_USER_GROUP_WORKSPACE_ALIAS } from './constants.js';
 import type { UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace.context-token.ts
similarity index 89%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context-token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace.context-token.ts
index a09ae6a716..3a11176569 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context-token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace.context-token.ts
@@ -1,4 +1,4 @@
-import { UMB_USER_GROUP_ENTITY_TYPE } from '../index.js';
+import { UMB_USER_GROUP_ENTITY_TYPE } from '../../index.js';
 import type { UmbUserGroupWorkspaceContext } from './user-group-workspace.context.js';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import type { UmbSubmittableWorkspaceContext } from '@umbraco-cms/backoffice/workspace';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace.context.ts
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace.context.ts
index c360e2057f..6f81961747 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace.context.ts
@@ -1,5 +1,5 @@
-import { UmbUserGroupDetailRepository } from '../repository/detail/index.js';
-import type { UmbUserGroupDetailModel } from '../types.js';
+import { UmbUserGroupDetailRepository } from '../../repository/detail/index.js';
+import type { UmbUserGroupDetailModel } from '../../types.js';
 import { UmbUserGroupWorkspaceEditorElement } from './user-group-workspace-editor.element.js';
 import type { UmbUserPermissionModel } from '@umbraco-cms/backoffice/user-permission';
 import type { UmbRoutableWorkspaceContext, UmbSubmittableWorkspaceContext } from '@umbraco-cms/backoffice/workspace';