diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 5f60362d29..5d7a769b0b 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -68,6 +68,7 @@
 		"./user-group": "./dist-cms/packages/users/user-groups/index.js",
 		"./current-user": "./dist-cms/packages/users/current-user/index.js",
 		"./users": "./dist-cms/packages/users/users/index.js",
+		"./user-permission": "./dist-cms/packages/users/user-permission/index.js",
 		"./code-editor": "./dist-cms/packages/templating/code-editor/index.js",
 		"./external/*": "./dist-cms/external/*/index.js"
 	},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts
index 943dbe8d41..50df0dfc1a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts
@@ -2,7 +2,7 @@ import type { SectionAliasConditionConfig } from './section-alias.condition.js';
 import type { SwitchConditionConfig } from './switch.condition.js';
 import type { WorkspaceAliasConditionConfig } from '@umbraco-cms/backoffice/workspace';
 import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api';
-import type { UserPermissionConditionConfig } from '@umbraco-cms/backoffice/current-user';
+import type { UserPermissionConditionConfig } from '@umbraco-cms/backoffice/user-permission';
 
 /* TODO: in theory should't the core package import from other packages.
 Are there any other way we can do this? */
diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json
index d4de6fd9d6..af2c59e17a 100644
--- a/src/Umbraco.Web.UI.Client/tsconfig.json
+++ b/src/Umbraco.Web.UI.Client/tsconfig.json
@@ -19,6 +19,7 @@
 		"baseUrl": ".",
 		"incremental": true,
 		"paths": {
+			// TODO: can we combine these of multiple tsconfigs so each package can hold their own?
 			// APPS
 			"@umbraco-cms/backoffice/app": ["src/apps/app"],
 
@@ -79,34 +80,42 @@
 			"@umbraco-cms/backoffice/workspace": ["src/packages/core/workspace"],
 			"@umbraco-cms/backoffice/culture": ["src/packages/core/culture"],
 
-			"@umbraco-cms/backoffice/dictionary": ["./src/packages/dictionary/dictionary/index.ts"],
-
-			"@umbraco-cms/backoffice/document": ["./src/packages/documents/documents/index.ts"],
-			"@umbraco-cms/backoffice/document-blueprint": ["./src/packages/documents/document-blueprints/index.ts"],
-			"@umbraco-cms/backoffice/document-type": ["./src/packages/documents/document-types/index.ts"],
-			"@umbraco-cms/backoffice/media": ["./src/packages/media/media/index.ts"],
-			"@umbraco-cms/backoffice/media-type": ["./src/packages/media/media-types/index.ts"],
-			"@umbraco-cms/backoffice/member": ["./src/packages/members/members/index.ts"],
-			"@umbraco-cms/backoffice/member-group": ["./src/packages/members/member-groups/index.ts"],
-			"@umbraco-cms/backoffice/member-type": ["./src/packages/members/member-types/index.ts"],
-			"@umbraco-cms/backoffice/package": ["./src/packages/packages/package/index.ts"],
-
 			"@umbraco-cms/backoffice/data-type": ["./src/packages/settings/data-types/index.ts"],
 			"@umbraco-cms/backoffice/language": ["./src/packages/settings/languages/index.ts"],
 			"@umbraco-cms/backoffice/logviewer": ["src/packages/log-viewer/index.ts"],
 			"@umbraco-cms/backoffice/relation-type": ["./src/packages/settings/relation-types/index.ts"],
 			"@umbraco-cms/backoffice/tags": ["./src/packages/tags/index.ts"],
-			"@umbraco-cms/backoffice/partial-view": ["./src/packages/templating/partial-views/index.ts"],
-			"@umbraco-cms/backoffice/stylesheet": ["./src/packages/templating/stylesheets/index.ts"],
-			"@umbraco-cms/backoffice/template": ["./src/packages/templating/templates/index.ts"],
 
-			// USERS
+			"@umbraco-cms/backoffice/dictionary": ["./src/packages/dictionary/dictionary/index.ts"],
+
+			// DOCUMENT MANAGEMENT
+			"@umbraco-cms/backoffice/document": ["./src/packages/documents/documents/index.ts"],
+			"@umbraco-cms/backoffice/document-blueprint": ["./src/packages/documents/document-blueprints/index.ts"],
+			"@umbraco-cms/backoffice/document-type": ["./src/packages/documents/document-types/index.ts"],
+
+			// MEDIA MANAGEMENT
+			"@umbraco-cms/backoffice/media": ["./src/packages/media/media/index.ts"],
+			"@umbraco-cms/backoffice/media-type": ["./src/packages/media/media-types/index.ts"],
+
+			// MEMBER MANAGEMENT
+			"@umbraco-cms/backoffice/member": ["./src/packages/members/members/index.ts"],
+			"@umbraco-cms/backoffice/member-group": ["./src/packages/members/member-groups/index.ts"],
+			"@umbraco-cms/backoffice/member-type": ["./src/packages/members/member-types/index.ts"],
+
+			// PACKAGE MANAGEMENT
+			"@umbraco-cms/backoffice/package": ["./src/packages/packages/package/index.ts"],
+
+			// USER MANAGEMENT
 			"@umbraco-cms/backoffice/user-group": ["src/packages/users/user-groups"],
 			"@umbraco-cms/backoffice/current-user": ["src/packages/users/current-user"],
 			"@umbraco-cms/backoffice/users": ["src/packages/users/users"],
+			"@umbraco-cms/backoffice/user-permission": ["src/packages/users/user-permission"],
 
 			// TEMPLATING
 			"@umbraco-cms/backoffice/code-editor": ["src/packages/templating/code-editor"],
+			"@umbraco-cms/backoffice/partial-view": ["./src/packages/templating/partial-views/index.ts"],
+			"@umbraco-cms/backoffice/stylesheet": ["./src/packages/templating/stylesheets/index.ts"],
+			"@umbraco-cms/backoffice/template": ["./src/packages/templating/templates/index.ts"],
 
 			"@umbraco-cms/backoffice/css": ["src/shared/css/custom-properties.css"],
 
diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
index 397aed2b1b..c1fbdd8be6 100644
--- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
+++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
@@ -104,6 +104,7 @@ export default {
 						'@umbraco-cms/backoffice/user-group': './src/packages/users/user-groups/index.ts',
 						'@umbraco-cms/backoffice/current-user': './src/packages/users/current-user/index.ts',
 						'@umbraco-cms/backoffice/users': './src/packages/users/users/index.ts',
+						'@umbraco-cms/backoffice/user-permission': './src/packages/users/user-permission/index.ts',
 
 						'@umbraco-cms/backoffice/code-editor': './src/packages/templating/code-editor/index.ts',