diff --git a/EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/HistoryCreateDto.cs b/EnvelopeGenerator.Application/Common/Dto/History/HistoryCreateDto.cs
similarity index 89%
rename from EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/HistoryCreateDto.cs
rename to EnvelopeGenerator.Application/Common/Dto/History/HistoryCreateDto.cs
index fc58f98c..0c89802e 100644
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/HistoryCreateDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/History/HistoryCreateDto.cs
@@ -1,6 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeHistory;
+namespace EnvelopeGenerator.Application.Common.Dto.History;
 
 /// <summary>
 /// Data Transfer Object for creating a new envelope history record.
diff --git a/EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/HistoryDto.cs b/EnvelopeGenerator.Application/Common/Dto/History/HistoryDto.cs
similarity index 96%
rename from EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/HistoryDto.cs
rename to EnvelopeGenerator.Application/Common/Dto/History/HistoryDto.cs
index 2a22a4ea..efb9af6e 100644
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/HistoryDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/History/HistoryDto.cs
@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeHistory;
+namespace EnvelopeGenerator.Application.Common.Dto.History;
 
 /// <summary>
 /// Data Transfer Object representing the history of an envelope, including status, sender, receiver, and related metadata.
diff --git a/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs b/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
index 7b0897e5..fea266d1 100644
--- a/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
@@ -1,11 +1,10 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeHistory;
+using EnvelopeGenerator.Application.Common.Dto.History;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Receivers.Commands;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Common.Dto;
@@ -29,14 +28,14 @@ public class MappingProfile : Profile
         CreateMap<EmailTemplate, EmailTemplateDto>();
         CreateMap<Envelope, EnvelopeDto>();
         CreateMap<Document, DocumentDto>();
-        CreateMap<EnvelopeHistory, HistoryDto>();
-        CreateMap<EnvelopeHistory, HistoryCreateDto>();
-        CreateMap<EnvelopeReceiver, EnvelopeReceiverDto>();
-        CreateMap<EnvelopeReceiver, EnvelopeReceiverSecretDto>();
+        CreateMap<Domain.Entities.History, HistoryDto>();
+        CreateMap<Domain.Entities.History, HistoryCreateDto>();
+        CreateMap<Domain.Entities.History, EnvelopeReceiverDto>();
+        CreateMap<Domain.Entities.History, EnvelopeReceiverSecretDto>();
         CreateMap<EnvelopeType, EnvelopeTypeDto>();
-        CreateMap<Receiver, ReceiverDto>();
-        CreateMap<Receiver, ReceiverSecretDto>();
-        CreateMap<EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
+        CreateMap<Domain.Entities.Receiver, ReceiverDto>();
+        CreateMap<Domain.Entities.Receiver, ReceiverSecretDto>();
+        CreateMap<Domain.Entities.EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
 
         // DTO to Entity mappings
         CreateMap<ConfigDto, Config>();
@@ -45,14 +44,14 @@ public class MappingProfile : Profile
         CreateMap<EmailTemplateDto, EmailTemplate>();
         CreateMap<EnvelopeDto, Envelope>();
         CreateMap<DocumentDto, Document>();
-        CreateMap<HistoryDto, EnvelopeHistory>();
-        CreateMap<HistoryCreateDto, EnvelopeHistory>();
-        CreateMap<EnvelopeReceiverDto, EnvelopeReceiver>();
+        CreateMap<HistoryDto, Domain.Entities.History>();
+        CreateMap<HistoryCreateDto, Domain.Entities.History>();
+        CreateMap<EnvelopeReceiverDto, Domain.Entities.EnvelopeReceiver>();
         CreateMap<EnvelopeTypeDto, EnvelopeType>();
-        CreateMap<ReceiverDto, Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
-        CreateMap<EnvelopeReceiver, EnvelopeReceiverBasicDto>();
-        CreateMap<EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnly>();
-        CreateMap<EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly>();
+        CreateMap<ReceiverDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
+        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverBasicDto>();
+        CreateMap<EnvelopeReceiverReadOnlyCreateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
+        CreateMap<EnvelopeReceiverReadOnlyUpdateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
 
         // Messaging mappings
         // for GTX messaging
diff --git a/EnvelopeGenerator.Application/Common/Extensions/MemoryCacheExtensions.cs b/EnvelopeGenerator.Application/Common/Extensions/MemoryCacheExtensions.cs
index 7506eb7a..c86bf6d6 100644
--- a/EnvelopeGenerator.Application/Common/Extensions/MemoryCacheExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/MemoryCacheExtensions.cs
@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Extensions;
+using EnvelopeGenerator.Application.Common.Extensions;
 using Microsoft.Extensions.Caching.Memory;
 
 namespace EnvelopeGenerator.Application.Common.Extensions;
diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
index 2c6ecc7c..71648f66 100644
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
@@ -6,7 +6,6 @@ using EnvelopeGenerator.Application.Receivers.Queries;
 using MediatR;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
-using EnvelopeGenerator.Application.SQL;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Model;
 using EnvelopeGenerator.Application.Common.Extensions;
diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
index 8eaf76a1..b023cb08 100644
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
@@ -1,6 +1,6 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Extensions;
+using EnvelopeGenerator.Application.Common.Extensions;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Domain.Constants;
diff --git a/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs b/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs
index 6dc12c0e..2fad46d0 100644
--- a/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs
+++ b/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs
@@ -1,7 +1,7 @@
 using AutoMapper;
 using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeHistory;
+using EnvelopeGenerator.Application.Common.Dto.History;
 using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Common.Model;
 using EnvelopeGenerator.Domain.Constants;
diff --git a/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs b/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs
index 585f41f9..05e83f4d 100644
--- a/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs
+++ b/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs
@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeHistory;
+using EnvelopeGenerator.Application.Common.Dto.History;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 using System.ComponentModel.DataAnnotations;
diff --git a/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs b/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs
index 41709c3d..47b682e2 100644
--- a/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs
+++ b/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs
@@ -1,7 +1,7 @@
 using AutoMapper;
 using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeHistory;
+using EnvelopeGenerator.Application.Common.Dto.History;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
diff --git a/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeHistoryService.cs b/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeHistoryService.cs
index 7f8a84c5..cd3225bd 100644
--- a/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeHistoryService.cs
+++ b/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeHistoryService.cs
@@ -1,6 +1,6 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeHistory;
+using EnvelopeGenerator.Application.Common.Dto.History;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
diff --git a/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs b/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs
index ac38b5b6..71637803 100644
--- a/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs
+++ b/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs
@@ -5,7 +5,7 @@ using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeHistory;
+using EnvelopeGenerator.Application.Common.Dto.History;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
 
 namespace EnvelopeGenerator.Application.Services;
diff --git a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
index b3e3664d..b23126ad 100644
--- a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
+++ b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
@@ -6,7 +6,7 @@ using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
-using EnvelopeGenerator.Application.Extensions;
+using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Application.Receivers.Queries;
@@ -14,7 +14,6 @@ using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
 using EnvelopeGenerator.Application.Common;
-using EnvelopeGenerator.Application.Common.Extensions;
 
 namespace EnvelopeGenerator.Application.Services;
 
diff --git a/EnvelopeGenerator.Infrastructure/EGDbContextFactory.cs b/EnvelopeGenerator.Infrastructure/EGDbContextFactory.cs
index efda85e1..0b8c7ece 100644
--- a/EnvelopeGenerator.Infrastructure/EGDbContextFactory.cs
+++ b/EnvelopeGenerator.Infrastructure/EGDbContextFactory.cs
@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Configurations;
+using EnvelopeGenerator.Application.Common.Configurations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.Extensions.Configuration;
diff --git a/EnvelopeGenerator.Tests.Application/HistoryTests.cs b/EnvelopeGenerator.Tests.Application/HistoryTests.cs
index ab00072a..2c0912c9 100644
--- a/EnvelopeGenerator.Tests.Application/HistoryTests.cs
+++ b/EnvelopeGenerator.Tests.Application/HistoryTests.cs
@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeHistory;
+using EnvelopeGenerator.Application.Common.Dto.History;
 using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Application.Histories.Queries;
diff --git a/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml b/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml
index 7d6815d8..5c9b4cc4 100644
--- a/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml
+++ b/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml
@@ -1,4 +1,4 @@
-@using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
+@using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 @using Newtonsoft.Json
 @using EnvelopeGenerator.Web.Extensions;
 @model Auth;
diff --git a/EnvelopeGenerator.Web/Views/Home/EnvelopeRejected.cshtml b/EnvelopeGenerator.Web/Views/Home/EnvelopeRejected.cshtml
index 55193760..218dd2c0 100644
--- a/EnvelopeGenerator.Web/Views/Home/EnvelopeRejected.cshtml
+++ b/EnvelopeGenerator.Web/Views/Home/EnvelopeRejected.cshtml
@@ -6,7 +6,6 @@
 }
 @using DigitalData.Core.Abstraction.Application.DTO;
 @using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver
-@using EnvelopeGenerator.Application.Dto.EnvelopeReceiver
 @using EnvelopeGenerator.Web.Extensions
 @using Newtonsoft.Json
 @using Newtonsoft.Json.Serialization
diff --git a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml
index 86c9311d..c3091e3c 100644
--- a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml
+++ b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml
@@ -5,9 +5,7 @@
 @using DigitalData.Core.Abstraction.Application;
 @using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver
 @using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly
-@using EnvelopeGenerator.Application.Dto;
-@using EnvelopeGenerator.Application.Dto.EnvelopeReceiver
-@using EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly
+@using EnvelopeGenerator.Application.Common.Dto;
 @using EnvelopeGenerator.Web.Extensions
 @using Newtonsoft.Json
 @using Newtonsoft.Json.Serialization
diff --git a/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml b/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml
index 65ae66e0..56dae0a0 100644
--- a/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml
+++ b/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml
@@ -1,5 +1,4 @@
-@using EnvelopeGenerator.Application.Common.Extensions
-@using EnvelopeGenerator.Application.Extensions;
+@using EnvelopeGenerator.Application.Common.Extensions;
 @using EnvelopeGenerator.Domain.Constants;
 @using EnvelopeGenerator.Domain.Entities;
 @{
diff --git a/EnvelopeGenerator.Web/Views/_ViewImports.cshtml b/EnvelopeGenerator.Web/Views/_ViewImports.cshtml
index 63b28eb0..4ff3ff07 100644
--- a/EnvelopeGenerator.Web/Views/_ViewImports.cshtml
+++ b/EnvelopeGenerator.Web/Views/_ViewImports.cshtml
@@ -1,7 +1,7 @@
 @using EnvelopeGenerator.Web
 @using EnvelopeGenerator.Web.Models
 @using EnvelopeGenerator.Web.Sanitizers
-@using EnvelopeGenerator.Application.Extensions
+@using EnvelopeGenerator.Application.Common.Extensions
 @using Microsoft.Extensions.Localization
 @using EnvelopeGenerator.Application.Resources
 @using Microsoft.Extensions.Options