diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 03c39839e0..95523a6456 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -36,6 +36,7 @@
 		"./modal": "./dist-cms/packages/core/modal/index.js",
 		"./notification": "./dist-cms/packages/core/notification/index.js",
 		"./picker-input": "./dist-cms/packages/core/picker-input/index.js",
+		"./property": "./dist-cms/packages/core/property/index.js",
 		"./property-action": "./dist-cms/packages/core/property-action/index.js",
 		"./property-editor": "./dist-cms/packages/core/property-editor/index.js",
 		"./section": "./dist-cms/packages/core/section/index.js",
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property/index.ts
new file mode 100644
index 0000000000..16c1e01014
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property/index.ts
@@ -0,0 +1 @@
+export * from './property/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/property/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/property/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/property/property/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/property/property.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.context.ts
similarity index 98%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/property/property.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.context.ts
index 888f597dbb..71b50449b9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/property/property.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.context.ts
@@ -1,5 +1,5 @@
 import { UmbPropertyEditorUiElement } from '../../extension-registry/interfaces/property-editor-ui-element.interface.js';
-import { type WorkspacePropertyData } from '../types/workspace-property-data.type.js';
+import { type WorkspacePropertyData } from '../../workspace/types/workspace-property-data.type.js';
 import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/workspace';
 import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
 import { type UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/property/property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/property/property.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/property/property.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/property/property.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/index.ts
index 996eced338..820f4706a7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/index.ts
@@ -9,6 +9,6 @@ export * from './workspace-footer/index.js';
 export * from './workspace-is-new-redirect-controller/index.js';
 export * from './workspace-modal/index.js';
 export * from './property-layout/property-layout.element.js';
-export * from './property/index.js';
+export * from '../property/property/index.js';
 export * from './workspace-split-view-manager.class.js';
 export * from './workspace-split-view/index.js';
diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json
index 9aeafe340d..a09ebfc104 100644
--- a/src/Umbraco.Web.UI.Client/tsconfig.json
+++ b/src/Umbraco.Web.UI.Client/tsconfig.json
@@ -70,6 +70,7 @@
 			"@umbraco-cms/backoffice/modal": ["src/packages/core/modal"],
 			"@umbraco-cms/backoffice/notification": ["src/packages/core/notification"],
 			"@umbraco-cms/backoffice/picker-input": ["src/packages/core/picker-input"],
+			"@umbraco-cms/backoffice/property": ["src/packages/core/property"],
 			"@umbraco-cms/backoffice/property-action": ["src/packages/core/property-action"],
 			"@umbraco-cms/backoffice/property-editor": ["src/packages/core/property-editor"],
 			"@umbraco-cms/backoffice/section": ["src/packages/core/section"],
@@ -126,7 +127,14 @@
 			"@umbraco-cms/internal/test-utils": ["utils/test-utils.ts"]
 		}
 	},
-	"include": ["src/**/*.ts", "apps/**/*.ts", "e2e/**/*.ts", "index.ts", "storybook/stories/**/*.ts", "examples/**/*.ts", ],
+	"include": [
+		"src/**/*.ts",
+		"apps/**/*.ts",
+		"e2e/**/*.ts",
+		"index.ts",
+		"storybook/stories/**/*.ts",
+		"examples/**/*.ts"
+	],
 	"references": [
 		{
 			"path": "./tsconfig.node.json"
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 536a090da9..e48ec6415c 100644
--- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
+++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
@@ -72,6 +72,7 @@ export default {
 						'@umbraco-cms/backoffice/modal': './src/packages/core/modal/index.ts',
 						'@umbraco-cms/backoffice/notification': './src/packages/core/notification/index.ts',
 						'@umbraco-cms/backoffice/picker-input': './src/packages/core/picker-input/index.ts',
+						'@umbraco-cms/backoffice/property': './src/packages/core/property/index.ts',
 						'@umbraco-cms/backoffice/property-action': './src/packages/core/property-action/index.ts',
 						'@umbraco-cms/backoffice/property-editor': './src/packages/core/property-editor/index.ts',
 						'@umbraco-cms/backoffice/section': './src/packages/core/section/index.ts',