diff --git a/src/Umbraco.Web.UI.Client/libs/context-api/consume/context-consumer.controller.ts b/src/Umbraco.Web.UI.Client/libs/context-api/consume/context-consumer.controller.ts
index 580274ea69..20fdb24379 100644
--- a/src/Umbraco.Web.UI.Client/libs/context-api/consume/context-consumer.controller.ts
+++ b/src/Umbraco.Web.UI.Client/libs/context-api/consume/context-consumer.controller.ts
@@ -1,9 +1,8 @@
+import type { UmbControllerHostInterface, UmbControllerInterface } from '@umbraco-cms/controller';
 import { UmbContextToken } from '../context-token';
 import { UmbContextConsumer } from './context-consumer';
 import { UmbContextCallback } from './context-request.event';
 
-import type { UmbControllerHostInterface, UmbControllerInterface } from '@umbraco-cms/controller';
-
 export class UmbContextConsumerController<T = unknown>
 	extends UmbContextConsumer<UmbControllerHostInterface, T>
 	implements UmbControllerInterface
diff --git a/src/Umbraco.Web.UI.Client/libs/context-api/index.ts b/src/Umbraco.Web.UI.Client/libs/context-api/index.ts
index 083215832d..67aaa8edcf 100644
--- a/src/Umbraco.Web.UI.Client/libs/context-api/index.ts
+++ b/src/Umbraco.Web.UI.Client/libs/context-api/index.ts
@@ -4,5 +4,4 @@ export * from './consume/context-request.event';
 export * from './provide/context-provider.controller';
 export * from './provide/context-provider';
 export * from './provide/context-provide.event';
-export * from './provide/context-provider.element';
 export * from './context-token';
diff --git a/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.test.ts b/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.test.ts
index 3a3a716eb7..0d864cd608 100644
--- a/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.test.ts
+++ b/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.test.ts
@@ -1,7 +1,6 @@
 import { expect } from '@open-wc/testing';
 import { UmbContextConsumer } from '../consume/context-consumer';
 import { UmbContextRequestEventImplementation } from '../consume/context-request.event';
-import { UmbContextToken } from '../context-token';
 import { UmbContextProvider } from './context-provider';
 
 class MyClass {
diff --git a/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.element.test.ts b/src/Umbraco.Web.UI.Client/libs/element/context-provider.element.test.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.element.test.ts
rename to src/Umbraco.Web.UI.Client/libs/element/context-provider.element.test.ts
index b2f6c44311..b9f622014a 100644
--- a/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.element.test.ts
+++ b/src/Umbraco.Web.UI.Client/libs/element/context-provider.element.test.ts
@@ -1,7 +1,7 @@
 import { expect, fixture, html } from '@open-wc/testing';
 import { customElement } from 'lit/decorators.js';
 import { UmbContextProviderElement } from './context-provider.element';
-import { UmbLitElement } from '@umbraco-cms/element';
+import { UmbLitElement } from './lit-element.element';
 
 @customElement('umb-context-test')
 export class ContextTestElement extends UmbLitElement {
diff --git a/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.element.ts b/src/Umbraco.Web.UI.Client/libs/element/context-provider.element.ts
similarity index 92%
rename from src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.element.ts
rename to src/Umbraco.Web.UI.Client/libs/element/context-provider.element.ts
index cf8d3da2c1..7155397b84 100644
--- a/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.element.ts
+++ b/src/Umbraco.Web.UI.Client/libs/element/context-provider.element.ts
@@ -1,6 +1,6 @@
 import { html } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
-import { UmbLitElement } from '@umbraco-cms/element';
+import { UmbLitElement } from './lit-element.element';
 
 @customElement('umb-context-provider')
 export class UmbContextProviderElement extends UmbLitElement {
diff --git a/src/Umbraco.Web.UI.Client/libs/element/index.ts b/src/Umbraco.Web.UI.Client/libs/element/index.ts
index 4048b79c02..60c1e9e8d3 100644
--- a/src/Umbraco.Web.UI.Client/libs/element/index.ts
+++ b/src/Umbraco.Web.UI.Client/libs/element/index.ts
@@ -1,2 +1,3 @@
 export * from './element.mixin';
 export * from './lit-element.element';
+export * from './context-provider.element';
diff --git a/src/Umbraco.Web.UI.Client/libs/notification/notification.stories.ts b/src/Umbraco.Web.UI.Client/libs/notification/notification.stories.ts
index f1b19deb37..a3f6a63c6a 100644
--- a/src/Umbraco.Web.UI.Client/libs/notification/notification.stories.ts
+++ b/src/Umbraco.Web.UI.Client/libs/notification/notification.stories.ts
@@ -1,11 +1,10 @@
-import '../../src/backoffice/shared/components/backoffice-frame/backoffice-notification-container.element';
-import '../context-api/provide/context-provider.element';
 import './layouts/default';
 
 import { Meta, Story } from '@storybook/web-components';
 import { html } from 'lit';
 import { customElement } from 'lit/decorators.js';
 
+import { UmbLitElement } from '@umbraco-cms/element';
 import type { UmbNotificationDefaultData } from './layouts/default';
 import {
 	UmbNotificationColor,
@@ -13,7 +12,6 @@ import {
 	UmbNotificationService,
 	UMB_NOTIFICATION_SERVICE_CONTEXT_TOKEN,
 } from '.';
-import { UmbLitElement } from '@umbraco-cms/element';
 
 export default {
 	title: 'API/Notifications/Overview',