diff --git a/src/packages/core/dashboard/dashboard.extension.ts b/src/packages/core/dashboard/dashboard.extension.ts
index 0797d89a77..86ab5f5009 100644
--- a/src/packages/core/dashboard/dashboard.extension.ts
+++ b/src/packages/core/dashboard/dashboard.extension.ts
@@ -1,4 +1,4 @@
-import type { UmbDashboardElement } from '../extension-registry/interfaces/index.js';
+import type { UmbDashboardElement } from './dashboard-element.interface.js';
 import type { ManifestElement, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api';
 
 export interface ManifestDashboard
diff --git a/src/packages/core/extension-registry/extensions/index.ts b/src/packages/core/extension-registry/extensions/index.ts
index fd9f0fbd45..0ded934921 100644
--- a/src/packages/core/extension-registry/extensions/index.ts
+++ b/src/packages/core/extension-registry/extensions/index.ts
@@ -1,13 +1,14 @@
-export type * from './global-context.extension.js';
-export type * from './header-app.extension.js';
-export type * from './repository.extension.js';
 export type * from './app-entry-point.extension.js';
-export type * from './entity-action.extension.js';
 export type * from './backoffice-entry-point.extension.js';
+export type * from './entity-action.extension.js';
 export type * from './entity-bulk-action.extension.js';
 export type * from './entity-user-permission.extension.js';
 export type * from './entry-point.extension.js';
+export type * from './global-context.extension.js';
+export type * from './header-app.extension.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 './preview-app.extension.js';
+export type * from './repository.extension.js';
 export type * from './store.extension.js';
diff --git a/src/packages/core/extension-registry/interfaces/menu-item-element.interface.ts b/src/packages/core/extension-registry/extensions/menu-item-element.interface.ts
similarity index 57%
rename from src/packages/core/extension-registry/interfaces/menu-item-element.interface.ts
rename to src/packages/core/extension-registry/extensions/menu-item-element.interface.ts
index 5232e54fb1..b0b909fe40 100644
--- a/src/packages/core/extension-registry/interfaces/menu-item-element.interface.ts
+++ b/src/packages/core/extension-registry/extensions/menu-item-element.interface.ts
@@ -1,4 +1,4 @@
-import type { ManifestMenuItem } from '../models/index.js';
+import type { ManifestMenuItem } from './menu-item.extension.js';
 
 export interface UmbMenuItemElement extends HTMLElement {
 	manifest?: ManifestMenuItem;
diff --git a/src/packages/core/extension-registry/extensions/menu-item.extension.ts b/src/packages/core/extension-registry/extensions/menu-item.extension.ts
index 96f70bfd6a..811c645ba1 100644
--- a/src/packages/core/extension-registry/extensions/menu-item.extension.ts
+++ b/src/packages/core/extension-registry/extensions/menu-item.extension.ts
@@ -1,4 +1,4 @@
-import type { UmbMenuItemElement } from '../interfaces/menu-item-element.interface.js';
+import type { UmbMenuItemElement } from './menu-item-element.interface.js';
 import type { ManifestWithDynamicConditions, ManifestElement } from '@umbraco-cms/backoffice/extension-api';
 
 export interface ManifestMenuItem
diff --git a/src/packages/core/extension-registry/interfaces/index.ts b/src/packages/core/extension-registry/interfaces/index.ts
index f987a1cd4d..53756c0c15 100644
--- a/src/packages/core/extension-registry/interfaces/index.ts
+++ b/src/packages/core/extension-registry/interfaces/index.ts
@@ -1,4 +1,2 @@
-export * from '../../dashboard/dashboard-element.interface.js';
 export * from './external-login-provider-element.interface.js';
 export * from './file-upload-preview.interface.js';
-export * from './menu-item-element.interface.js';
diff --git a/src/packages/core/extension-registry/models/index.ts b/src/packages/core/extension-registry/models/index.ts
index 779861d53f..5888fef920 100644
--- a/src/packages/core/extension-registry/models/index.ts
+++ b/src/packages/core/extension-registry/models/index.ts
@@ -11,31 +11,18 @@ import type { ManifestUserProfileApp } from './user-profile-app.model.js';
 import type { ManifestGranularUserPermission } from './user-granular-permission.model.js';
 import type { ManifestMfaLoginProvider } from './mfa-login-provider.model.js';
 import type { ManifestMonacoMarkdownEditorAction } from './monaco-markdown-editor-action.model.js';
-import type { ManifestPickerSearchResultItem } from './picker-search-result-item.model.js';
 import type { ManifestBase, ManifestBundle, ManifestCondition } from '@umbraco-cms/backoffice/extension-api';
 
-export type * from '../extensions/app-entry-point.extension.js';
 export type * from './auth-provider.model.js';
-export type * from '../extensions/backoffice-entry-point.extension.js';
 export type * from './current-user-action.model.js';
 export type * from './dynamic-root.model.js';
-export type * from '../extensions/entity-action.extension.js';
-export type * from '../extensions/entity-bulk-action.extension.js';
-export type * from '../extensions/entity-user-permission.extension.js';
-export type * from '../extensions/entry-point.extension.js';
 export type * from './file-upload-preview.model.js';
 export type * from './external-login-provider.model.js';
 export type * from './health-check.model.js';
-export type * from '../extensions/menu-item.extension.js';
-export type * from '../extensions/menu.extension.js';
 export type * from './mfa-login-provider.model.js';
 export type * from './monaco-markdown-editor-action.model.js';
-export type * from './picker-search-result-item.model.js';
-export type * from '../extensions/preview-app.extension.js';
-export type * from '../extensions/store.extension.js';
 export type * from './mfa-login-provider.model.js';
 export type * from './monaco-markdown-editor-action.model.js';
-export type * from './picker-search-result-item.model.js';
 export type * from './tinymce-plugin.model.js';
 export type * from './ufm-component.model.js';
 export type * from './ufm-filter.model.js';
@@ -56,10 +43,6 @@ export type ManifestTypes =
 	| ManifestHealthCheck
 	| ManifestMfaLoginProvider
 	| ManifestMonacoMarkdownEditorAction
-	| ManifestPickerSearchResultItem
-	| ManifestMfaLoginProvider
-	| ManifestMonacoMarkdownEditorAction
-	| ManifestPickerSearchResultItem
 	| ManifestTinyMcePlugin
 	| ManifestUfmComponent
 	| ManifestUfmFilter
diff --git a/src/packages/core/picker/search/index.ts b/src/packages/core/picker/search/index.ts
index c943b37222..10582f4796 100644
--- a/src/packages/core/picker/search/index.ts
+++ b/src/packages/core/picker/search/index.ts
@@ -1,3 +1,4 @@
 export * from './manager/index.js';
-export * from './picker-search-result.element.js';
 export * from './picker-search-field.element.js';
+export * from './picker-search-result.element.js';
+export * from './result-item/index.js';
diff --git a/src/packages/core/picker/search/picker-search-result.element.ts b/src/packages/core/picker/search/picker-search-result.element.ts
index 1b3a6411dc..7d5fd3b902 100644
--- a/src/packages/core/picker/search/picker-search-result.element.ts
+++ b/src/packages/core/picker/search/picker-search-result.element.ts
@@ -1,10 +1,10 @@
 import { UMB_PICKER_CONTEXT } from '../picker.context.token.js';
 import type { UmbPickerContext } from '../picker.context.js';
+import type { ManifestPickerSearchResultItem } from './result-item/picker-search-result-item.extension.js';
 import { customElement, html, nothing, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { UmbSearchRequestArgs } from '@umbraco-cms/backoffice/search';
 import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
-import type { ManifestPickerSearchResultItem } from '@umbraco-cms/backoffice/extension-registry';
 
 const elementName = 'umb-picker-search-result';
 @customElement(elementName)
diff --git a/src/packages/core/picker/search/result-item/index.ts b/src/packages/core/picker/search/result-item/index.ts
new file mode 100644
index 0000000000..ed25ab6d77
--- /dev/null
+++ b/src/packages/core/picker/search/result-item/index.ts
@@ -0,0 +1 @@
+export * from './picker-search-result-item.extension.js';
diff --git a/src/packages/core/extension-registry/models/picker-search-result-item.model.ts b/src/packages/core/picker/search/result-item/picker-search-result-item.extension.ts
similarity index 70%
rename from src/packages/core/extension-registry/models/picker-search-result-item.model.ts
rename to src/packages/core/picker/search/result-item/picker-search-result-item.extension.ts
index 8797323f40..f0bcf63e83 100644
--- a/src/packages/core/extension-registry/models/picker-search-result-item.model.ts
+++ b/src/packages/core/picker/search/result-item/picker-search-result-item.extension.ts
@@ -7,3 +7,9 @@ export interface ManifestPickerSearchResultItem extends ManifestElementAndApi {
 	type: 'pickerSearchResultItem';
 	forEntityTypes: Array<string>;
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbPickerSearchResultItem: ManifestPickerSearchResultItem;
+	}
+}