diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/date-input/date-input.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/date-input/date-input.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/date-input/date-input.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/date-input/date-input.element.ts
index 1fa38a35bb..6662bc7585 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/date-input/date-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/date-input/date-input.element.ts
@@ -9,8 +9,6 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
 @customElement('umb-date-input')
 export class UmbDateInputElement extends FormControlMixin(UmbLitElement) {
-	static styles = [UUITextStyles, css``];
-
 	protected getFormElement() {
 		return undefined;
 	}
@@ -143,6 +141,8 @@ export class UmbDateInputElement extends FormControlMixin(UmbLitElement) {
 			.value="${this.displayValue?.replace('Z', '')}">
 		</uui-input>`;
 	}
+
+	static styles = [UUITextStyles, css``];
 }
 
 export default UmbDateInputElement;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/date-input/date-input.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/date-input/date-input.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/date-input/date-input.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/date-input/date-input.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/date-input/date-input.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/date-input/date-input.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/date-input/date-input.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/date-input/date-input.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/repositories/config/config.repository.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/repositories/config/config.repository.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/repositories/config/config.repository.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/repositories/config/config.repository.ts