diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/detail-store-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/detail/detail-store-base.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/packages/core/store/detail-store-base.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/store/detail/detail-store-base.ts
index aa6c922990..1116c0d2c4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/store/detail-store-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/detail/detail-store-base.ts
@@ -1,4 +1,4 @@
-import { UmbStoreBase } from './store-base.js';
+import { UmbStoreBase } from '../store-base.js';
 import type { UmbDetailStore } from './detail-store.interface.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/detail-store.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/detail/detail-store.interface.ts
similarity index 84%
rename from src/Umbraco.Web.UI.Client/src/packages/core/store/detail-store.interface.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/store/detail/detail-store.interface.ts
index 8cef284104..c0a656e3f6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/store/detail-store.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/detail/detail-store.interface.ts
@@ -1,4 +1,4 @@
-import type { UmbStore } from './store.interface.js';
+import type { UmbStore } from '../store.interface.js';
 import type { Observable } from '@umbraco-cms/backoffice/external/rxjs';
 import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/index.ts
index 16813063db..28e9e2116a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/store/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/index.ts
@@ -1,10 +1,10 @@
 export * from './store-base.js';
 export * from './store.interface.js';
 
-export { UmbDetailStoreBase } from './detail-store-base.js';
-export type { UmbDetailStore } from './detail-store.interface.js';
+export { UmbDetailStoreBase } from './detail/detail-store-base.js';
+export type { UmbDetailStore } from './detail/detail-store.interface.js';
 
-export { UmbItemStoreBase } from './item-store-base.js';
-export type { UmbItemStore } from './item-store.interface.js';
+export { UmbItemStoreBase } from './item/item-store-base.js';
+export type { UmbItemStore } from './item/item-store.interface.js';
 
 export { UmbStoreConnector } from './store-connector.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/item-store-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/item/item-store-base.ts
similarity index 94%
rename from src/Umbraco.Web.UI.Client/src/packages/core/store/item-store-base.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/store/item/item-store-base.ts
index 866ed90dee..31f8103477 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/store/item-store-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/item/item-store-base.ts
@@ -1,4 +1,4 @@
-import { UmbStoreBase } from './store-base.js';
+import { UmbStoreBase } from '../store-base.js';
 import type { UmbItemStore } from './item-store.interface.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/item-store.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/item/item-store.interface.ts
similarity index 84%
rename from src/Umbraco.Web.UI.Client/src/packages/core/store/item-store.interface.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/store/item/item-store.interface.ts
index 1c55e1e902..03406d15df 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/store/item-store.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/item/item-store.interface.ts
@@ -1,4 +1,4 @@
-import type { UmbStore } from './store.interface.js';
+import type { UmbStore } from '../store.interface.js';
 import type { Observable } from '@umbraco-cms/backoffice/external/rxjs';
 import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';