diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/collection-view.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/collection-view.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/collection-view.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/collection-view.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/dashboard-collection.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/dashboard-collection.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/dashboard-collection.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/dashboard-collection.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/dashboard.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/dashboard.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/dashboard.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/dashboard.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/entity-action.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/entity-action.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/entity-action.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/entity-action.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/entity-bulk-action.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/entity-bulk-action.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/entity-bulk-action.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/entity-bulk-action.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/external-login-provider.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/external-login-provider.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/external-login-provider.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/external-login-provider.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/header-app.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/header-app.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/header-app.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/header-app.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/health-check.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/health-check.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/health-check.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/health-check.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/menu-item.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/menu-item.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/menu-item.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/menu-item.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/menu.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/menu.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/menu.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/menu.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/modal.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/modal.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/modal.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/modal.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/models.ts
similarity index 72%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/models.ts
index 269c397df2..08d5cd0ac4 100644
--- a/src/Umbraco.Web.UI.Client/libs/extensions-registry/models.ts
+++ b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/models.ts
@@ -1,59 +1,59 @@
-import type { ManifestCollectionView } from './collection-view.models';
-import type { ManifestDashboard } from './dashboard.models';
-import type { ManifestDashboardCollection } from './dashboard-collection.models';
-import type { ManifestEntityAction } from './entity-action.models';
-import type { ManifestEntityBulkAction } from './entity-bulk-action.models';
-import type { ManifestExternalLoginProvider } from './external-login-provider.models';
-import type { ManifestHeaderApp, ManifestHeaderAppButtonKind } from './header-app.models';
-import type { ManifestHealthCheck } from './health-check.models';
-import type { ManifestPackageView } from './package-view.models';
-import type { ManifestPropertyAction } from './property-action.models';
-import type { ManifestPropertyEditorUI, ManifestPropertyEditorModel } from './property-editor.models';
-import type { ManifestSection } from './section.models';
-import type { ManifestSectionView } from './section-view.models';
-import type { ManifestSectionSidebarApp, ManifestSectionSidebarAppMenuKind } from './section-sidebar-app.models';
-import type { ManifestMenu } from './menu.models';
-import type { ManifestMenuItem, ManifestMenuItemTreeKind } from './menu-item.models';
-import type { ManifestTheme } from './theme.models';
-import type { ManifestTree } from './tree.models';
-import type { ManifestTreeItem } from './tree-item.models';
-import type { ManifestUserProfileApp } from './user-profile-app.models';
-import type { ManifestWorkspace } from './workspace.models';
-import type { ManifestWorkspaceAction } from './workspace-action.models';
-import type { ManifestWorkspaceView } from './workspace-view.models';
-import type { ManifestWorkspaceViewCollection } from './workspace-view-collection.models';
-import type { ManifestRepository } from './repository.models';
-import type { ManifestModal } from './modal.models';
-import type { ManifestStore, ManifestTreeStore, ManifestItemStore } from './store.models';
+import type { ManifestCollectionView } from './collection-view.model';
+import type { ManifestDashboard } from './dashboard.model';
+import type { ManifestDashboardCollection } from './dashboard-collection.model';
+import type { ManifestEntityAction } from './entity-action.model';
+import type { ManifestEntityBulkAction } from './entity-bulk-action.model';
+import type { ManifestExternalLoginProvider } from './external-login-provider.model';
+import type { ManifestHeaderApp, ManifestHeaderAppButtonKind } from './header-app.model';
+import type { ManifestHealthCheck } from './health-check.model';
+import type { ManifestPackageView } from './package-view.model';
+import type { ManifestPropertyAction } from './property-action.model';
+import type { ManifestPropertyEditorUI, ManifestPropertyEditorModel } from './property-editor.model';
+import type { ManifestSection } from './section.model';
+import type { ManifestSectionView } from './section-view.model';
+import type { ManifestSectionSidebarApp, ManifestSectionSidebarAppMenuKind } from './section-sidebar-app.model';
+import type { ManifestMenu } from './menu.model';
+import type { ManifestMenuItem, ManifestMenuItemTreeKind } from './menu-item.model';
+import type { ManifestTheme } from './theme.model';
+import type { ManifestTree } from './tree.model';
+import type { ManifestTreeItem } from './tree-item.model';
+import type { ManifestUserProfileApp } from './user-profile-app.model';
+import type { ManifestWorkspace } from './workspace.model';
+import type { ManifestWorkspaceAction } from './workspace-action.model';
+import type { ManifestWorkspaceView } from './workspace-view.model';
+import type { ManifestWorkspaceViewCollection } from './workspace-view-collection.model';
+import type { ManifestRepository } from './repository.model';
+import type { ManifestModal } from './modal.model';
+import type { ManifestStore, ManifestTreeStore, ManifestItemStore } from './store.model';
 import type { ClassConstructor } from '@umbraco-cms/backoffice/models';
 
-export * from './collection-view.models';
-export * from './dashboard-collection.models';
-export * from './dashboard.models';
-export * from './entity-action.models';
-export * from './entity-bulk-action.models';
-export * from './external-login-provider.models';
-export * from './header-app.models';
-export * from './health-check.models';
-export * from './package-view.models';
-export * from './property-action.models';
-export * from './property-editor.models';
-export * from './section-view.models';
-export * from './section.models';
-export * from './section-sidebar-app.models';
-export * from './menu.models';
-export * from './menu-item.models';
-export * from './theme.models';
-export * from './tree.models';
-export * from './tree-item.models';
-export * from './user-profile-app.models';
-export * from './workspace-action.models';
-export * from './workspace-view-collection.models';
-export * from './workspace-view.models';
-export * from './repository.models';
-export * from './store.models';
-export * from './workspace.models';
-export * from './modal.models';
+export * from './collection-view.model';
+export * from './dashboard-collection.model';
+export * from './dashboard.model';
+export * from './entity-action.model';
+export * from './entity-bulk-action.model';
+export * from './external-login-provider.model';
+export * from './header-app.model';
+export * from './health-check.model';
+export * from './package-view.model';
+export * from './property-action.model';
+export * from './property-editor.model';
+export * from './section-view.model';
+export * from './section.model';
+export * from './section-sidebar-app.model';
+export * from './menu.model';
+export * from './menu-item.model';
+export * from './theme.model';
+export * from './tree.model';
+export * from './tree-item.model';
+export * from './user-profile-app.model';
+export * from './workspace-action.model';
+export * from './workspace-view-collection.model';
+export * from './workspace-view.model';
+export * from './repository.model';
+export * from './store.model';
+export * from './workspace.model';
+export * from './modal.model';
 
 export type ManifestTypes =
 	| ManifestCollectionView
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/package-view.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/package-view.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/package-view.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/package-view.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/property-action.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/property-action.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/property-action.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/property-action.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/property-editor.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/property-editor.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/property-editor.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/property-editor.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/repository.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/repository.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/repository.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/repository.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/section-sidebar-app.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/section-sidebar-app.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/section-sidebar-app.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/section-sidebar-app.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/section-view.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/section-view.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/section-view.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/section-view.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/section.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/section.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/section.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/section.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/store.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/store.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/store.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/store.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/theme.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/theme.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/theme.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/theme.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/tree-item.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/tree-item.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/tree-item.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/tree-item.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/tree.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/tree.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/tree.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/tree.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/user-profile-app.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/user-profile-app.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/user-profile-app.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/user-profile-app.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace-action.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-action.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace-action.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-action.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace-view-collection.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-view-collection.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace-view-collection.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-view-collection.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace-view.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-view.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace-view.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-view.model.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace.models.ts
rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace.model.ts