diff --git a/EnvelopeGenerator.Application/DTOs/MappingProfile.cs b/EnvelopeGenerator.Application/DTOs/MappingProfile.cs
new file mode 100644
index 00000000..3dd3797a
--- /dev/null
+++ b/EnvelopeGenerator.Application/DTOs/MappingProfile.cs
@@ -0,0 +1,70 @@
+using AutoMapper;
+using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Application.DTOs.Messaging;
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Application.Extensions;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.DTOs;
+
+/// <summary>
+/// Represents the AutoMapper profile configuration for mapping between
+/// domain entities and data transfer objects (DTOs) used within the EnvelopeGenerator application.
+/// </summary>
+public class MappingProfile : Profile
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MappingProfile"/> class.
+    /// Configures the mappings between entities and DTOs used throughout the application.
+    /// </summary>
+    public MappingProfile()
+    {
+        // Entity to DTO mappings
+        CreateMap<Config, ConfigDto>();
+        CreateMap<DocumentReceiverElement, DocumentReceiverElementDto>();
+        CreateMap<DocumentStatus, DocumentStatusDto>();
+        CreateMap<EmailTemplate, EmailTemplateDto>();
+        CreateMap<Envelope, EnvelopeDto>();
+        CreateMap<EnvelopeCertificate, EnvelopeCertificateDto>();
+        CreateMap<EnvelopeDocument, EnvelopeDocumentDto>();
+        CreateMap<Domain.Entities.EnvelopeHistory, EnvelopeHistoryDto>();
+        CreateMap<Domain.Entities.EnvelopeHistory, EnvelopeHistoryCreateDto>();
+        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverDto>();
+        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverSecretDto>();
+        CreateMap<EnvelopeType, EnvelopeTypeDto>();
+        CreateMap<Domain.Entities.Receiver, ReceiverReadDto>();
+        CreateMap<Domain.Entities.Receiver, ReceiverCreateDto>();
+        CreateMap<Domain.Entities.Receiver, ReceiverUpdateDto>();
+        CreateMap<UserReceiver, UserReceiverDto>();
+        CreateMap<Domain.Entities.EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
+
+        // DTO to Entity mappings
+        CreateMap<ConfigDto, Config>();
+        CreateMap<DocumentReceiverElementDto, DocumentReceiverElement>();
+        CreateMap<DocumentStatusDto, DocumentStatus>();
+        CreateMap<EmailTemplateDto, EmailTemplate>();
+        CreateMap<EnvelopeDto, Envelope>();
+        CreateMap<EnvelopeCertificateDto, EnvelopeCertificate>();
+        CreateMap<EnvelopeDocumentDto, EnvelopeDocument>();
+        CreateMap<EnvelopeHistoryDto, Domain.Entities.EnvelopeHistory>();
+        CreateMap<EnvelopeHistoryCreateDto, Domain.Entities.EnvelopeHistory>();
+        CreateMap<EnvelopeReceiverDto, Domain.Entities.EnvelopeReceiver>();
+        CreateMap<EnvelopeTypeDto, EnvelopeType>();
+        CreateMap<ReceiverReadDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
+        CreateMap<ReceiverCreateDto, Domain.Entities.Receiver>();
+        CreateMap<ReceiverUpdateDto, Domain.Entities.Receiver>();
+        CreateMap<UserReceiverDto, UserReceiver>();
+        CreateMap<EnvelopeReceiverBase, EnvelopeReceiverBasicDto>();
+        CreateMap<EnvelopeReceiverReadOnlyCreateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
+        CreateMap<EnvelopeReceiverReadOnlyUpdateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
+
+        // Messaging mappings
+        // for GTX messaging
+        CreateMap<GtxMessagingResponse, SmsResponse>()
+            .ConstructUsing(gtxRes => gtxRes.Ok()
+                ? new SmsResponse() { Ok = true }
+                : new SmsResponse() { Ok = false, Errors = gtxRes });
+    }
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/MappingProfiles/BasicDtoMappingProfile.cs b/EnvelopeGenerator.Application/MappingProfiles/BasicDtoMappingProfile.cs
deleted file mode 100644
index ae14252e..00000000
--- a/EnvelopeGenerator.Application/MappingProfiles/BasicDtoMappingProfile.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using AutoMapper;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Application.DTOs.Messaging;
-using EnvelopeGenerator.Application.DTOs.Receiver;
-using EnvelopeGenerator.Application.Extensions;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.MappingProfiles
-{
-    public class BasicDtoMappingProfile : Profile
-    {
-        public BasicDtoMappingProfile()
-        {
-            // Entity to DTO mappings
-            CreateMap<Config, ConfigDto>();
-            CreateMap<DocumentReceiverElement, DocumentReceiverElementDto>();
-            CreateMap<DocumentStatus, DocumentStatusDto>();
-            CreateMap<EmailTemplate, EmailTemplateDto>();
-            CreateMap<Envelope, EnvelopeDto>();
-            CreateMap<EnvelopeCertificate, EnvelopeCertificateDto>();
-            CreateMap<EnvelopeDocument, EnvelopeDocumentDto>();
-            CreateMap<EnvelopeHistory, EnvelopeHistoryDto>();
-            CreateMap<EnvelopeHistory, EnvelopeHistoryCreateDto>();
-            CreateMap<EnvelopeReceiver, EnvelopeReceiverDto>();
-            CreateMap<EnvelopeReceiver, EnvelopeReceiverSecretDto>();
-            CreateMap<EnvelopeType, EnvelopeTypeDto>();
-            CreateMap<Receiver, ReceiverReadDto>();
-            CreateMap<Receiver, ReceiverCreateDto>();
-            CreateMap<Receiver, ReceiverUpdateDto>();
-            CreateMap<UserReceiver, UserReceiverDto>();
-            CreateMap<EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
-
-            // DTO to Entity mappings
-            CreateMap<ConfigDto, Config>();
-            CreateMap<DocumentReceiverElementDto, DocumentReceiverElement>();
-            CreateMap<DocumentStatusDto, DocumentStatus>();
-            CreateMap<EmailTemplateDto, EmailTemplate>();
-            CreateMap<EnvelopeDto, Envelope>();
-            CreateMap<EnvelopeCertificateDto, EnvelopeCertificate>();
-            CreateMap<EnvelopeDocumentDto, EnvelopeDocument>();
-            CreateMap<EnvelopeHistoryDto, EnvelopeHistory>();
-            CreateMap<EnvelopeHistoryCreateDto, EnvelopeHistory>();
-            CreateMap<EnvelopeReceiverDto, EnvelopeReceiver>();
-            CreateMap<EnvelopeTypeDto, EnvelopeType>();
-            CreateMap<ReceiverReadDto, Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
-            CreateMap<ReceiverCreateDto, Receiver>();
-            CreateMap<ReceiverUpdateDto, Receiver>();
-            CreateMap<UserReceiverDto, UserReceiver>();
-            CreateMap<EnvelopeReceiverBase, EnvelopeReceiverBasicDto>();
-            CreateMap<EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnly>();
-            CreateMap<EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly>();
-
-            // Messaging mappings
-            // for GTX messaging
-            CreateMap<GtxMessagingResponse, SmsResponse>()
-                .ConstructUsing(gtxRes => gtxRes.Ok()
-                    ? new SmsResponse() { Ok = true }
-                    : new SmsResponse() { Ok = false, Errors = gtxRes });
-        }
-    }
-}
\ No newline at end of file