diff --git a/EnvelopeGenerator.Application/DependencyInjection.cs b/EnvelopeGenerator.Application/DependencyInjection.cs
index d561fc71..6d7a25bc 100644
--- a/EnvelopeGenerator.Application/DependencyInjection.cs
+++ b/EnvelopeGenerator.Application/DependencyInjection.cs
@@ -1,5 +1,5 @@
 using DigitalData.Core.Client;
-using EnvelopeGenerator.Application.Common.Notifications;
+using EnvelopeGenerator.Application.Common.DocSignedNotification;
 using EnvelopeGenerator.Application.Configurations;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
 using EnvelopeGenerator.Application.Interfaces.Services;
@@ -59,8 +59,6 @@ public static class DependencyInjection
         services.AddMediatR(cfg =>
         {
             cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly());
-            cfg.RegisterServicesFromAssembly(typeof(CreateEnvelopeReceiverCommandHandler).Assembly);
-            cfg.RegisterServicesFromAssembly(typeof(DocSignedNotification).Assembly);
         });
 
         return services;
diff --git a/EnvelopeGenerator.Application/Common/Notifications/DocSignedNotification.cs b/EnvelopeGenerator.Application/Notifications/DocSigned/DocSignedNotification.cs
similarity index 95%
rename from EnvelopeGenerator.Application/Common/Notifications/DocSignedNotification.cs
rename to EnvelopeGenerator.Application/Notifications/DocSigned/DocSignedNotification.cs
index 051bc638..353bfd75 100644
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSignedNotification.cs
+++ b/EnvelopeGenerator.Application/Notifications/DocSigned/DocSignedNotification.cs
@@ -2,7 +2,7 @@
 using MediatR;
 using System.Dynamic;
 
-namespace EnvelopeGenerator.Application.Common.Notifications;
+namespace EnvelopeGenerator.Application.Notifications.DocSigned;
 
 /// <summary>
 /// 
diff --git a/EnvelopeGenerator.Application/Common/Notifications/Handlers/DocSignedNotificationAnnotationHandler.cs b/EnvelopeGenerator.Application/Notifications/DocSigned/Handlers/AnnotationHandler.cs
similarity index 79%
rename from EnvelopeGenerator.Application/Common/Notifications/Handlers/DocSignedNotificationAnnotationHandler.cs
rename to EnvelopeGenerator.Application/Notifications/DocSigned/Handlers/AnnotationHandler.cs
index 88027f99..66951780 100644
--- a/EnvelopeGenerator.Application/Common/Notifications/Handlers/DocSignedNotificationAnnotationHandler.cs
+++ b/EnvelopeGenerator.Application/Notifications/DocSigned/Handlers/AnnotationHandler.cs
@@ -3,12 +3,12 @@ using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 using Newtonsoft.Json;
 
-namespace EnvelopeGenerator.Application.Common.Notifications.Handlers;
+namespace EnvelopeGenerator.Application.Notifications.DocSigned.Handlers;
 
 /// <summary>
 /// 
 /// </summary>
-public class DocSignedNotificationAnnotationHandler : INotificationHandler<DocSignedNotification>
+public class AnnotationHandler : INotificationHandler<DocSignedNotification>
 {
     private readonly ISender _sender;
 
@@ -16,7 +16,7 @@ public class DocSignedNotificationAnnotationHandler : INotificationHandler<DocSi
     /// 
     /// </summary>
     /// <param name="sender"></param>
-    public DocSignedNotificationAnnotationHandler(ISender sender)
+    public AnnotationHandler(ISender sender)
     {
         _sender = sender;
     }
diff --git a/EnvelopeGenerator.Application/Common/Notifications/Handlers/DocSignedNotificationHistoryHandler.cs b/EnvelopeGenerator.Application/Notifications/DocSigned/Handlers/HistoryHandler.cs
similarity index 77%
rename from EnvelopeGenerator.Application/Common/Notifications/Handlers/DocSignedNotificationHistoryHandler.cs
rename to EnvelopeGenerator.Application/Notifications/DocSigned/Handlers/HistoryHandler.cs
index 31c8799a..640ee489 100644
--- a/EnvelopeGenerator.Application/Common/Notifications/Handlers/DocSignedNotificationHistoryHandler.cs
+++ b/EnvelopeGenerator.Application/Notifications/DocSigned/Handlers/HistoryHandler.cs
@@ -1,15 +1,14 @@
-using EnvelopeGenerator.Application.DocStatus.Commands;
-using EnvelopeGenerator.Application.Histories.Commands;
+using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 using Newtonsoft.Json;
 
-namespace EnvelopeGenerator.Application.Common.Notifications.Handlers;
+namespace EnvelopeGenerator.Application.Notifications.DocSigned.Handlers;
 
 /// <summary>
 /// 
 /// </summary>
-public class DocSignedNotificationHistoryHandler : INotificationHandler<DocSignedNotification>
+public class HistoryHandler : INotificationHandler<DocSignedNotification>
 {
     private readonly ISender _sender;
 
@@ -17,7 +16,7 @@ public class DocSignedNotificationHistoryHandler : INotificationHandler<DocSigne
     /// 
     /// </summary>
     /// <param name="sender"></param>
-    public DocSignedNotificationHistoryHandler(ISender sender)
+    public HistoryHandler(ISender sender)
     {
         _sender = sender;
     }
diff --git a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
index e22d5d32..def7eebd 100644
--- a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
@@ -11,9 +11,7 @@ using EnvelopeGenerator.Web.Extensions;
 using MediatR;
 using System.Dynamic;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
-using EnvelopeGenerator.Application.DocStatus.Commands;
-using Newtonsoft.Json;
-using EnvelopeGenerator.Application.Common.Notifications;
+using EnvelopeGenerator.Application.Notifications.DocSigned;
 using DigitalData.Core.Exceptions;
 
 namespace EnvelopeGenerator.Web.Controllers;