diff --git a/src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs b/src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs
index d5328929b2..74300936b0 100644
--- a/src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs
+++ b/src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs
@@ -1,5 +1,6 @@
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Routing;
diff --git a/src/Umbraco.Infrastructure/Compose/RelateOnCopyHandler.cs b/src/Umbraco.Infrastructure/Events/RelateOnCopyHandler.cs
similarity index 93%
rename from src/Umbraco.Infrastructure/Compose/RelateOnCopyHandler.cs
rename to src/Umbraco.Infrastructure/Events/RelateOnCopyHandler.cs
index ff5b9f732a..c438679813 100644
--- a/src/Umbraco.Infrastructure/Compose/RelateOnCopyHandler.cs
+++ b/src/Umbraco.Infrastructure/Events/RelateOnCopyHandler.cs
@@ -1,11 +1,9 @@
-using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Services.Notifications;
 
-namespace Umbraco.Cms.Core.Compose
+namespace Umbraco.Cms.Core.Events
 {
-    // TODO: this should probably be moved to another namespace
     public class RelateOnCopyHandler : INotificationHandler<CopiedNotification<IContent>>
     {
         private readonly IRelationService _relationService;
diff --git a/src/Umbraco.Infrastructure/Compose/RelateOnTrashHandler.cs b/src/Umbraco.Infrastructure/Events/RelateOnTrashHandler.cs
similarity index 98%
rename from src/Umbraco.Infrastructure/Compose/RelateOnTrashHandler.cs
rename to src/Umbraco.Infrastructure/Events/RelateOnTrashHandler.cs
index 3157594b34..7c122dd09e 100644
--- a/src/Umbraco.Infrastructure/Compose/RelateOnTrashHandler.cs
+++ b/src/Umbraco.Infrastructure/Events/RelateOnTrashHandler.cs
@@ -1,14 +1,12 @@
 using System.Linq;
-using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Core.Compose
+namespace Umbraco.Cms.Core.Events
 {
-    // TODO: this should probably be moved to another namespace
     // TODO: lots of duplicate code in this one, refactor
     public sealed class RelateOnTrashHandler :
         INotificationHandler<MovedNotification<IContent>>,
diff --git a/src/Umbraco.Infrastructure/Compose/UserNotificationsHandler.cs b/src/Umbraco.Infrastructure/Events/UserNotificationsHandler.cs
similarity index 98%
rename from src/Umbraco.Infrastructure/Compose/UserNotificationsHandler.cs
rename to src/Umbraco.Infrastructure/Events/UserNotificationsHandler.cs
index 5c80f94806..a099a66d8e 100644
--- a/src/Umbraco.Infrastructure/Compose/UserNotificationsHandler.cs
+++ b/src/Umbraco.Infrastructure/Events/UserNotificationsHandler.cs
@@ -9,7 +9,6 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Actions;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -19,9 +18,8 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Services.Notifications;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Core.Compose
+namespace Umbraco.Cms.Core.Events
 {
-    // TODO: this should probably be moved to another namespace
     public sealed class UserNotificationsHandler :
         INotificationHandler<SavedNotification<IContent>>,
         INotificationHandler<SortedNotification<IContent>>,