diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/manifests.ts
index e9db618b71..65905cc8c4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/manifests.ts
@@ -1,3 +1,4 @@
-import { manifests as webhookRootManifests } from './webhooks/manifests.js';
+import { manifests as webhookRootManifests } from './webhooks-root/manifests.js';
+import { manifests as webhookManifests } from './webhooks/manifests.js';
 
-export const manifests = [...webhookRootManifests];
+export const manifests = [...webhookRootManifests, ...webhookManifests];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks-root/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks-root/manifests.ts
new file mode 100644
index 0000000000..f4ddb81daa
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks-root/manifests.ts
@@ -0,0 +1,15 @@
+import type { ManifestWorkspace } from '@umbraco-cms/backoffice/extension-registry';
+
+const workspaceAlias = 'Umb.Workspace.Webhooks';
+
+const workspace: ManifestWorkspace = {
+	type: 'workspace',
+	alias: workspaceAlias,
+	name: 'Webhook Root Workspace',
+	js: () => import('./webhook-root-workspace.element.js'),
+	meta: {
+		entityType: 'webhook-root',
+	},
+};
+
+export const manifests = [workspace];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/webhook-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks-root/webhook-root-workspace.element.ts
similarity index 85%
rename from src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/webhook-root-workspace.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks-root/webhook-root-workspace.element.ts
index 46c5376431..176eded82f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/webhook-root-workspace.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks-root/webhook-root-workspace.element.ts
@@ -5,7 +5,7 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 @customElement('umb-webhook-root-workspace')
 export class UmbWebhookRootWorkspaceElement extends UmbLitElement {
 	render() {
-		return html` <umb-body-layout main-no-padding headline="Webhooks">
+		return html` <umb-body-layout main-no-padding headline="${this.localize.term('treeHeaders_webhooks')}">
 			<umb-collection alias=${UMB_WEBHOOK_COLLECTION_ALIAS}></umb-collection>;
 		</umb-body-layout>`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/manifests.ts
index dadefac2e2..0745de328e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/manifests.ts
@@ -1,27 +1,11 @@
-import type {
-	ManifestWorkspace,
-	ManifestWorkspaceAction,
-	ManifestWorkspaceView,
-} from '@umbraco-cms/backoffice/extension-registry';
-
-const workspaceAlias = 'Umb.Workspace.Webhooks';
-
-const workspace: ManifestWorkspace = {
-	type: 'workspace',
-	alias: workspaceAlias,
-	name: 'Webhook Root Workspace',
-	js: () => import('./webhook-root-workspace.element.js'),
-	meta: {
-		entityType: 'webhooks',
-	},
-};
+import type { ManifestWorkspaceView } from '@umbraco-cms/backoffice/extension-registry';
 
 const workspaceViews: Array<ManifestWorkspaceView> = [
 	{
 		type: 'workspaceView',
 		alias: 'Umb.WorkspaceView.Webhooks.Overview',
 		name: 'Webhooks Root Workspace Overview View',
-		js: () => import('../views/overview/index.js'),
+		js: () => import('./views/index.js'),
 		weight: 300,
 		meta: {
 			label: 'Overview',
@@ -31,7 +15,7 @@ const workspaceViews: Array<ManifestWorkspaceView> = [
 		conditions: [
 			{
 				alias: 'Umb.Condition.WorkspaceAlias',
-				match: workspace.alias,
+				match: 'Umb.Workspace.Webhooks',
 			},
 		],
 	},
@@ -55,6 +39,4 @@ const workspaceViews: Array<ManifestWorkspaceView> = [
 	},*/
 ];
 
-const workspaceActions: Array<ManifestWorkspaceAction> = [];
-
-export const manifests = [workspace, ...workspaceViews, ...workspaceActions];
+export const manifests = [...workspaceViews];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/views/overview/index.ts b/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/views/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/views/overview/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/views/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/views/overview/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/views/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/views/overview/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/views/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/views/overview/webhook-overview-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/views/webhook-overview-view.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/views/overview/webhook-overview-view.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/views/webhook-overview-view.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks.context.ts b/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/webhooks.context.ts
similarity index 94%
rename from src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/webhooks.context.ts
index 410cb938a2..0182c35877 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/webhooks/workspace/webhooks/webhooks.context.ts
@@ -1,4 +1,4 @@
-import { UmbWebhookRepository } from '../repository/webhooks.repository.js';
+import { UmbWebhookRepository } from '../../repository/webhooks.repository.js';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';