diff --git a/src/Umbraco.Infrastructure/Compose/AuditNotificationsHandler.cs b/src/Umbraco.Core/Compose/AuditNotificationsHandler.cs
similarity index 99%
rename from src/Umbraco.Infrastructure/Compose/AuditNotificationsHandler.cs
rename to src/Umbraco.Core/Compose/AuditNotificationsHandler.cs
index e2da324b56..1347da05fd 100644
--- a/src/Umbraco.Infrastructure/Compose/AuditNotificationsHandler.cs
+++ b/src/Umbraco.Core/Compose/AuditNotificationsHandler.cs
@@ -9,7 +9,7 @@ using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Net;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Compose
diff --git a/src/Umbraco.Infrastructure/Compose/PublicAccessComposer.cs b/src/Umbraco.Core/Compose/PublicAccessComposer.cs
similarity index 91%
rename from src/Umbraco.Infrastructure/Compose/PublicAccessComposer.cs
rename to src/Umbraco.Core/Compose/PublicAccessComposer.cs
index c4dcfeb041..3f6e20c17f 100644
--- a/src/Umbraco.Infrastructure/Compose/PublicAccessComposer.cs
+++ b/src/Umbraco.Core/Compose/PublicAccessComposer.cs
@@ -1,6 +1,6 @@
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 
 namespace Umbraco.Cms.Core.Compose
 {
diff --git a/src/Umbraco.Infrastructure/Compose/PublicAccessHandler.cs b/src/Umbraco.Core/Compose/PublicAccessHandler.cs
similarity index 96%
rename from src/Umbraco.Infrastructure/Compose/PublicAccessHandler.cs
rename to src/Umbraco.Core/Compose/PublicAccessHandler.cs
index b9ded9aff8..a677db25d4 100644
--- a/src/Umbraco.Infrastructure/Compose/PublicAccessHandler.cs
+++ b/src/Umbraco.Core/Compose/PublicAccessHandler.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Compose
diff --git a/src/Umbraco.Infrastructure/Events/RelateOnCopyNotificationHandler.cs b/src/Umbraco.Core/Events/RelateOnCopyNotificationHandler.cs
similarity index 97%
rename from src/Umbraco.Infrastructure/Events/RelateOnCopyNotificationHandler.cs
rename to src/Umbraco.Core/Events/RelateOnCopyNotificationHandler.cs
index f88b529461..caa3777d39 100644
--- a/src/Umbraco.Infrastructure/Events/RelateOnCopyNotificationHandler.cs
+++ b/src/Umbraco.Core/Events/RelateOnCopyNotificationHandler.cs
@@ -3,7 +3,7 @@
 
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 
 namespace Umbraco.Cms.Core.Events
 {
diff --git a/src/Umbraco.Infrastructure/Events/UserNotificationsHandler.cs b/src/Umbraco.Core/Events/UserNotificationsHandler.cs
similarity index 99%
rename from src/Umbraco.Infrastructure/Events/UserNotificationsHandler.cs
rename to src/Umbraco.Core/Events/UserNotificationsHandler.cs
index 3df16dda25..1a9a457636 100644
--- a/src/Umbraco.Infrastructure/Events/UserNotificationsHandler.cs
+++ b/src/Umbraco.Core/Events/UserNotificationsHandler.cs
@@ -15,7 +15,7 @@ using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Events
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/AssignedMemberRolesNotification.cs b/src/Umbraco.Core/Services/Notifications/AssignedMemberRolesNotification.cs
similarity index 78%
rename from src/Umbraco.Infrastructure/Services/Notifications/AssignedMemberRolesNotification.cs
rename to src/Umbraco.Core/Services/Notifications/AssignedMemberRolesNotification.cs
index 9d5d707f64..edd1738a7d 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/AssignedMemberRolesNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/AssignedMemberRolesNotification.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class AssignedMemberRolesNotification : MemberRolesNotification
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/AssignedUserGroupPermissionsNotification.cs b/src/Umbraco.Core/Services/Notifications/AssignedUserGroupPermissionsNotification.cs
similarity index 88%
rename from src/Umbraco.Infrastructure/Services/Notifications/AssignedUserGroupPermissionsNotification.cs
rename to src/Umbraco.Core/Services/Notifications/AssignedUserGroupPermissionsNotification.cs
index e0838f8c33..d11cd01e07 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/AssignedUserGroupPermissionsNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/AssignedUserGroupPermissionsNotification.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models.Membership;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class AssignedUserGroupPermissionsNotification : EnumerableObjectNotification<EntityPermission>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentCopiedNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentCopiedNotification.cs
similarity index 88%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentCopiedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentCopiedNotification.cs
index 55946366e5..8589e14778 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentCopiedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentCopiedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentCopiedNotification : CopiedNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentCopyingNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentCopyingNotification.cs
similarity index 87%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentCopyingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentCopyingNotification.cs
index 85f5d1e189..9c3220e8e2 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentCopyingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentCopyingNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentCopyingNotification : CopyingNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentDeletedBlueprintNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentDeletedBlueprintNotification.cs
similarity index 91%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentDeletedBlueprintNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentDeletedBlueprintNotification.cs
index 55e61276d0..e2c49535a7 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentDeletedBlueprintNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentDeletedBlueprintNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentDeletedBlueprintNotification : EnumerableObjectNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentDeletedNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentDeletedNotification.cs
index 4c0d6c3e98..77f6e0cc51 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentDeletedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentDeletedNotification : DeletedNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentDeletedVersionsNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentDeletedVersionsNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentDeletedVersionsNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentDeletedVersionsNotification.cs
index 19a2ae45d3..34040135ba 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentDeletedVersionsNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentDeletedVersionsNotification.cs
@@ -5,7 +5,7 @@ using System;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentDeletedVersionsNotification : DeletedVersionsNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentDeletingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentDeletingNotification.cs
index d38eb13beb..befb932861 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentDeletingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentDeletingNotification : DeletingNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentDeletingVersionsNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentDeletingVersionsNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentDeletingVersionsNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentDeletingVersionsNotification.cs
index 7b791eafef..4929046ad5 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentDeletingVersionsNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentDeletingVersionsNotification.cs
@@ -5,7 +5,7 @@ using System;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentDeletingVersionsNotification : DeletingVersionsNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentEmptiedRecycleBinNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentEmptiedRecycleBinNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentEmptiedRecycleBinNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentEmptiedRecycleBinNotification.cs
index 53bc62fe91..e9e7bc8c12 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentEmptiedRecycleBinNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentEmptiedRecycleBinNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentEmptiedRecycleBinNotification : EmptiedRecycleBinNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentEmptyingRecycleBinNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentEmptyingRecycleBinNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentEmptyingRecycleBinNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentEmptyingRecycleBinNotification.cs
index 5d0ab67e26..ca9bc4abea 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentEmptyingRecycleBinNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentEmptyingRecycleBinNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentEmptyingRecycleBinNotification : EmptyingRecycleBinNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentMovedNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentMovedNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentMovedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentMovedNotification.cs
index 50bf0d1417..fb44887d93 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentMovedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentMovedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentMovedNotification : MovedNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentMovedToRecycleBinNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentMovedToRecycleBinNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentMovedToRecycleBinNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentMovedToRecycleBinNotification.cs
index b9da66e9aa..c3f2950fef 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentMovedToRecycleBinNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentMovedToRecycleBinNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentMovedToRecycleBinNotification : MovedToRecycleBinNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentMovingNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentMovingNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentMovingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentMovingNotification.cs
index b57c9e6cf0..b066c6aad5 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentMovingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentMovingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentMovingNotification : MovingNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentMovingToRecycleBinNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentMovingToRecycleBinNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentMovingToRecycleBinNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentMovingToRecycleBinNotification.cs
index fc5a5f401a..33e2bab8bc 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentMovingToRecycleBinNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentMovingToRecycleBinNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentMovingToRecycleBinNotification : MovingToRecycleBinNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentNotificationExtensions.cs b/src/Umbraco.Core/Services/Notifications/ContentNotificationExtensions.cs
similarity index 97%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentNotificationExtensions.cs
rename to src/Umbraco.Core/Services/Notifications/ContentNotificationExtensions.cs
index 426a82240c..27afb52c30 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentNotificationExtensions.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentNotificationExtensions.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public static class ContentNotificationExtensions
     {
@@ -57,7 +57,7 @@ namespace Umbraco.Cms.Infrastructure.Services.Notifications
             => HasUnpublishedCulture(content, culture);
 
         private static bool IsUnpublishingCulture(IContent content, string culture)
-            => content.IsPropertyDirty(ContentBase.ChangeTrackingPrefix.UnpublishedCulture + culture); 
+            => content.IsPropertyDirty(ContentBase.ChangeTrackingPrefix.UnpublishedCulture + culture);
 
         public static bool IsPublishingCulture(IContent content, string culture)
             => content.PublishCultureInfos.TryGetValue(culture, out ContentCultureInfos cultureInfo) && cultureInfo.IsDirty();
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentPublishedNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentPublishedNotification.cs
similarity index 91%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentPublishedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentPublishedNotification.cs
index f19899136e..f6c25cb800 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentPublishedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentPublishedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentPublishedNotification : EnumerableObjectNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentPublishingNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentPublishingNotification.cs
similarity index 91%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentPublishingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentPublishingNotification.cs
index b31b8fa391..d0937019d9 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentPublishingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentPublishingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentPublishingNotification : CancelableEnumerableObjectNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentRolledBackNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentRolledBackNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentRolledBackNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentRolledBackNotification.cs
index fbc64eebb2..0bb7a10cf1 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentRolledBackNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentRolledBackNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentRolledBackNotification : RolledBackNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentRollingBackNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentRollingBackNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentRollingBackNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentRollingBackNotification.cs
index ae3065ad58..9163e4b61c 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentRollingBackNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentRollingBackNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentRollingBackNotification : RollingBackNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentSavedBlueprintNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentSavedBlueprintNotification.cs
similarity index 87%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentSavedBlueprintNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentSavedBlueprintNotification.cs
index a57f278ef0..bbf85fca17 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentSavedBlueprintNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentSavedBlueprintNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentSavedBlueprintNotification : ObjectNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentSavedNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentSavedNotification.cs
index 0a79bf1285..c0ad60aa33 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentSavedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentSavedNotification : SavedNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentSavingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentSavingNotification.cs
index c32f584cc6..61a9b14861 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentSavingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentSavingNotification : SavingNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentSendingToPublishNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentSendingToPublishNotification.cs
similarity index 87%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentSendingToPublishNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentSendingToPublishNotification.cs
index 9719580c62..6aa367dd70 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentSendingToPublishNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentSendingToPublishNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentSendingToPublishNotification : CancelableObjectNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentSentToPublishNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentSentToPublishNotification.cs
similarity index 87%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentSentToPublishNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentSentToPublishNotification.cs
index 733fbfbb93..47088e01b9 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentSentToPublishNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentSentToPublishNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentSentToPublishNotification : ObjectNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentSortedNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentSortedNotification.cs
similarity index 86%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentSortedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentSortedNotification.cs
index fa51155f96..1646b5cf55 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentSortedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentSortedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentSortedNotification : SortedNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentSortingNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentSortingNotification.cs
similarity index 86%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentSortingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentSortingNotification.cs
index e5b011276d..375bbceead 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentSortingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentSortingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentSortingNotification : SortingNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentUnpublishedNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentUnpublishedNotification.cs
similarity index 91%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentUnpublishedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentUnpublishedNotification.cs
index 2beb8f2d55..03bedec921 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentUnpublishedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentUnpublishedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentUnpublishedNotification : EnumerableObjectNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ContentUnpublishingNotification.cs b/src/Umbraco.Core/Services/Notifications/ContentUnpublishingNotification.cs
similarity index 91%
rename from src/Umbraco.Infrastructure/Services/Notifications/ContentUnpublishingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ContentUnpublishingNotification.cs
index 85db0015c3..bb7b499ab7 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ContentUnpublishingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ContentUnpublishingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class ContentUnpublishingNotification : CancelableEnumerableObjectNotification<IContent>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/DeletedVersionsNotification.cs b/src/Umbraco.Core/Services/Notifications/DeletedVersionsNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/DeletedVersionsNotification.cs
rename to src/Umbraco.Core/Services/Notifications/DeletedVersionsNotification.cs
index 4e8e4d5ba4..836a9832a5 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/DeletedVersionsNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/DeletedVersionsNotification.cs
@@ -4,7 +4,7 @@
 using System;
 using Umbraco.Cms.Core.Events;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public abstract class DeletedVersionsNotification<T> : DeletedVersionsNotificationBase<T> where T : class
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/DeletedVersionsNotificationBase.cs b/src/Umbraco.Core/Services/Notifications/DeletedVersionsNotificationBase.cs
similarity index 93%
rename from src/Umbraco.Infrastructure/Services/Notifications/DeletedVersionsNotificationBase.cs
rename to src/Umbraco.Core/Services/Notifications/DeletedVersionsNotificationBase.cs
index 938a174fbe..2a3c78ee21 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/DeletedVersionsNotificationBase.cs
+++ b/src/Umbraco.Core/Services/Notifications/DeletedVersionsNotificationBase.cs
@@ -4,7 +4,7 @@
 using System;
 using Umbraco.Cms.Core.Events;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public abstract class DeletedVersionsNotificationBase<T> : StatefulNotification where T : class
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/DeletingVersionsNotification.cs b/src/Umbraco.Core/Services/Notifications/DeletingVersionsNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/DeletingVersionsNotification.cs
rename to src/Umbraco.Core/Services/Notifications/DeletingVersionsNotification.cs
index 4c6d8423fd..cc8b06d839 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/DeletingVersionsNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/DeletingVersionsNotification.cs
@@ -4,7 +4,7 @@
 using System;
 using Umbraco.Cms.Core.Events;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public abstract class DeletingVersionsNotification<T> : DeletedVersionsNotificationBase<T>, ICancelableNotification where T : class
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/DictionaryItemDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/DictionaryItemDeletedNotification.cs
similarity index 86%
rename from src/Umbraco.Infrastructure/Services/Notifications/DictionaryItemDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/DictionaryItemDeletedNotification.cs
index 3d3b9588d0..7c2b702888 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/DictionaryItemDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/DictionaryItemDeletedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class DictionaryItemDeletedNotification : DeletedNotification<IDictionaryItem>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/DictionaryItemDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/DictionaryItemDeletingNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/DictionaryItemDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/DictionaryItemDeletingNotification.cs
index ff85e00a81..b468e4ca1d 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/DictionaryItemDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/DictionaryItemDeletingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class DictionaryItemDeletingNotification : DeletingNotification<IDictionaryItem>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/DictionaryItemSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/DictionaryItemSavedNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/DictionaryItemSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/DictionaryItemSavedNotification.cs
index 3a64e35979..596bb20a65 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/DictionaryItemSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/DictionaryItemSavedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class DictionaryItemSavedNotification : SavedNotification<IDictionaryItem>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/DictionaryItemSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/DictionaryItemSavingNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/DictionaryItemSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/DictionaryItemSavingNotification.cs
index 5f3d94697e..71c5cf8cac 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/DictionaryItemSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/DictionaryItemSavingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class DictionaryItemSavingNotification : SavingNotification<IDictionaryItem>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/DomainDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/DomainDeletedNotification.cs
similarity index 84%
rename from src/Umbraco.Infrastructure/Services/Notifications/DomainDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/DomainDeletedNotification.cs
index 3210b5cc24..150850e3d2 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/DomainDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/DomainDeletedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class DomainDeletedNotification : DeletedNotification<IDomain>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/DomainDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/DomainDeletingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/DomainDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/DomainDeletingNotification.cs
index b16a35ee14..822d45cd5b 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/DomainDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/DomainDeletingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class DomainDeletingNotification : DeletingNotification<IDomain>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/DomainSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/DomainSavedNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/DomainSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/DomainSavedNotification.cs
index 6cfaa2304c..4854c41f23 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/DomainSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/DomainSavedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class DomainSavedNotification : SavedNotification<IDomain>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/DomainSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/DomainSavingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/DomainSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/DomainSavingNotification.cs
index 2689082314..3cc8567d3d 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/DomainSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/DomainSavingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class DomainSavingNotification : SavingNotification<IDomain>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/EmptiedRecycleBinNotification.cs b/src/Umbraco.Core/Services/Notifications/EmptiedRecycleBinNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/EmptiedRecycleBinNotification.cs
rename to src/Umbraco.Core/Services/Notifications/EmptiedRecycleBinNotification.cs
index 1859687170..f0644761fb 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/EmptiedRecycleBinNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/EmptiedRecycleBinNotification.cs
@@ -3,7 +3,7 @@
 
 using Umbraco.Cms.Core.Events;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public abstract class EmptiedRecycleBinNotification<T> : StatefulNotification where T : class
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/EmptyingRecycleBinNotification.cs b/src/Umbraco.Core/Services/Notifications/EmptyingRecycleBinNotification.cs
similarity index 87%
rename from src/Umbraco.Infrastructure/Services/Notifications/EmptyingRecycleBinNotification.cs
rename to src/Umbraco.Core/Services/Notifications/EmptyingRecycleBinNotification.cs
index 86ee7f303d..8a50a1eea0 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/EmptyingRecycleBinNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/EmptyingRecycleBinNotification.cs
@@ -3,7 +3,7 @@
 
 using Umbraco.Cms.Core.Events;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public abstract class EmptyingRecycleBinNotification<T> : StatefulNotification, ICancelableNotification where T : class
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ExportedMemberNotification.cs b/src/Umbraco.Core/Services/Notifications/ExportedMemberNotification.cs
similarity index 88%
rename from src/Umbraco.Infrastructure/Services/Notifications/ExportedMemberNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ExportedMemberNotification.cs
index 449244242f..0218710010 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ExportedMemberNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ExportedMemberNotification.cs
@@ -2,7 +2,7 @@ using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Membership;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class ExportedMemberNotification : INotification
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/LanguageDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/LanguageDeletedNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/LanguageDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/LanguageDeletedNotification.cs
index cba1c59406..a8242f4ced 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/LanguageDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/LanguageDeletedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class LanguageDeletedNotification : DeletedNotification<ILanguage>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/LanguageDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/LanguageDeletingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/LanguageDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/LanguageDeletingNotification.cs
index 79215e25af..52897714c3 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/LanguageDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/LanguageDeletingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class LanguageDeletingNotification : DeletingNotification<ILanguage>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/LanguageSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/LanguageSavedNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/LanguageSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/LanguageSavedNotification.cs
index 87c3644df9..39b3008eaa 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/LanguageSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/LanguageSavedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class LanguageSavedNotification : SavedNotification<ILanguage>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/LanguageSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/LanguageSavingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/LanguageSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/LanguageSavingNotification.cs
index db416799d9..49620634df 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/LanguageSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/LanguageSavingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class LanguageSavingNotification : SavingNotification<ILanguage>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MacroDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/MacroDeletedNotification.cs
similarity index 82%
rename from src/Umbraco.Infrastructure/Services/Notifications/MacroDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MacroDeletedNotification.cs
index 56e0ea759b..e5c56c8bcf 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MacroDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MacroDeletedNotification.cs
@@ -1,7 +1,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class MacroDeletedNotification : DeletedNotification<IMacro>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MacroDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/MacroDeletingNotification.cs
similarity index 88%
rename from src/Umbraco.Infrastructure/Services/Notifications/MacroDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MacroDeletingNotification.cs
index fbf560cb77..bd64c33ff6 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MacroDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MacroDeletingNotification.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class MacroDeletingNotification : DeletingNotification<IMacro>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MacroSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/MacroSavedNotification.cs
similarity index 87%
rename from src/Umbraco.Infrastructure/Services/Notifications/MacroSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MacroSavedNotification.cs
index e93b8e3cec..d7b85246be 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MacroSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MacroSavedNotification.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class MacroSavedNotification : SavedNotification<IMacro>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MacroSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/MacroSavingNotification.cs
similarity index 88%
rename from src/Umbraco.Infrastructure/Services/Notifications/MacroSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MacroSavingNotification.cs
index 689272620c..c310951d23 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MacroSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MacroSavingNotification.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class MacroSavingNotification : SavingNotification<IMacro>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MediaDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/MediaDeletedNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/MediaDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MediaDeletedNotification.cs
index c78bfa863d..9ad1e75a41 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MediaDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MediaDeletedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MediaDeletedNotification : DeletedNotification<IMedia>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MediaDeletedVersionsNotification.cs b/src/Umbraco.Core/Services/Notifications/MediaDeletedVersionsNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/MediaDeletedVersionsNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MediaDeletedVersionsNotification.cs
index 789079bd5e..7efa10f317 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MediaDeletedVersionsNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MediaDeletedVersionsNotification.cs
@@ -5,7 +5,7 @@ using System;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MediaDeletedVersionsNotification : DeletedVersionsNotification<IMedia>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MediaDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/MediaDeletingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/MediaDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MediaDeletingNotification.cs
index 524865bbfb..027e0f7b50 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MediaDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MediaDeletingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MediaDeletingNotification : DeletingNotification<IMedia>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MediaDeletingVersionsNotification.cs b/src/Umbraco.Core/Services/Notifications/MediaDeletingVersionsNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/MediaDeletingVersionsNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MediaDeletingVersionsNotification.cs
index fd979b5641..361739cee3 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MediaDeletingVersionsNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MediaDeletingVersionsNotification.cs
@@ -5,7 +5,7 @@ using System;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MediaDeletingVersionsNotification : DeletingVersionsNotification<IMedia>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MediaEmptiedRecycleBinNotification.cs b/src/Umbraco.Core/Services/Notifications/MediaEmptiedRecycleBinNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/MediaEmptiedRecycleBinNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MediaEmptiedRecycleBinNotification.cs
index 8d984eceab..a32c67d636 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MediaEmptiedRecycleBinNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MediaEmptiedRecycleBinNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MediaEmptiedRecycleBinNotification : EmptiedRecycleBinNotification<IMedia>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MediaEmptyingRecycleBinNotification.cs b/src/Umbraco.Core/Services/Notifications/MediaEmptyingRecycleBinNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/MediaEmptyingRecycleBinNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MediaEmptyingRecycleBinNotification.cs
index 1fd72c7d99..1689140376 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MediaEmptyingRecycleBinNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MediaEmptyingRecycleBinNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MediaEmptyingRecycleBinNotification : EmptyingRecycleBinNotification<IMedia>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MediaMovedNotification.cs b/src/Umbraco.Core/Services/Notifications/MediaMovedNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/MediaMovedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MediaMovedNotification.cs
index 43f8f8a3ff..fed8da869f 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MediaMovedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MediaMovedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MediaMovedNotification : MovedNotification<IMedia>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MediaMovedToRecycleBinNotification.cs b/src/Umbraco.Core/Services/Notifications/MediaMovedToRecycleBinNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/MediaMovedToRecycleBinNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MediaMovedToRecycleBinNotification.cs
index bb9274f941..599ea97ce4 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MediaMovedToRecycleBinNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MediaMovedToRecycleBinNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MediaMovedToRecycleBinNotification : MovedToRecycleBinNotification<IMedia>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MediaMovingNotification.cs b/src/Umbraco.Core/Services/Notifications/MediaMovingNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/MediaMovingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MediaMovingNotification.cs
index 407c95918a..30cac1fd87 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MediaMovingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MediaMovingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MediaMovingNotification : MovingNotification<IMedia>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MediaMovingToRecycleBinNotification.cs b/src/Umbraco.Core/Services/Notifications/MediaMovingToRecycleBinNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/MediaMovingToRecycleBinNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MediaMovingToRecycleBinNotification.cs
index 72e20ca424..9895c4296b 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MediaMovingToRecycleBinNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MediaMovingToRecycleBinNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MediaMovingToRecycleBinNotification : MovingToRecycleBinNotification<IMedia>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MediaSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/MediaSavedNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/MediaSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MediaSavedNotification.cs
index 4337cd1eb3..e23e95c27d 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MediaSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MediaSavedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MediaSavedNotification : SavedNotification<IMedia>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MediaSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/MediaSavingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/MediaSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MediaSavingNotification.cs
index cca0de8d19..50deaffaed 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MediaSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MediaSavingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MediaSavingNotification : SavingNotification<IMedia>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MediaTreeChangeNotification.cs b/src/Umbraco.Core/Services/Notifications/MediaTreeChangeNotification.cs
similarity index 94%
rename from src/Umbraco.Infrastructure/Services/Notifications/MediaTreeChangeNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MediaTreeChangeNotification.cs
index ac34e5600f..264bdb6bb2 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MediaTreeChangeNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MediaTreeChangeNotification.cs
@@ -4,7 +4,7 @@ using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services.Changes;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class MediaTreeChangeNotification : TreeChangeNotification<IMedia>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MemberDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/MemberDeletedNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/MemberDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MemberDeletedNotification.cs
index 41edd5371e..09e27e3c43 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MemberDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MemberDeletedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MemberDeletedNotification : DeletedNotification<IMember>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MemberDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/MemberDeletingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/MemberDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MemberDeletingNotification.cs
index 4a4cd585c5..dd0fbcb70c 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MemberDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MemberDeletingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MemberDeletingNotification : DeletingNotification<IMember>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MemberGroupDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/MemberGroupDeletedNotification.cs
similarity index 83%
rename from src/Umbraco.Infrastructure/Services/Notifications/MemberGroupDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MemberGroupDeletedNotification.cs
index 1441344ec5..59a827ee20 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MemberGroupDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MemberGroupDeletedNotification.cs
@@ -1,7 +1,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class MemberGroupDeletedNotification : DeletedNotification<IMemberGroup>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MemberGroupDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/MemberGroupDeletingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/MemberGroupDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MemberGroupDeletingNotification.cs
index 34e4140752..4f3d06dbc7 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MemberGroupDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MemberGroupDeletingNotification.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class MemberGroupDeletingNotification : DeletingNotification<IMemberGroup>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MemberGroupSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/MemberGroupSavedNotification.cs
similarity index 88%
rename from src/Umbraco.Infrastructure/Services/Notifications/MemberGroupSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MemberGroupSavedNotification.cs
index f9af9806ef..745660d8c7 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MemberGroupSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MemberGroupSavedNotification.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class MemberGroupSavedNotification : SavedNotification<IMemberGroup>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MemberGroupSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/MemberGroupSavingNotification.cs
similarity index 88%
rename from src/Umbraco.Infrastructure/Services/Notifications/MemberGroupSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MemberGroupSavingNotification.cs
index 67e03c2268..49d88ea92a 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MemberGroupSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MemberGroupSavingNotification.cs
@@ -2,7 +2,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class MemberGroupSavingNotification : SavingNotification<IMemberGroup>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MemberRolesNotification.cs b/src/Umbraco.Core/Services/Notifications/MemberRolesNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/MemberRolesNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MemberRolesNotification.cs
index 2b7c9bd828..bfc576fbb0 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MemberRolesNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MemberRolesNotification.cs
@@ -1,6 +1,6 @@
 using Umbraco.Cms.Core.Events;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public abstract class MemberRolesNotification : INotification
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MemberSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/MemberSavedNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/MemberSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MemberSavedNotification.cs
index 6ea4e38870..9f245502bd 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MemberSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MemberSavedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MemberSavedNotification : SavedNotification<IMember>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MemberSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/MemberSavingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/MemberSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MemberSavingNotification.cs
index 8496731304..37c90a9127 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MemberSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MemberSavingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class MemberSavingNotification : SavingNotification<IMember>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MovedToRecycleBinNotification.cs b/src/Umbraco.Core/Services/Notifications/MovedToRecycleBinNotification.cs
similarity index 91%
rename from src/Umbraco.Infrastructure/Services/Notifications/MovedToRecycleBinNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MovedToRecycleBinNotification.cs
index 4562cdab30..8470edd311 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MovedToRecycleBinNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MovedToRecycleBinNotification.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public abstract class MovedToRecycleBinNotification<T> : ObjectNotification<IEnumerable<MoveEventInfo<T>>>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/MovingToRecycleBinNotification.cs b/src/Umbraco.Core/Services/Notifications/MovingToRecycleBinNotification.cs
similarity index 91%
rename from src/Umbraco.Infrastructure/Services/Notifications/MovingToRecycleBinNotification.cs
rename to src/Umbraco.Core/Services/Notifications/MovingToRecycleBinNotification.cs
index 38e989a418..b62e6cfa94 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/MovingToRecycleBinNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/MovingToRecycleBinNotification.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public abstract class MovingToRecycleBinNotification<T> : CancelableObjectNotification<IEnumerable<MoveEventInfo<T>>>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/PartialViewCreatedNotification.cs b/src/Umbraco.Core/Services/Notifications/PartialViewCreatedNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/PartialViewCreatedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/PartialViewCreatedNotification.cs
index 0b51ea1b67..92f5738e71 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/PartialViewCreatedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/PartialViewCreatedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class PartialViewCreatedNotification : CreatedNotification<IPartialView>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/PartialViewCreatingNotification.cs b/src/Umbraco.Core/Services/Notifications/PartialViewCreatingNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/PartialViewCreatingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/PartialViewCreatingNotification.cs
index f537bd7329..1439db3af1 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/PartialViewCreatingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/PartialViewCreatingNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class PartialViewCreatingNotification : CreatingNotification<IPartialView>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/PartialViewDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/PartialViewDeletedNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/PartialViewDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/PartialViewDeletedNotification.cs
index 85e5c92b1c..60d6d1aae4 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/PartialViewDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/PartialViewDeletedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class PartialViewDeletedNotification : DeletedNotification<IPartialView>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/PartialViewDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/PartialViewDeletingNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/PartialViewDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/PartialViewDeletingNotification.cs
index 362445992d..67ee8314c7 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/PartialViewDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/PartialViewDeletingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class PartialViewDeletingNotification : DeletingNotification<IPartialView>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/PartialViewSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/PartialViewSavedNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/PartialViewSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/PartialViewSavedNotification.cs
index 586ab7292c..9ecde239a6 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/PartialViewSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/PartialViewSavedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class PartialViewSavedNotification : SavedNotification<IPartialView>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/PartialViewSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/PartialViewSavingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/PartialViewSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/PartialViewSavingNotification.cs
index 9734ce4502..98140b1c8a 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/PartialViewSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/PartialViewSavingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class PartialViewSavingNotification : SavingNotification<IPartialView>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/PublicAccessEntryDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/PublicAccessEntryDeletedNotification.cs
similarity index 86%
rename from src/Umbraco.Infrastructure/Services/Notifications/PublicAccessEntryDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/PublicAccessEntryDeletedNotification.cs
index 03f48dff5c..1dd8fb6bca 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/PublicAccessEntryDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/PublicAccessEntryDeletedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class PublicAccessEntryDeletedNotification : DeletedNotification<PublicAccessEntry>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/PublicAccessEntryDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/PublicAccessEntryDeletingNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/PublicAccessEntryDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/PublicAccessEntryDeletingNotification.cs
index 521a86caff..a02388c7b4 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/PublicAccessEntryDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/PublicAccessEntryDeletingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class PublicAccessEntryDeletingNotification : DeletingNotification<PublicAccessEntry>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/PublicAccessEntrySavedNotification.cs b/src/Umbraco.Core/Services/Notifications/PublicAccessEntrySavedNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/PublicAccessEntrySavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/PublicAccessEntrySavedNotification.cs
index ec1781a3d4..6f72bc6ed3 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/PublicAccessEntrySavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/PublicAccessEntrySavedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class PublicAccessEntrySavedNotification : SavedNotification<PublicAccessEntry>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/PublicAccessEntrySavingNotification.cs b/src/Umbraco.Core/Services/Notifications/PublicAccessEntrySavingNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/PublicAccessEntrySavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/PublicAccessEntrySavingNotification.cs
index 63f4a490a3..57a6709b13 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/PublicAccessEntrySavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/PublicAccessEntrySavingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class PublicAccessEntrySavingNotification : SavingNotification<PublicAccessEntry>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/RelationDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/RelationDeletedNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/RelationDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/RelationDeletedNotification.cs
index 71b182a2fe..ca613c59c9 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/RelationDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/RelationDeletedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class RelationDeletedNotification : DeletedNotification<IRelation>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/RelationDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/RelationDeletingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/RelationDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/RelationDeletingNotification.cs
index f05b0fe3de..7684d24c3d 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/RelationDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/RelationDeletingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class RelationDeletingNotification : DeletingNotification<IRelation>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/RelationSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/RelationSavedNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/RelationSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/RelationSavedNotification.cs
index a20d82f8d8..c24e71f4bb 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/RelationSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/RelationSavedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class RelationSavedNotification : SavedNotification<IRelation>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/RelationSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/RelationSavingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/RelationSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/RelationSavingNotification.cs
index 2fae1d84c7..f88d42c10a 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/RelationSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/RelationSavingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class RelationSavingNotification : SavingNotification<IRelation>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/RelationTypeDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/RelationTypeDeletedNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/RelationTypeDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/RelationTypeDeletedNotification.cs
index 54c94f0d4d..eee42da028 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/RelationTypeDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/RelationTypeDeletedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class RelationTypeDeletedNotification : DeletedNotification<IRelationType>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/RelationTypeDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/RelationTypeDeletingNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/RelationTypeDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/RelationTypeDeletingNotification.cs
index e77e968f78..1749817677 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/RelationTypeDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/RelationTypeDeletingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class RelationTypeDeletingNotification : DeletingNotification<IRelationType>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/RelationTypeSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/RelationTypeSavedNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/RelationTypeSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/RelationTypeSavedNotification.cs
index 5b06fb9667..489f53dc65 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/RelationTypeSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/RelationTypeSavedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class RelationTypeSavedNotification : SavedNotification<IRelationType>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/RelationTypeSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/RelationTypeSavingNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/RelationTypeSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/RelationTypeSavingNotification.cs
index 1e08ce47ea..402f6c6eeb 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/RelationTypeSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/RelationTypeSavingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class RelationTypeSavingNotification : SavingNotification<IRelationType>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/RemovedMemberRolesNotification.cs b/src/Umbraco.Core/Services/Notifications/RemovedMemberRolesNotification.cs
similarity index 78%
rename from src/Umbraco.Infrastructure/Services/Notifications/RemovedMemberRolesNotification.cs
rename to src/Umbraco.Core/Services/Notifications/RemovedMemberRolesNotification.cs
index bd902cb078..1e7d149d45 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/RemovedMemberRolesNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/RemovedMemberRolesNotification.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class RemovedMemberRolesNotification : MemberRolesNotification
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ScriptDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/ScriptDeletedNotification.cs
similarity index 84%
rename from src/Umbraco.Infrastructure/Services/Notifications/ScriptDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ScriptDeletedNotification.cs
index f20e0c8e24..27ea080204 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ScriptDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ScriptDeletedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class ScriptDeletedNotification : DeletedNotification<IScript>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ScriptDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/ScriptDeletingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/ScriptDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ScriptDeletingNotification.cs
index 37de26232f..8ee6db4406 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ScriptDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ScriptDeletingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class ScriptDeletingNotification : DeletingNotification<IScript>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ScriptSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/ScriptSavedNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/ScriptSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ScriptSavedNotification.cs
index 7699221ef0..86cb55426c 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ScriptSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ScriptSavedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class ScriptSavedNotification : SavedNotification<IScript>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/ScriptSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/ScriptSavingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/ScriptSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/ScriptSavingNotification.cs
index 8a9a0a542b..dc8c5a8990 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/ScriptSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/ScriptSavingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class ScriptSavingNotification : SavingNotification<IScript>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/StylesheetDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/StylesheetDeletedNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/StylesheetDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/StylesheetDeletedNotification.cs
index 46f2fbdc88..12b84283bc 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/StylesheetDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/StylesheetDeletedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class StylesheetDeletedNotification : DeletedNotification<IStylesheet>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/StylesheetDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/StylesheetDeletingNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/StylesheetDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/StylesheetDeletingNotification.cs
index fa6d8c9beb..eccf10d4c6 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/StylesheetDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/StylesheetDeletingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class StylesheetDeletingNotification : DeletingNotification<IStylesheet>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/StylesheetSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/StylesheetSavedNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/StylesheetSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/StylesheetSavedNotification.cs
index 18d2465356..1e0690ba88 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/StylesheetSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/StylesheetSavedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class StylesheetSavedNotification : SavedNotification<IStylesheet>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/StylesheetSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/StylesheetSavingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/StylesheetSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/StylesheetSavingNotification.cs
index ccdb95870d..6bd2f2e4a7 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/StylesheetSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/StylesheetSavingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class StylesheetSavingNotification : SavingNotification<IStylesheet>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/TemplateDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/TemplateDeletedNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/TemplateDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/TemplateDeletedNotification.cs
index d22b014040..2b51f6adc1 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/TemplateDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/TemplateDeletedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class TemplateDeletedNotification : DeletedNotification<ITemplate>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/TemplateDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/TemplateDeletingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/TemplateDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/TemplateDeletingNotification.cs
index 7223e61ecb..9384aa9af5 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/TemplateDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/TemplateDeletingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class TemplateDeletingNotification : DeletingNotification<ITemplate>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/TemplateSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/TemplateSavedNotification.cs
similarity index 95%
rename from src/Umbraco.Infrastructure/Services/Notifications/TemplateSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/TemplateSavedNotification.cs
index 94152acabc..81940620c5 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/TemplateSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/TemplateSavedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class TemplateSavedNotification : SavedNotification<ITemplate>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/TemplateSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/TemplateSavingNotification.cs
similarity index 97%
rename from src/Umbraco.Infrastructure/Services/Notifications/TemplateSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/TemplateSavingNotification.cs
index 7c2408fdad..36c70e72dd 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/TemplateSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/TemplateSavingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public class TemplateSavingNotification : SavingNotification<ITemplate>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/UserDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/UserDeletedNotification.cs
similarity index 85%
rename from src/Umbraco.Infrastructure/Services/Notifications/UserDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/UserDeletedNotification.cs
index 3173647652..4347211847 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/UserDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/UserDeletedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models.Membership;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class UserDeletedNotification : DeletedNotification<IUser>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/UserDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/UserDeletingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/UserDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/UserDeletingNotification.cs
index 1f57755a5a..5e5c094b65 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/UserDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/UserDeletingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models.Membership;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class UserDeletingNotification : DeletingNotification<IUser>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/UserGroupDeletedNotification.cs b/src/Umbraco.Core/Services/Notifications/UserGroupDeletedNotification.cs
similarity index 86%
rename from src/Umbraco.Infrastructure/Services/Notifications/UserGroupDeletedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/UserGroupDeletedNotification.cs
index a9c51dc72d..934f607226 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/UserGroupDeletedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/UserGroupDeletedNotification.cs
@@ -4,7 +4,7 @@
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models.Membership;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class UserGroupDeletedNotification : DeletedNotification<IUserGroup>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/UserGroupDeletingNotification.cs b/src/Umbraco.Core/Services/Notifications/UserGroupDeletingNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/UserGroupDeletingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/UserGroupDeletingNotification.cs
index c176e55456..17ee3a5f83 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/UserGroupDeletingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/UserGroupDeletingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models.Membership;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class UserGroupDeletingNotification : DeletingNotification<IUserGroup>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/UserGroupSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/UserGroupSavedNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/UserGroupSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/UserGroupSavedNotification.cs
index b542b35b26..459c265eaa 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/UserGroupSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/UserGroupSavedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models.Membership;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class UserGroupSavedNotification : SavedNotification<IUserGroup>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/UserGroupSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/UserGroupSavingNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/UserGroupSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/UserGroupSavingNotification.cs
index 136b2da6a5..d479e2d15d 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/UserGroupSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/UserGroupSavingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models.Membership;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class UserGroupSavingNotification : SavingNotification<IUserGroup>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/UserGroupWithUsersSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/UserGroupWithUsersSavedNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/UserGroupWithUsersSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/UserGroupWithUsersSavedNotification.cs
index 22e0d67d06..d1a3ad2651 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/UserGroupWithUsersSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/UserGroupWithUsersSavedNotification.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class UserGroupWithUsersSavedNotification : SavedNotification<UserGroupWithUsers>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/UserGroupWithUsersSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/UserGroupWithUsersSavingNotification.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Services/Notifications/UserGroupWithUsersSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/UserGroupWithUsersSavingNotification.cs
index c61087038a..a2705e7971 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/UserGroupWithUsersSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/UserGroupWithUsersSavingNotification.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class UserGroupWithUsersSavingNotification : SavingNotification<UserGroupWithUsers>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/UserSavedNotification.cs b/src/Umbraco.Core/Services/Notifications/UserSavedNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/UserSavedNotification.cs
rename to src/Umbraco.Core/Services/Notifications/UserSavedNotification.cs
index 850085ae90..b173709a2b 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/UserSavedNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/UserSavedNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models.Membership;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class UserSavedNotification : SavedNotification<IUser>
     {
diff --git a/src/Umbraco.Infrastructure/Services/Notifications/UserSavingNotification.cs b/src/Umbraco.Core/Services/Notifications/UserSavingNotification.cs
similarity index 89%
rename from src/Umbraco.Infrastructure/Services/Notifications/UserSavingNotification.cs
rename to src/Umbraco.Core/Services/Notifications/UserSavingNotification.cs
index 0b062c33f1..ddb10dd181 100644
--- a/src/Umbraco.Infrastructure/Services/Notifications/UserSavingNotification.cs
+++ b/src/Umbraco.Core/Services/Notifications/UserSavingNotification.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models.Membership;
 
-namespace Umbraco.Cms.Infrastructure.Services.Notifications
+namespace Umbraco.Cms.Core.Services.Notifications
 {
     public sealed class UserSavingNotification : SavingNotification<IUser>
     {
diff --git a/src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs b/src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs
index 2bc9cad081..0fe9b62e4c 100644
--- a/src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs
+++ b/src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs
@@ -11,7 +11,7 @@ using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.Changes;
 using Umbraco.Cms.Core.Services.Implement;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Cache
diff --git a/src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs b/src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs
index c29d4c3e03..3fb7bd34ac 100644
--- a/src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs
+++ b/src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs
@@ -5,11 +5,9 @@ using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Routing;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Compose
diff --git a/src/Umbraco.Infrastructure/Events/RelateOnTrashNotificationHandler.cs b/src/Umbraco.Infrastructure/Events/RelateOnTrashNotificationHandler.cs
index 0ea5844b92..fc338fd3fe 100644
--- a/src/Umbraco.Infrastructure/Events/RelateOnTrashNotificationHandler.cs
+++ b/src/Umbraco.Infrastructure/Events/RelateOnTrashNotificationHandler.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Events
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberGroupRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberGroupRepository.cs
index 2d73413563..c7324de914 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberGroupRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberGroupRepository.cs
@@ -9,10 +9,10 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Scoping;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Infrastructure.Persistence.Factories;
 using Umbraco.Cms.Infrastructure.Persistence.Querying;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ComplexPropertyEditorContentNotificationHandler.cs b/src/Umbraco.Infrastructure/PropertyEditors/ComplexPropertyEditorContentNotificationHandler.cs
index 23fb498d77..73748c4a48 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ComplexPropertyEditorContentNotificationHandler.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ComplexPropertyEditorContentNotificationHandler.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.PropertyEditors
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs
index a794d62ce2..a0bbf2a7fe 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs
@@ -13,8 +13,8 @@ using Umbraco.Cms.Core.Media;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.PropertyEditors
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
index 902cb32f08..e138e98618 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
@@ -15,8 +15,8 @@ using Umbraco.Cms.Core.Media;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.PropertyEditors
diff --git a/src/Umbraco.Infrastructure/Routing/RedirectTrackingHandler.cs b/src/Umbraco.Infrastructure/Routing/RedirectTrackingHandler.cs
index 19dc90181a..d71b5570d2 100644
--- a/src/Umbraco.Infrastructure/Routing/RedirectTrackingHandler.cs
+++ b/src/Umbraco.Infrastructure/Routing/RedirectTrackingHandler.cs
@@ -11,7 +11,7 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Routing
diff --git a/src/Umbraco.Infrastructure/Services/Implement/ContentService.cs b/src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
index 7c3b3db346..6cf8f5c264 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
@@ -11,9 +11,9 @@ using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services.Changes;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Persistence.Querying;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Services.Implement
diff --git a/src/Umbraco.Infrastructure/Services/Implement/DomainService.cs b/src/Umbraco.Infrastructure/Services/Implement/DomainService.cs
index 0540c04d64..d3937b5bb0 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/DomainService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/DomainService.cs
@@ -4,7 +4,7 @@ using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 
 namespace Umbraco.Cms.Core.Services.Implement
 {
diff --git a/src/Umbraco.Infrastructure/Services/Implement/FileService.cs b/src/Umbraco.Infrastructure/Services/Implement/FileService.cs
index c9531deb67..68a02fa478 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/FileService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/FileService.cs
@@ -11,8 +11,8 @@ using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Scoping;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Services.Implement
diff --git a/src/Umbraco.Infrastructure/Services/Implement/LocalizationService.cs b/src/Umbraco.Infrastructure/Services/Implement/LocalizationService.cs
index a15d782db5..0e6b89693d 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/LocalizationService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/LocalizationService.cs
@@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Services.Implement
diff --git a/src/Umbraco.Infrastructure/Services/Implement/MacroService.cs b/src/Umbraco.Infrastructure/Services/Implement/MacroService.cs
index 68192218eb..6d053eb1d1 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/MacroService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/MacroService.cs
@@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 
 namespace Umbraco.Cms.Core.Services.Implement
 {
diff --git a/src/Umbraco.Infrastructure/Services/Implement/MediaService.cs b/src/Umbraco.Infrastructure/Services/Implement/MediaService.cs
index 0b6345cfcd..26a90e6499 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/MediaService.cs
@@ -11,9 +11,9 @@ using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services.Changes;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Persistence.Querying;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Services.Implement
@@ -854,7 +854,7 @@ namespace Umbraco.Cms.Core.Services.Implement
         {
             var evtMsgs = EventMessagesFactory.Get();
 
-            using (var scope = ScopeProvider.CreateScope())
+            using (IScope scope = ScopeProvider.CreateScope())
             {
                 var deletingVersionsNotification = new MediaDeletingVersionsNotification(id, evtMsgs, specificVersion: versionId);
                 if (scope.Notifications.PublishCancelable(deletingVersionsNotification))
@@ -1047,7 +1047,7 @@ namespace Umbraco.Cms.Core.Services.Implement
             var deleted = new List<IMedia>();
             EventMessages messages = EventMessagesFactory.Get(); // TODO: and then?
 
-            using (var scope = ScopeProvider.CreateScope())
+            using (IScope scope = ScopeProvider.CreateScope())
             {
                 scope.WriteLock(Cms.Core.Constants.Locks.MediaTree);
 
@@ -1300,7 +1300,7 @@ namespace Umbraco.Cms.Core.Services.Implement
             if (mediaTypeAlias == null) throw new ArgumentNullException(nameof(mediaTypeAlias));
             if (string.IsNullOrWhiteSpace(mediaTypeAlias)) throw new ArgumentException("Value can't be empty or consist only of white-space characters.", nameof(mediaTypeAlias));
 
-            using (var scope = ScopeProvider.CreateScope())
+            using (IScope scope = ScopeProvider.CreateScope())
             {
                 scope.ReadLock(Cms.Core.Constants.Locks.MediaTypes);
 
diff --git a/src/Umbraco.Infrastructure/Services/Implement/MemberGroupService.cs b/src/Umbraco.Infrastructure/Services/Implement/MemberGroupService.cs
index eb1c4f26ca..a41a19b541 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/MemberGroupService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/MemberGroupService.cs
@@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 
 namespace Umbraco.Cms.Core.Services.Implement
 {
diff --git a/src/Umbraco.Infrastructure/Services/Implement/MemberService.cs b/src/Umbraco.Infrastructure/Services/Implement/MemberService.cs
index aba40333b0..959ffc3239 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/MemberService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/MemberService.cs
@@ -8,8 +8,8 @@ using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Scoping;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Infrastructure.Persistence.Querying;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Services.Implement
diff --git a/src/Umbraco.Infrastructure/Services/Implement/PublicAccessService.cs b/src/Umbraco.Infrastructure/Services/Implement/PublicAccessService.cs
index b6d12784c6..dadee3b24a 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/PublicAccessService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/PublicAccessService.cs
@@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Services.Implement
diff --git a/src/Umbraco.Infrastructure/Services/Implement/RelationService.cs b/src/Umbraco.Infrastructure/Services/Implement/RelationService.cs
index 808cd16386..668544af02 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/RelationService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/RelationService.cs
@@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Services.Implement
diff --git a/src/Umbraco.Infrastructure/Services/Implement/UserService.cs b/src/Umbraco.Infrastructure/Services/Implement/UserService.cs
index b7b52ae616..956370a056 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/UserService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/UserService.cs
@@ -12,9 +12,9 @@ using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Scoping;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Infrastructure.Persistence.Querying;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Services.Implement
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index baa69dddb9..7ea56113a5 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -122,4 +122,8 @@
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Services\Notifications" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/Umbraco.PublishedCache.NuCache/Compose/NotificationsComposer.cs b/src/Umbraco.PublishedCache.NuCache/Compose/NotificationsComposer.cs
index 5ea0cc0678..f38e156b0e 100644
--- a/src/Umbraco.PublishedCache.NuCache/Compose/NotificationsComposer.cs
+++ b/src/Umbraco.PublishedCache.NuCache/Compose/NotificationsComposer.cs
@@ -1,6 +1,6 @@
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 
 namespace Umbraco.Cms.Infrastructure.PublishedCache.Compose
 {
diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotServiceEventHandler.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotServiceEventHandler.cs
index df02320d87..1e8a7f0707 100644
--- a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotServiceEventHandler.cs
+++ b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotServiceEventHandler.cs
@@ -7,9 +7,9 @@ using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.Changes;
 using Umbraco.Cms.Core.Services.Implement;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.PublishedCache.Persistence;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Infrastructure.PublishedCache
diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs
index 3f7fc54493..07ecd57854 100644
--- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs
+++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs
@@ -12,9 +12,9 @@ using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.Implement;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Infrastructure.PublishedCache;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Cms.Infrastructure.Sync;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationTests.cs
index db9c2634dc..5dae292603 100644
--- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationTests.cs
+++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationTests.cs
@@ -9,9 +9,9 @@ using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Core.Services.Implement;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
+using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
index 819e41c257..ea6d50e116 100644
--- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
@@ -19,9 +19,9 @@ using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.Implement;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Extensions;
diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs
index dff4e80e4c..e3107decac 100644
--- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs
+++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs
@@ -12,7 +12,7 @@ using Umbraco.Cms.Core.Exceptions;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.Implement;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs
index b28e22e50a..d9f0c596f0 100644
--- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs
+++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs
@@ -11,7 +11,7 @@ using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.Implement;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index 718b54a939..63cfe08295 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -17,12 +17,12 @@ using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Infrastructure.PublishedCache.Persistence;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Extensions;
diff --git a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
index f943eada80..fd282de168 100644
--- a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
@@ -11,9 +11,9 @@ using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PublishedCache;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Core.Web;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Cms.Infrastructure.Sync;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Extensions;
diff --git a/src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderDependencyInjectionExtensions.cs b/src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderDependencyInjectionExtensions.cs
index 31bb23ed97..3c057785e5 100644
--- a/src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderDependencyInjectionExtensions.cs
+++ b/src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderDependencyInjectionExtensions.cs
@@ -9,9 +9,9 @@ using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Infrastructure.ModelsBuilder;
 using Umbraco.Cms.Infrastructure.ModelsBuilder.Building;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Cms.Infrastructure.WebAssets;
 using Umbraco.Cms.Web.Common.ModelBinders;
 using Umbraco.Cms.Web.Common.ModelsBuilder;
diff --git a/src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs b/src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
index 4bc2050855..c57ae8b7b9 100644
--- a/src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
+++ b/src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
@@ -7,11 +7,9 @@ using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
+using Umbraco.Cms.Core.Services.Notifications;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.ModelsBuilder;
-using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Cms.Infrastructure.WebAssets;
 using Umbraco.Cms.Web.Common.ModelBinders;