diff --git a/src/Umbraco.Web.UI.Client/examples/custom-modal/index.ts b/src/Umbraco.Web.UI.Client/examples/custom-modal/index.ts
index 2ddf119f38..78610ced64 100644
--- a/src/Umbraco.Web.UI.Client/examples/custom-modal/index.ts
+++ b/src/Umbraco.Web.UI.Client/examples/custom-modal/index.ts
@@ -1,14 +1,14 @@
 import type { ManifestDashboard } from '@umbraco-cms/backoffice/dashboard';
 import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
-const demoModal : ManifestModal = {
+const demoModal: ManifestModal = {
 	type: 'modal',
 	name: 'Example Custom Modal Element',
 	alias: 'example.modal.custom.element',
 	js: () => import('./example-modal-view.element.js'),
-}
+};
 
-const demoModalsDashboard : ManifestDashboard = {
+const demoModalsDashboard: ManifestDashboard = {
 	type: 'dashboard',
 	name: 'Example Custom Modal Dashboard',
 	alias: 'example.dashboard.custom.modal.element',
@@ -18,12 +18,12 @@ const demoModalsDashboard : ManifestDashboard = {
 		label: 'Custom Modal',
 		pathname: 'custom-modal',
 	},
-	conditions : [
+	conditions: [
 		{
 			alias: 'Umb.Condition.SectionAlias',
-			match: 'Umb.Section.Content'
-		}
-	]
-}
+			match: 'Umb.Section.Content',
+		},
+	],
+};
 
-export default [demoModal,demoModalsDashboard];
+export default [demoModal, demoModalsDashboard];
diff --git a/src/Umbraco.Web.UI.Client/examples/validation-context/index.ts b/src/Umbraco.Web.UI.Client/examples/validation-context/index.ts
index b64c960171..d21809b882 100644
--- a/src/Umbraco.Web.UI.Client/examples/validation-context/index.ts
+++ b/src/Umbraco.Web.UI.Client/examples/validation-context/index.ts
@@ -1,23 +1,21 @@
 import type { ManifestDashboard } from '@umbraco-cms/backoffice/dashboard';
 
-const dashboard : ManifestDashboard = {
+const dashboard: ManifestDashboard = {
 	type: 'dashboard',
 	alias: 'Demo.Dashboard',
 	name: 'Demo Dashboard Validation Context',
 	weight: 1000,
 	element: () => import('./validation-context-dashboard.js'),
 	meta: {
-			label: 'Validation Context Demo',
-			pathname: 'demo'
+		label: 'Validation Context Demo',
+		pathname: 'demo',
 	},
-	conditions : [
-			{
-					alias : "Umb.Condition.SectionAlias",
-					match : "Umb.Section.Content"
-			}
-	]
-}
+	conditions: [
+		{
+			alias: 'Umb.Condition.SectionAlias',
+			match: 'Umb.Section.Content',
+		},
+	],
+};
 
-export const manifests = [
-	dashboard
-];
+export const manifests = [dashboard];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/auth/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/auth/index.ts
index 6c15689d02..e7a2d3b39b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/auth/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/auth/index.ts
@@ -5,6 +5,5 @@ export * from './auth.context.token.js';
 export * from './modals/index.js';
 export type * from './models/openApiConfiguration.js';
 export * from './components/index.js';
-export type * from './auth-provider.extension.js';
 
 export type * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/auth/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/auth/types.ts
index a0022a4344..601bc5c3b6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/auth/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/auth/types.ts
@@ -1,5 +1,7 @@
 import type { ManifestAuthProvider } from './auth-provider.extension.js';
 
+export type * from './auth-provider.extension.js';
+
 /**
  * User login state that can be used to determine the current state of the user.
  * @example 'loggedIn'
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/create/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/create/types.ts
index 50ef773e2c..5afc1fb6f1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/create/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/create/types.ts
@@ -1,4 +1,4 @@
-import type { ManifestCollectionAction } from '../../extensions/index.js';
+import type { ManifestCollectionAction } from '../../extensions/types.js';
 
 export interface ManifestCollectionActionCreateKind extends ManifestCollectionAction {
 	type: 'collectionAction';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-view.manager.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-view.manager.test.ts
index 10566af70d..793b9d0343 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-view.manager.test.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-view.manager.test.ts
@@ -1,4 +1,4 @@
-import type { ManifestCollectionView } from './extensions/index.js';
+import type { ManifestCollectionView } from './extensions/types.js';
 import { umbExtensionsRegistry } from '../extension-registry/index.js';
 import { UmbCollectionViewManager } from './collection-view.manager.js';
 import { expect } from '@open-wc/testing';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-view.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-view.manager.ts
index 4b09399702..98ebdd6dd6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-view.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-view.manager.ts
@@ -1,4 +1,4 @@
-import type { ManifestCollectionView } from './extensions/index.js';
+import type { ManifestCollectionView } from './extensions/types.js';
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbExtensionsManifestInitializer, createExtensionElement } from '@umbraco-cms/backoffice/extension-api';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts
index 83f6710f28..52f3837354 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts
@@ -1,5 +1,5 @@
 import type { UmbCollectionConfiguration } from './types.js';
-import type { ManifestCollection } from './extensions/index.js';
+import type { ManifestCollection } from './extensions/types.js';
 import { customElement, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbExtensionElementAndApiSlotElementBase } from '@umbraco-cms/backoffice/extension-registry';
 import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts
index 5dc7283450..bc0007a73a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts
@@ -1,5 +1,5 @@
 import { UMB_COLLECTION_CONTEXT } from '../default/index.js';
-import type { ManifestCollectionView } from '../extensions/index.js';
+import type { ManifestCollectionView } from '../extensions/types.js';
 import type { UmbCollectionLayoutConfiguration } from '../types.js';
 import { UMB_ROUTE_CONTEXT } from '../../router/route.context.js';
 import { css, customElement, html, nothing, query, repeat, state } from '@umbraco-cms/backoffice/external/lit';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/default/collection-default.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/default/collection-default.context.ts
index 768341bfba..8400d72aa5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/default/collection-default.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/default/collection-default.context.ts
@@ -8,7 +8,7 @@ import type {
 } from '../types.js';
 import type { UmbCollectionFilterModel } from '../collection-filter-model.interface.js';
 import type { UmbCollectionRepository } from '../repository/collection-repository.interface.js';
-import type { ManifestCollection } from '../extensions/index.js';
+import type { ManifestCollection } from '../extensions/types.js';
 import { UMB_COLLECTION_CONTEXT } from './collection-default.context-token.js';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbArrayState, UmbBasicState, UmbNumberState, UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/extensions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/extensions/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/collection/extensions/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/collection/extensions/types.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/types.ts
index a083dd8beb..f449868688 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/types.ts
@@ -1,9 +1,11 @@
-import type { ManifestCollection } from './extensions/index.js';
+import type { ManifestCollection } from './extensions/types.js';
 import type { Observable } from '@umbraco-cms/backoffice/external/rxjs';
 import type { UmbPaginationManager } from '@umbraco-cms/backoffice/utils';
 
-export type * from './extensions/index.js';
+export type * from './action/create/types.js';
+export type * from './extensions/types.js';
 export type * from './conditions/types.js';
+export type * from './workspace-view/types.js';
 
 /** @deprecated No longer used internally. This will be removed in Umbraco 17. [LK] */
 export interface UmbCollectionBulkActionPermissions {
@@ -50,5 +52,3 @@ export interface UmbCollectionContext {
 	items: Observable<any[]>;
 	totalItems: Observable<number>;
 }
-
-export type * from './extensions/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content/types.ts
index 169c1d43b0..4cded9d86c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content/types.ts
@@ -1,6 +1,8 @@
 import type { UmbPropertyValueData } from '@umbraco-cms/backoffice/property';
 import type { UmbEntityVariantModel } from '@umbraco-cms/backoffice/variant';
 
+export type * from './collection/types.js';
+
 export interface UmbElementDetailModel {
 	values: Array<UmbElementValueModel>;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/create/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/create/types.ts
index 7d102e750a..d6b9038acb 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/create/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/create/types.ts
@@ -1,5 +1,4 @@
-import type { MetaEntityActionDefaultKind } from '../../default/index.js';
-import type { ManifestEntityAction } from '../../entity-action.extension.js';
+import type { ManifestEntityAction, MetaEntityActionDefaultKind } from '../../types.js';
 
 export interface ManifestEntityActionCreateKind extends ManifestEntityAction<MetaEntityActionCreateKind> {
 	type: 'entityAction';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete/types.ts
index 51c0b06a95..e01e50df2b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete/types.ts
@@ -1,5 +1,4 @@
-import type { MetaEntityActionDefaultKind } from '../../default/index.js';
-import type { ManifestEntityAction } from '../../entity-action.extension.js';
+import type { ManifestEntityAction, MetaEntityActionDefaultKind } from '../../types.js';
 
 export interface ManifestEntityActionDeleteKind extends ManifestEntityAction<MetaEntityActionDeleteKind> {
 	type: 'entityAction';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/default/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/default/index.ts
deleted file mode 100644
index 06c33f562f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/default/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/index.ts
index be1122bf5a..4347644d1f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/index.ts
@@ -5,10 +5,6 @@ export * from './constants.js';
 export * from './entity-action-base.js';
 export * from './entity-action-list.element.js';
 export * from './entity-action.event.js';
-export type * from './default/index.js';
-export type * from './entity-action-element.interface.js';
-export type * from './entity-action.extension.js';
-export type * from './entity-action.interface.js';
 export type * from './types.js';
 
 export { UmbRequestReloadStructureForEntityEvent } from './request-reload-structure-for-entity.event.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/types.ts
index 445778b75a..5fc6da7380 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/types.ts
@@ -1,5 +1,10 @@
 import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
 
+export type * from './default/types.js';
+export type * from './entity-action-element.interface.js';
+export type * from './entity-action.extension.js';
+export type * from './entity-action.interface.js';
+
 export interface UmbEntityActionArgs<MetaArgsType> extends UmbEntityModel {
 	meta: MetaArgsType;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-create-option-action/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-create-option-action/index.ts
index eb9efdc39a..e33dc3439b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-create-option-action/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-create-option-action/index.ts
@@ -1,5 +1,3 @@
 export * from './constants.js';
 export * from './entity-create-option-action-base.js';
-export type * from './entity-create-option-action.extension.js';
-export type * from './entity-create-option-action.interface.js';
 export type * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-create-option-action/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-create-option-action/types.ts
index ca6db2fc24..f25781d059 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-create-option-action/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-create-option-action/types.ts
@@ -1,5 +1,8 @@
 import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
 
+export type * from './entity-create-option-action.extension.js';
+export type * from './entity-create-option-action.interface.js';
+
 export interface UmbEntityCreateOptionActionArgs<MetaArgsType> extends UmbEntityModel {
 	meta: MetaArgsType;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/external-login-provider-element.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/external-login-provider-element.interface.ts
index bc7c5fcf4e..beeebcde24 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/external-login-provider-element.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/external-login-provider-element.interface.ts
@@ -1,4 +1,4 @@
-import type { ManifestExternalLoginProvider } from '../extensions/index.js';
+import type { ManifestExternalLoginProvider } from './types.js';
 
 export interface UmbExternalLoginProviderElement extends HTMLElement {
 	manifest?: ManifestExternalLoginProvider;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/types.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/index.ts
index 12af91e886..c73d5980e7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/index.ts
@@ -2,7 +2,7 @@ export * from './conditions/index.js';
 export * from './initializers/index.js';
 export * from './registry.js';
 export * from './utils/index.js';
-export type * from './models/index.js';
-export type * from './extensions/index.js';
+export type * from './models/types.js';
+export type * from './extensions/types.js';
 
 export { UmbExtensionElementAndApiSlotElementBase } from './extension-element-and-api-slot-element-base.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/types.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/index.ts
index d2d7785f3b..504fcdf2ce 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/index.ts
@@ -3,4 +3,3 @@ export * from './icon-registry.context-token.js';
 export * from './icon-registry.context.js';
 export * from './icon.registry.js';
 export type * from './types.js';
-export type * from './extensions/icons.extension.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/types.ts
index 49cea90d9c..ffc7c9d5db 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/types.ts
@@ -1,5 +1,7 @@
 import type { JsLoaderProperty } from '@umbraco-cms/backoffice/extension-api';
 
+export type * from './extensions/icons.extension.js';
+
 export interface UmbIconDefinition<JsType = any> {
 	name: string;
 	path: JsLoaderProperty<JsType>;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/index.ts
index 461398c950..c324209993 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/index.ts
@@ -1,2 +1 @@
 export * from './menu-item-default.element.js';
-export type * from './link/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/link/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/link/index.ts
deleted file mode 100644
index 06c33f562f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/link/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/types.ts
new file mode 100644
index 0000000000..680bac4330
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/types.ts
@@ -0,0 +1 @@
+export type * from './link/types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/types.ts
new file mode 100644
index 0000000000..c858b14791
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/types.ts
@@ -0,0 +1 @@
+export type * from './menu-item/types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/index.ts
index 1509c986d2..46a6c42b4b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/index.ts
@@ -1,9 +1,7 @@
 export * from './components/index.js';
 export * from './menu-tree-structure-workspace-context-base.js';
 export * from './menu-variant-tree-structure-workspace-context-base.js';
-export type * from './menu-item-element.interface.js';
-export type * from './menu-item.extension.js';
-export type * from './menu.extension.js';
+
 export type * from './types.js';
 
 export type { UmbMenuStructureWorkspaceContext } from './menu-structure-workspace-context.interface.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/types.ts
index 32ef22c9d1..93dda2eb92 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/types.ts
@@ -1,5 +1,10 @@
 import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
+
+export type * from './components/types.js';
 export type * from './conditions/types.js';
+export type * from './menu-item-element.interface.js';
+export type * from './menu-item.extension.js';
+export type * from './menu.extension.js';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface UmbStructureItemModelBase extends UmbEntityModel {}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/extensions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/extensions/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/modal/extensions/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/modal/extensions/types.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/types.ts
index ce18bc606e..061086786c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/types.ts
@@ -1,7 +1,7 @@
 import type { UUIModalElement, UUIModalSidebarSize } from '@umbraco-cms/backoffice/external/uui';
 import type { ElementLoaderProperty } from '@umbraco-cms/backoffice/extension-api';
 
-export type * from './extensions/index.js';
+export type * from './extensions/types.js';
 
 export interface UmbPickerModalData<ItemType> {
 	multiple?: boolean;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/index.ts
index 736921ff3c..8ebaf3c542 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/index.ts
@@ -1,4 +1,3 @@
 export * from './manager/index.js';
 export * from './picker-search-field.element.js';
 export * from './picker-search-result.element.js';
-export type * from './result-item/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/types.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/types.ts
new file mode 100644
index 0000000000..d68007d9e0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/types.ts
@@ -0,0 +1 @@
+export type * from './result-item/types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker/types.ts
index 1d134b429b..c537c39007 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/picker/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker/types.ts
@@ -4,3 +4,5 @@ export interface UmbPickerContextConfig {
 		queryParams?: object;
 	};
 }
+
+export type * from './search/types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/extensions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/extensions/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/extensions/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/extensions/types.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/index.ts
index d17140d5ba..116b486efd 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/index.ts
@@ -2,5 +2,5 @@ export * from './components/index.js';
 export * from './config/index.js';
 export * from './constants.js';
 export * from './events/index.js';
-export type * from './extensions/index.js';
 export * from './ui-picker-modal/index.js';
+export type * from './extensions/types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/empty-recycle-bin/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/empty-recycle-bin/index.ts
index 8359d84fd8..61e6863f58 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/empty-recycle-bin/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/empty-recycle-bin/index.ts
@@ -1,2 +1 @@
-export type * from './types.js';
 export * from './empty-recycle-bin.action.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/default-tree.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/default-tree.context.ts
index c3d92d0a25..317869be1b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/default-tree.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/default-tree.context.ts
@@ -2,7 +2,7 @@ import type { UmbTreeItemModel, UmbTreeRootModel, UmbTreeStartNode } from '../ty
 import type { UmbTreeRepository } from '../data/tree-repository.interface.js';
 import type { UmbTreeContext } from '../tree-context.interface.js';
 import type { UmbTreeRootItemsRequestArgs } from '../data/types.js';
-import type { ManifestTree } from '../extensions/index.js';
+import type { ManifestTree } from '../extensions/types.js';
 import { UMB_TREE_CONTEXT } from './default-tree.context-token.js';
 import { type UmbActionEventContext, UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
 import { type ManifestRepository, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/move/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/move/index.ts
index 4487f1c64e..aa9bd2d833 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/move/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/move/index.ts
@@ -1,3 +1 @@
-export type { UmbMoveDataSource } from './move-data-source.interface.js';
-export type { UmbMoveRepository } from './move-repository.interface.js';
-export type * from './types.js';
+export { UmbMoveToEntityAction } from './move-to.action.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/move/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/move/types.ts
index 43ecc9e964..ad260f0c7d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/move/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/move/types.ts
@@ -1,5 +1,7 @@
 import type { ManifestEntityAction, MetaEntityActionDefaultKind } from '@umbraco-cms/backoffice/entity-action';
 
+export type { UmbMoveDataSource } from './move-data-source.interface.js';
+export type { UmbMoveRepository } from './move-repository.interface.js';
 export interface UmbMoveToRequestArgs {
 	unique: string;
 	destination: {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/index.ts
index b25182fbbd..2e789e1917 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/index.ts
@@ -1,4 +1 @@
 export { UmbSortChildrenOfEntityAction } from './sort-children-of.action.js';
-export type { UmbSortChildrenOfRepository } from './sort-children-of-repository.interface.js';
-export type { UmbSortChildrenOfDataSource } from './sort-children-of-data-source.interface.js';
-export type * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/types.ts
index 324542a93d..2e76d9d2d0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/types.ts
@@ -1,5 +1,8 @@
 import type { ManifestEntityAction, MetaEntityActionDefaultKind } from '@umbraco-cms/backoffice/entity-action';
 
+export type { UmbSortChildrenOfRepository } from './sort-children-of-repository.interface.js';
+export type { UmbSortChildrenOfDataSource } from './sort-children-of-data-source.interface.js';
+
 export interface UmbSortChildrenOfArgs {
 	unique: string | null;
 	sorting: Array<{ unique: string; sortOrder: number }>;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/types.ts
new file mode 100644
index 0000000000..ee4b8c7728
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/types.ts
@@ -0,0 +1,4 @@
+export type * from './duplicate-to/types.js';
+export type * from './move/types.js';
+export type * from './reload-tree-item-children/types.js';
+export type * from './sort-children-of/types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/extensions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/extensions/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/tree/extensions/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/extensions/types.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/create-folder/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/create-folder/index.ts
index ffc37905b7..eece44714b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/create-folder/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/create-folder/index.ts
@@ -1,2 +1 @@
 export * from './create-folder.action.js';
-export type * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/index.ts
index 965837eee2..933bf348d0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/index.ts
@@ -1,2 +1 @@
 export * from './delete-folder.action.js';
-export type * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/types.ts
new file mode 100644
index 0000000000..f6fab2375b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/types.ts
@@ -0,0 +1,3 @@
+export type * from './create-folder/types.js';
+export type * from './delete-folder/types.js';
+export type * from './update-folder/types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/update-folder/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/update-folder/index.ts
index 4d0b526c1e..b8d1e36559 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/update-folder/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/update-folder/index.ts
@@ -1,2 +1 @@
-export type * from './types.js';
 export * from './update-folder.action.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/index.ts
index ece5260792..7386cf5ee7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/index.ts
@@ -1,3 +1,2 @@
-export type * from './types.js';
 export * from './modal/index.js';
 export * from './entity-action/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/types.ts
index b82e6bc065..3594aaba33 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/types.ts
@@ -1,6 +1,8 @@
 import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
 import type { MetaEntityActionDefaultKind } from '@umbraco-cms/backoffice/entity-action';
 
+export type * from './entity-action/types.js';
+
 export interface UmbFolderModel extends UmbEntityModel {
 	name: string;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts
index cc5849cd02..e80702822e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts
@@ -8,8 +8,6 @@ export * from './folder/index.js';
 export * from './tree-item/index.js';
 export * from './tree-menu-item-default/index.js';
 export * from './tree.element.js';
-export type * from './entity-actions/move/index.js';
-export type * from './extensions/index.js';
 export type * from './types.js';
 
 export type { UmbTreePickerModalData, UmbTreePickerModalValue } from './tree-picker-modal/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-context-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-context-base.ts
index 5014d62716..45b440be74 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-context-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-context-base.ts
@@ -2,7 +2,7 @@ import type { UmbTreeItemContext } from '../tree-item-context.interface.js';
 import { UMB_TREE_CONTEXT, type UmbDefaultTreeContext } from '../../default/index.js';
 import type { UmbTreeItemModel, UmbTreeRootModel } from '../../types.js';
 import { UmbRequestReloadTreeItemChildrenEvent } from '../../entity-actions/reload-tree-item-children/index.js';
-import type { ManifestTreeItem } from '../../extensions/index.js';
+import type { ManifestTreeItem } from '../../extensions/types.js';
 import { map } from '@umbraco-cms/backoffice/external/rxjs';
 import { UmbArrayState, UmbBooleanState, UmbObjectState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item.element.ts
index 80b0f96288..54ae3c4580 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item.element.ts
@@ -1,4 +1,4 @@
-import type { ManifestTreeItem } from '../extensions/index.js';
+import type { ManifestTreeItem } from '../extensions/types.js';
 import { customElement, property } from '@umbraco-cms/backoffice/external/lit';
 import {
 	UmbExtensionElementAndApiSlotElementBase,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-menu-item-default/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-menu-item-default/index.ts
index e6567452fe..af047cc2d4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-menu-item-default/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-menu-item-default/index.ts
@@ -1,2 +1 @@
 export * from './tree-menu-item-default.element.js';
-export type * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.element.ts
index dcb2340d9b..889ab0849b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.element.ts
@@ -1,4 +1,4 @@
-import type { ManifestTree } from './extensions/index.js';
+import type { ManifestTree } from './extensions/types.js';
 import { customElement } from '@umbraco-cms/backoffice/external/lit';
 import { UmbExtensionElementAndApiSlotElementBase } from '@umbraco-cms/backoffice/extension-registry';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts
index 42ade241fd..f4cbd05593 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts
@@ -1,5 +1,9 @@
 import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
-export type * from './extensions/index.js';
+
+export type * from './entity-actions/types.js';
+export type * from './extensions/types.js';
+export type * from './folder/types.js';
+export type * from './tree-menu-item-default/types.js';
 
 export interface UmbTreeItemModelBase extends UmbEntityModel {
 	name: string;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/index.ts
deleted file mode 100644
index 06c33f562f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/data-manager/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/data-manager/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/data-manager/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/data-manager/types.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 7188c11f93..04221017dd 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
@@ -15,7 +15,4 @@ export * from './utils/object-to-property-value-array.function.js';
 export * from './workspace-property-dataset/index.js';
 export * from './workspace.context-token.js';
 export * from './workspace.element.js';
-export type * from './conditions/index.js';
-export type * from './data-manager/index.js';
 export type * from './types.js';
-export type * from './workspace-context.interface.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/types.ts
new file mode 100644
index 0000000000..8bc5236dc9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/types.ts
@@ -0,0 +1 @@
+export type * from './default/types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/types.ts
index eae653cf08..82b14a3fec 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/types.ts
@@ -1,6 +1,11 @@
 import type { UmbEntityUnique } from '@umbraco-cms/backoffice/entity';
 
 export type * from './extensions/types.js';
+export type * from './kinds/types.js';
+export type * from './conditions/types.js';
+export type * from './data-manager/types.js';
+export type * from './workspace-context.interface.js';
+
 /**
  * @deprecated Use `UmbEntityUnique`instead.
  */
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package/extensions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package/extensions/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/packages/package/extensions/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/packages/package/extensions/types.ts
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
index 0343887cda..47e56552ee 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/packages/package/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package/index.ts
@@ -1,3 +1,3 @@
 export * from './constants.js';
 export * from './repository/index.js';
-export type * from './extensions/index.js';
+export type * from './extensions/types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/extensions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/search/extensions/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/search/extensions/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/search/extensions/types.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/search-modal/search-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/search/search-modal/search-modal.element.ts
index 1de42cf897..fbaf7b411d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/search/search-modal/search-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/search/search-modal/search-modal.element.ts
@@ -16,7 +16,7 @@ import { UmbExtensionsManifestInitializer, createExtensionApi } from '@umbraco-c
 
 import '../search-result/search-result-item.element.js';
 import type { UmbModalContext } from '@umbraco-cms/backoffice/modal';
-import type { ManifestSearchResultItem } from '../extensions/index.js';
+import type { ManifestSearchResultItem } from '../extensions/types.js';
 
 type SearchProvider = {
 	name: string;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/types.ts b/src/Umbraco.Web.UI.Client/src/packages/search/types.ts
index 2506d4d36e..a6e917353a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/search/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/search/types.ts
@@ -2,6 +2,11 @@ import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
 import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 import type { UmbPagedModel, UmbRepositoryResponse } from '@umbraco-cms/backoffice/repository';
 
+export type { UmbSearchDataSource } from './search-data-source.interface.js';
+export type { UmbSearchRepository } from './search-repository.interface.js';
+
+export type * from './extensions/types.js';
+
 // TODO: lower requirement for search provider item type
 export type UmbSearchResultItemModel = {
 	entityType: string;
@@ -22,8 +27,3 @@ export interface UmbSearchProvider<
 > extends UmbApi {
 	search(args: SearchRequestArgsType): Promise<UmbRepositoryResponse<UmbPagedModel<SearchResultItemType>>>;
 }
-
-export type { UmbSearchDataSource } from './search-data-source.interface.js';
-export type { UmbSearchRepository } from './search-repository.interface.js';
-
-export type * from './extensions/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/index.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/index.ts
index 0d1c827429..3c7345719d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/index.ts
@@ -1,3 +1,3 @@
 export * from './constants.js';
 export * from './components/index.js';
-export type * from './plugins/index.js';
+export type * from './plugins/types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/index.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/types.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/ufm/index.ts b/src/Umbraco.Web.UI.Client/src/packages/ufm/index.ts
index 63d54ceaa8..aa343771ca 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/ufm/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/index.ts
@@ -4,5 +4,3 @@ export * from './controllers/ufm-virtual-render.controller.js';
 export * from './filters/base.filter.js';
 export * from './plugins/index.js';
 export type * from './types.js';
-export type * from './ufm-component.extension.js';
-export type * from './ufm-filter.extension.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/ufm/types.ts b/src/Umbraco.Web.UI.Client/src/packages/ufm/types.ts
index 5a25901cdb..c95539b10d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/ufm/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/types.ts
@@ -1 +1,2 @@
 export type * from './ufm-filter.extension.js';
+export type * from './ufm-component.extension.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/conditions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/conditions/types.ts
index 8a4022dba3..fbd158e6d0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/conditions/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/conditions/types.ts
@@ -1,2 +1 @@
-export type * from './is-admin/is-admin.condition-config.js';
 export type * from './is-admin/types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/index.ts
index 7d4396f5e4..64b0d29e78 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/index.ts
@@ -1,6 +1,4 @@
 export * from './components/index.js';
 export * from './modals/index.js';
-export type * from './user-granular-permission.extension.js';
-export type * from './entity-user-permission.extension.js';
 
 export type * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/types.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/types.ts
index e84687e8bb..7f10a7e1b0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/types.ts
@@ -1,3 +1,5 @@
+export type * from './user-granular-permission.extension.js';
+export type * from './entity-user-permission.extension.js';
 export interface UmbUserPermissionModel {
 	$type: string;
 	verbs: Array<string>;