diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-entry-point.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-entry-point.ts
index 34d49d9576..01a54b2026 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-entry-point.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-entry-point.ts
@@ -1,4 +1,4 @@
-import { manifests as repositoryManifests } from './repository/manifests.js';
+import { manifests as repositoryManifests } from './package/repository/manifests.js';
 import { manifests as packageBuilderManifests } from './package-builder/manifests.js';
 import { manifests as packageRepoManifests } from './package-repo/manifests.js';
 import { manifests as packageSectionManifests } from './package-section/manifests.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts
index f069ad1966..6d72e50dcc 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts
@@ -1,4 +1,4 @@
-import { UmbPackageRepository } from '../../../repository/package.repository.js';
+import { UmbPackageRepository } from '../../../package/repository/package.repository.js';
 import type { UmbPackageWithMigrationStatus } from '../../../types.js';
 import { html, css, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit';
 import { combineLatest } from '@umbraco-cms/backoffice/external/rxjs';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package/index.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package/index.ts
new file mode 100644
index 0000000000..3d76f338dd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package/index.ts
@@ -0,0 +1 @@
+export * from './repository/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/index.ts
new file mode 100644
index 0000000000..437143950f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/index.ts
@@ -0,0 +1 @@
+export * from './package.repository.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/packages/repository/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/repository/package.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.repository.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/packages/repository/package.repository.ts
rename to src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.repository.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/repository/package.store.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.store.ts
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/packages/packages/repository/package.store.ts
rename to src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.store.ts
index f3292bf5ee..3b6a382bf6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/packages/repository/package.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.store.ts
@@ -1,4 +1,4 @@
-import type { UmbPackage } from '../types.js';
+import type { UmbPackage } from '../../types.js';
 import { ReplaySubject } from '@umbraco-cms/backoffice/external/rxjs';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/repository/server-extension.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/server-extension.controller.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/packages/repository/server-extension.controller.ts
rename to src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/server-extension.controller.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/repository/sources/package.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/sources/package.server.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/packages/repository/sources/package.server.data.ts
rename to src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/sources/package.server.data.ts