diff --git a/src/Umbraco.Infrastructure/Compose/AuditEventsComponent.cs b/src/Umbraco.Infrastructure/Compose/AuditEventsComponent.cs
index 78e0a50b4a..306bac7816 100644
--- a/src/Umbraco.Infrastructure/Compose/AuditEventsComponent.cs
+++ b/src/Umbraco.Infrastructure/Compose/AuditEventsComponent.cs
@@ -3,22 +3,17 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Net;
-using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Core.Events;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Extensions;
 
-namespace Umbraco.Core.Compose
+namespace Umbraco.Cms.Core.Compose
 {
     public sealed class AuditEventsComponent : IComponent
     {
diff --git a/src/Umbraco.Infrastructure/Compose/AuditEventsComposer.cs b/src/Umbraco.Infrastructure/Compose/AuditEventsComposer.cs
index 59f24ef09a..b6d5f60765 100644
--- a/src/Umbraco.Infrastructure/Compose/AuditEventsComposer.cs
+++ b/src/Umbraco.Infrastructure/Compose/AuditEventsComposer.cs
@@ -1,6 +1,6 @@
 using Umbraco.Cms.Core.Composing;
 
-namespace Umbraco.Core.Compose
+namespace Umbraco.Cms.Core.Compose
 {
     public sealed class AuditEventsComposer : ComponentComposer<AuditEventsComponent>, ICoreComposer
     { }
diff --git a/src/Umbraco.Infrastructure/Compose/BlockEditorComponent.cs b/src/Umbraco.Infrastructure/Compose/BlockEditorComponent.cs
index a4f2f625a8..bee28b39ff 100644
--- a/src/Umbraco.Infrastructure/Compose/BlockEditorComponent.cs
+++ b/src/Umbraco.Infrastructure/Compose/BlockEditorComponent.cs
@@ -3,15 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Models.Blocks;
 using Umbraco.Core.Models.Blocks;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Web.Compose
+namespace Umbraco.Cms.Core.Compose
 {
     /// <summary>
     /// A component for Block editors used to bind to events
diff --git a/src/Umbraco.Infrastructure/Compose/BlockEditorComposer.cs b/src/Umbraco.Infrastructure/Compose/BlockEditorComposer.cs
index c29fc131e5..bcc70e1748 100644
--- a/src/Umbraco.Infrastructure/Compose/BlockEditorComposer.cs
+++ b/src/Umbraco.Infrastructure/Compose/BlockEditorComposer.cs
@@ -1,6 +1,6 @@
 using Umbraco.Cms.Core.Composing;
 
-namespace Umbraco.Web.Compose
+namespace Umbraco.Cms.Core.Compose
 {
     /// <summary>
     /// A composer for Block editors to run a component
diff --git a/src/Umbraco.Infrastructure/Compose/NestedContentPropertyComponent.cs b/src/Umbraco.Infrastructure/Compose/NestedContentPropertyComponent.cs
index c173d2cb89..2926702bda 100644
--- a/src/Umbraco.Infrastructure/Compose/NestedContentPropertyComponent.cs
+++ b/src/Umbraco.Infrastructure/Compose/NestedContentPropertyComponent.cs
@@ -1,14 +1,12 @@
 using System;
 using System.Linq;
 using Newtonsoft.Json.Linq;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Extensions;
 using Umbraco.Web.PropertyEditors;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Web.Compose
+namespace Umbraco.Cms.Core.Compose
 {
     /// <summary>
     /// A component for NestedContent used to bind to events
diff --git a/src/Umbraco.Infrastructure/Compose/NestedContentPropertyComposer.cs b/src/Umbraco.Infrastructure/Compose/NestedContentPropertyComposer.cs
index 535359f323..5268476148 100644
--- a/src/Umbraco.Infrastructure/Compose/NestedContentPropertyComposer.cs
+++ b/src/Umbraco.Infrastructure/Compose/NestedContentPropertyComposer.cs
@@ -1,7 +1,7 @@
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Core;
 
-namespace Umbraco.Web.Compose
+namespace Umbraco.Cms.Core.Compose
 {
     /// <summary>
     /// A composer for nested content to run a component
diff --git a/src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs b/src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
index 9fceb80382..55d2bef226 100644
--- a/src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
+++ b/src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
@@ -19,9 +19,8 @@ using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Web.Compose
+namespace Umbraco.Cms.Core.Compose
 {
     public sealed class NotificationsComponent : IComponent
     {
diff --git a/src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs b/src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs
index 6eec6f773a..21e473bb87 100644
--- a/src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs
+++ b/src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs
@@ -2,7 +2,7 @@
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Extensions;
 
-namespace Umbraco.Web.Compose
+namespace Umbraco.Cms.Core.Compose
 {
     public sealed class NotificationsComposer : ComponentComposer<NotificationsComponent>, ICoreComposer
     {
diff --git a/src/Umbraco.Infrastructure/Compose/PublicAccessComponent.cs b/src/Umbraco.Infrastructure/Compose/PublicAccessComponent.cs
index fb196c7981..8cf8388b14 100644
--- a/src/Umbraco.Infrastructure/Compose/PublicAccessComponent.cs
+++ b/src/Umbraco.Infrastructure/Compose/PublicAccessComponent.cs
@@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Extensions;
 
-namespace Umbraco.Web.Compose
+namespace Umbraco.Cms.Core.Compose
 {
     public sealed class PublicAccessComponent : IComponent
     {
diff --git a/src/Umbraco.Infrastructure/Compose/PublicAccessComposer.cs b/src/Umbraco.Infrastructure/Compose/PublicAccessComposer.cs
index 86074d1f13..71e48c44d1 100644
--- a/src/Umbraco.Infrastructure/Compose/PublicAccessComposer.cs
+++ b/src/Umbraco.Infrastructure/Compose/PublicAccessComposer.cs
@@ -1,6 +1,6 @@
 using Umbraco.Cms.Core.Composing;
 
-namespace Umbraco.Web.Compose
+namespace Umbraco.Cms.Core.Compose
 {
     /// <summary>
     /// Used to ensure that the public access data file is kept up to date properly
diff --git a/src/Umbraco.Infrastructure/Compose/RelateOnCopyComponent.cs b/src/Umbraco.Infrastructure/Compose/RelateOnCopyComponent.cs
index ee1c6b8da5..0d28c1eb1d 100644
--- a/src/Umbraco.Infrastructure/Compose/RelateOnCopyComponent.cs
+++ b/src/Umbraco.Infrastructure/Compose/RelateOnCopyComponent.cs
@@ -6,7 +6,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 
-namespace Umbraco.Core.Compose
+namespace Umbraco.Cms.Core.Compose
 {
     // TODO: This should just exist in the content service/repo!
     public sealed class RelateOnCopyComponent : IComponent
diff --git a/src/Umbraco.Infrastructure/Compose/RelateOnCopyComposer.cs b/src/Umbraco.Infrastructure/Compose/RelateOnCopyComposer.cs
index c08cb5272b..ad2a3db78d 100644
--- a/src/Umbraco.Infrastructure/Compose/RelateOnCopyComposer.cs
+++ b/src/Umbraco.Infrastructure/Compose/RelateOnCopyComposer.cs
@@ -1,6 +1,6 @@
 using Umbraco.Cms.Core.Composing;
 
-namespace Umbraco.Core.Compose
+namespace Umbraco.Cms.Core.Compose
 {
     public sealed class RelateOnCopyComposer : ComponentComposer<RelateOnCopyComponent>, ICoreComposer
     { }
diff --git a/src/Umbraco.Infrastructure/Compose/RelateOnTrashComponent.cs b/src/Umbraco.Infrastructure/Compose/RelateOnTrashComponent.cs
index 81c333cbbc..9bfefb5217 100644
--- a/src/Umbraco.Infrastructure/Compose/RelateOnTrashComponent.cs
+++ b/src/Umbraco.Infrastructure/Compose/RelateOnTrashComponent.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Scoping;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Extensions;
 
-namespace Umbraco.Core.Compose
+namespace Umbraco.Cms.Core.Compose
 {
     public sealed class RelateOnTrashComponent : IComponent
     {
diff --git a/src/Umbraco.Infrastructure/Compose/RelateOnTrashComposer.cs b/src/Umbraco.Infrastructure/Compose/RelateOnTrashComposer.cs
index 690c58a498..8394dfc993 100644
--- a/src/Umbraco.Infrastructure/Compose/RelateOnTrashComposer.cs
+++ b/src/Umbraco.Infrastructure/Compose/RelateOnTrashComposer.cs
@@ -1,6 +1,6 @@
 using Umbraco.Cms.Core.Composing;
 
-namespace Umbraco.Core.Compose
+namespace Umbraco.Cms.Core.Compose
 {
     public sealed class RelateOnTrashComposer : ComponentComposer<RelateOnTrashComponent>, ICoreComposer
     { }
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs
index c8a70fe0ed..e1b9ec9264 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs
@@ -7,8 +7,8 @@ using System.Linq;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Compose;
 using Umbraco.Extensions;
-using Umbraco.Web.Compose;
 using Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs
index cb99bb2931..d132f346b4 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Newtonsoft.Json;
 using NUnit.Framework;
-using Umbraco.Web.Compose;
+using Umbraco.Cms.Core.Compose;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
 {
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs
index a90a3a4466..22bb48f693 100644
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs
+++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs
@@ -1,11 +1,11 @@
 using System;
 using Microsoft.Extensions.Options;
+using Umbraco.Cms.Core.Compose;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Web.Common.Security;
-using Umbraco.Core.Compose;
 using Umbraco.Core.Security;
 using Umbraco.Extensions;