diff --git a/DigitalData.MessagingService.sln b/DigitalData.MessagingService.sln
index d64914f..1e860fd 100644
--- a/DigitalData.MessagingService.sln
+++ b/DigitalData.MessagingService.sln
@@ -37,8 +37,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingServic
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingService.Client", "src\presentation\DigitalData.MessagingService.Client\DigitalData.MessagingService.Client.csproj", "{770E96B0-C3C9-A9A3-4F98-F7A0295D1599}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.MessagingService.Abstraction", "src\core\DigitalData.MessagingService.Abstraction\DigitalData.MessagingService.Abstraction.csproj", "{6D5E14FC-E4E1-32E3-4F3F-19DE96233128}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -77,10 +75,6 @@ Global
{770E96B0-C3C9-A9A3-4F98-F7A0295D1599}.Debug|Any CPU.Build.0 = Release|Any CPU
{770E96B0-C3C9-A9A3-4F98-F7A0295D1599}.Release|Any CPU.ActiveCfg = Release|Any CPU
{770E96B0-C3C9-A9A3-4F98-F7A0295D1599}.Release|Any CPU.Build.0 = Release|Any CPU
- {6D5E14FC-E4E1-32E3-4F3F-19DE96233128}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6D5E14FC-E4E1-32E3-4F3F-19DE96233128}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6D5E14FC-E4E1-32E3-4F3F-19DE96233128}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6D5E14FC-E4E1-32E3-4F3F-19DE96233128}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -97,7 +91,6 @@ Global
{8BF22107-3CB9-C326-B94B-C40C99DA9B68} = {B52B4CEE-1C67-424B-8659-370FEA7EAF2A}
{8DBBAA7C-C4D3-4ADD-8372-B0D6260C8FFC} = {71BEA4D0-7835-4A8C-B11E-1088E0801DCE}
{770E96B0-C3C9-A9A3-4F98-F7A0295D1599} = {B52B4CEE-1C67-424B-8659-370FEA7EAF2A}
- {6D5E14FC-E4E1-32E3-4F3F-19DE96233128} = {DD9D4A3A-AB55-456E-80D3-54A2D4025E64}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {90E29FDC-F6C6-414F-94BF-25DF61D18060}
diff --git a/src/core/DigitalData.MessagingService.Abstraction/DigitalData.MessagingService.Abstraction.csproj b/src/core/DigitalData.MessagingService.Abstraction/DigitalData.MessagingService.Abstraction.csproj
deleted file mode 100644
index 08ba09c..0000000
--- a/src/core/DigitalData.MessagingService.Abstraction/DigitalData.MessagingService.Abstraction.csproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
- net462;net480;net8.0
- enable
- enable
- latest
-
-
-
diff --git a/src/core/DigitalData.MessagingService.Abstraction/EmailAccountDto.cs b/src/core/DigitalData.MessagingService.Application/Common/Dto/EmailAccountDto.cs
similarity index 95%
rename from src/core/DigitalData.MessagingService.Abstraction/EmailAccountDto.cs
rename to src/core/DigitalData.MessagingService.Application/Common/Dto/EmailAccountDto.cs
index 5563413..2d23298 100644
--- a/src/core/DigitalData.MessagingService.Abstraction/EmailAccountDto.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Dto/EmailAccountDto.cs
@@ -1,4 +1,4 @@
-namespace DigitalData.MessagingService.Abstraction;
+namespace DigitalData.MessagingService.Application.Common.Dto;
///
/// DTO for a single email account configuration.
diff --git a/src/core/DigitalData.MessagingService.Abstraction/EmailAttachmentDto.cs b/src/core/DigitalData.MessagingService.Application/Common/Dto/EmailAttachmentDto.cs
similarity index 95%
rename from src/core/DigitalData.MessagingService.Abstraction/EmailAttachmentDto.cs
rename to src/core/DigitalData.MessagingService.Application/Common/Dto/EmailAttachmentDto.cs
index 3b0f3b2..98c6e24 100644
--- a/src/core/DigitalData.MessagingService.Abstraction/EmailAttachmentDto.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Dto/EmailAttachmentDto.cs
@@ -1,4 +1,4 @@
-namespace DigitalData.MessagingService.Abstraction;
+namespace DigitalData.MessagingService.Application.Common.Dto;
///
/// Represents a single email attachment.
diff --git a/src/core/DigitalData.MessagingService.Abstraction/EmailContext.cs b/src/core/DigitalData.MessagingService.Application/Common/Dto/EmailContext.cs
similarity index 95%
rename from src/core/DigitalData.MessagingService.Abstraction/EmailContext.cs
rename to src/core/DigitalData.MessagingService.Application/Common/Dto/EmailContext.cs
index 5ad2c00..2f941c7 100644
--- a/src/core/DigitalData.MessagingService.Abstraction/EmailContext.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Dto/EmailContext.cs
@@ -1,4 +1,4 @@
-namespace DigitalData.MessagingService.Abstraction;
+namespace DigitalData.MessagingService.Application.Common.Dto;
public record EmailContext
{
diff --git a/src/core/DigitalData.MessagingService.Application/Common/Models/MailSearch/DateFilter.cs b/src/core/DigitalData.MessagingService.Application/Common/Dto/MailSearch/DateFilter.cs
similarity index 89%
rename from src/core/DigitalData.MessagingService.Application/Common/Models/MailSearch/DateFilter.cs
rename to src/core/DigitalData.MessagingService.Application/Common/Dto/MailSearch/DateFilter.cs
index 366e349..459d715 100644
--- a/src/core/DigitalData.MessagingService.Application/Common/Models/MailSearch/DateFilter.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Dto/MailSearch/DateFilter.cs
@@ -1,5 +1,5 @@
#if NET
-namespace DigitalData.MessagingService.Application.Common.Models.MailSearch;
+namespace DigitalData.MessagingService.Application.Common.Dto.MailSearch;
///
/// Constrains the search to messages within an arrival-date range.
diff --git a/src/core/DigitalData.MessagingService.Application/Common/Models/MailSearch/MailSearchFilter.cs b/src/core/DigitalData.MessagingService.Application/Common/Dto/MailSearch/MailSearchFilter.cs
similarity index 97%
rename from src/core/DigitalData.MessagingService.Application/Common/Models/MailSearch/MailSearchFilter.cs
rename to src/core/DigitalData.MessagingService.Application/Common/Dto/MailSearch/MailSearchFilter.cs
index 5cba2b8..a576ef4 100644
--- a/src/core/DigitalData.MessagingService.Application/Common/Models/MailSearch/MailSearchFilter.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Dto/MailSearch/MailSearchFilter.cs
@@ -1,5 +1,5 @@
#if NET
-namespace DigitalData.MessagingService.Application.Common.Models.MailSearch;
+namespace DigitalData.MessagingService.Application.Common.Dto.MailSearch;
///
/// Describes all criteria and options used when searching an IMAP mailbox.
diff --git a/src/core/DigitalData.MessagingService.Application/Common/Models/MailSearch/MailSortOrder.cs b/src/core/DigitalData.MessagingService.Application/Common/Dto/MailSearch/MailSortOrder.cs
similarity index 79%
rename from src/core/DigitalData.MessagingService.Application/Common/Models/MailSearch/MailSortOrder.cs
rename to src/core/DigitalData.MessagingService.Application/Common/Dto/MailSearch/MailSortOrder.cs
index c18970d..306b622 100644
--- a/src/core/DigitalData.MessagingService.Application/Common/Models/MailSearch/MailSortOrder.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Dto/MailSearch/MailSortOrder.cs
@@ -1,4 +1,4 @@
-namespace DigitalData.MessagingService.Application.Common.Models.MailSearch;
+namespace DigitalData.MessagingService.Application.Common.Dto.MailSearch;
///
/// Controls the order in which fetched messages are returned.
diff --git a/src/core/DigitalData.MessagingService.Application/Common/Models/MailSearch/UidFilter.cs b/src/core/DigitalData.MessagingService.Application/Common/Dto/MailSearch/UidFilter.cs
similarity index 91%
rename from src/core/DigitalData.MessagingService.Application/Common/Models/MailSearch/UidFilter.cs
rename to src/core/DigitalData.MessagingService.Application/Common/Dto/MailSearch/UidFilter.cs
index 09ef4b9..9a04e61 100644
--- a/src/core/DigitalData.MessagingService.Application/Common/Models/MailSearch/UidFilter.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Dto/MailSearch/UidFilter.cs
@@ -1,5 +1,5 @@
#if NET
-namespace DigitalData.MessagingService.Application.Common.Models.MailSearch;
+namespace DigitalData.MessagingService.Application.Common.Dto.MailSearch;
///
/// Constrains the search to a specific UID or a UID range.
diff --git a/src/core/DigitalData.MessagingService.Abstraction/ReceivedEmailDto.cs b/src/core/DigitalData.MessagingService.Application/Common/Dto/ReceivedEmailDto.cs
similarity index 97%
rename from src/core/DigitalData.MessagingService.Abstraction/ReceivedEmailDto.cs
rename to src/core/DigitalData.MessagingService.Application/Common/Dto/ReceivedEmailDto.cs
index 8a4fe62..4fe877e 100644
--- a/src/core/DigitalData.MessagingService.Abstraction/ReceivedEmailDto.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Dto/ReceivedEmailDto.cs
@@ -1,4 +1,4 @@
-namespace DigitalData.MessagingService.Abstraction;
+namespace DigitalData.MessagingService.Application.Common.Dto;
///
/// Represents an email message received via IMAP.
diff --git a/src/core/DigitalData.MessagingService.Abstraction/SendingEmailCreateDto.cs b/src/core/DigitalData.MessagingService.Application/Common/Dto/SendingEmailCreateDto.cs
similarity index 89%
rename from src/core/DigitalData.MessagingService.Abstraction/SendingEmailCreateDto.cs
rename to src/core/DigitalData.MessagingService.Application/Common/Dto/SendingEmailCreateDto.cs
index 12c5191..e56fea0 100644
--- a/src/core/DigitalData.MessagingService.Abstraction/SendingEmailCreateDto.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Dto/SendingEmailCreateDto.cs
@@ -1,4 +1,4 @@
-namespace DigitalData.MessagingService.Abstraction;
+namespace DigitalData.MessagingService.Application.Common.Dto;
public record SendingEmailCreateDto
{
diff --git a/src/core/DigitalData.MessagingService.Abstraction/SendingEmailEvent.cs b/src/core/DigitalData.MessagingService.Application/Common/Dto/SendingEmailEvent.cs
similarity index 85%
rename from src/core/DigitalData.MessagingService.Abstraction/SendingEmailEvent.cs
rename to src/core/DigitalData.MessagingService.Application/Common/Dto/SendingEmailEvent.cs
index 5d9f315..5eadad2 100644
--- a/src/core/DigitalData.MessagingService.Abstraction/SendingEmailEvent.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Dto/SendingEmailEvent.cs
@@ -1,4 +1,4 @@
-namespace DigitalData.MessagingService.Abstraction;
+namespace DigitalData.MessagingService.Application.Common.Dto;
public record SendingEmailEvent
{
diff --git a/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IEmailService.cs b/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IEmailService.cs
index bb5dcf8..666063d 100644
--- a/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IEmailService.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IEmailService.cs
@@ -1,4 +1,4 @@
-using DigitalData.MessagingService.Abstraction;
+using DigitalData.MessagingService.Application.Common.Dto;
namespace DigitalData.MessagingService.Application.Common.Interfaces;
diff --git a/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IImapEmailService.cs b/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IImapEmailService.cs
index d3c3681..865fc1c 100644
--- a/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IImapEmailService.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IImapEmailService.cs
@@ -1,6 +1,6 @@
#if NET
-using DigitalData.MessagingService.Abstraction;
-using DigitalData.MessagingService.Application.Common.Models.MailSearch;
+using DigitalData.MessagingService.Application.Common.Dto;
+using DigitalData.MessagingService.Application.Common.Dto.MailSearch;
namespace DigitalData.MessagingService.Application.Common.Interfaces;
diff --git a/src/core/DigitalData.MessagingService.Abstraction/ISendingEmailPublisher.cs b/src/core/DigitalData.MessagingService.Application/Common/Interfaces/ISendingEmailPublisher.cs
similarity index 70%
rename from src/core/DigitalData.MessagingService.Abstraction/ISendingEmailPublisher.cs
rename to src/core/DigitalData.MessagingService.Application/Common/Interfaces/ISendingEmailPublisher.cs
index 1270f41..35e92c7 100644
--- a/src/core/DigitalData.MessagingService.Abstraction/ISendingEmailPublisher.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Interfaces/ISendingEmailPublisher.cs
@@ -1,4 +1,6 @@
-namespace DigitalData.MessagingService.Abstraction;
+using DigitalData.MessagingService.Application.Common.Dto;
+
+namespace DigitalData.MessagingService.Application.Common.Interfaces;
///
/// Email queue interface for outgoing emails.
@@ -8,4 +10,4 @@ public interface ISendingEmailPublisher
Task EnqueueAsync(SendingEmailEvent sendingEmailEvent, CancellationToken cancellationToken = default);
Task GetQueueDepthAsync(CancellationToken cancellationToken = default);
-}
+}
\ No newline at end of file
diff --git a/src/core/DigitalData.MessagingService.Application/Common/Mappings/EmailMappingProfile.cs b/src/core/DigitalData.MessagingService.Application/Common/Mappings/EmailMappingProfile.cs
index 609942b..2362cc8 100644
--- a/src/core/DigitalData.MessagingService.Application/Common/Mappings/EmailMappingProfile.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Mappings/EmailMappingProfile.cs
@@ -1,7 +1,7 @@
#if NET
using AutoMapper;
using DigitalData.MessagingService.Application.EmailSending.Commands;
-using DigitalData.MessagingService.Abstraction;
+using DigitalData.MessagingService.Application.Common.Dto;
namespace DigitalData.MessagingService.Application.Common.Mappings;
diff --git a/src/core/DigitalData.MessagingService.Application/Common/Options/EmailAccountsOptions.cs b/src/core/DigitalData.MessagingService.Application/Common/Options/EmailAccountsOptions.cs
index f433890..4e5f7b3 100644
--- a/src/core/DigitalData.MessagingService.Application/Common/Options/EmailAccountsOptions.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Options/EmailAccountsOptions.cs
@@ -1,5 +1,5 @@
#if NET
-using DigitalData.MessagingService.Abstraction;
+using DigitalData.MessagingService.Application.Common.Dto;
namespace DigitalData.MessagingService.Application.Common.Options;
diff --git a/src/core/DigitalData.MessagingService.Application/DigitalData.MessagingService.Application.csproj b/src/core/DigitalData.MessagingService.Application/DigitalData.MessagingService.Application.csproj
index b07274d..40909f4 100644
--- a/src/core/DigitalData.MessagingService.Application/DigitalData.MessagingService.Application.csproj
+++ b/src/core/DigitalData.MessagingService.Application/DigitalData.MessagingService.Application.csproj
@@ -9,7 +9,6 @@
-
diff --git a/src/core/DigitalData.MessagingService.Application/EmailAccount/Queries/GetSenderQuery.cs b/src/core/DigitalData.MessagingService.Application/EmailAccount/Queries/GetSenderQuery.cs
index 77c85bf..f038e11 100644
--- a/src/core/DigitalData.MessagingService.Application/EmailAccount/Queries/GetSenderQuery.cs
+++ b/src/core/DigitalData.MessagingService.Application/EmailAccount/Queries/GetSenderQuery.cs
@@ -1,6 +1,6 @@
#if NET
using DigitalData.MessagingService.Application.Common.Options;
-using DigitalData.MessagingService.Abstraction;
+using DigitalData.MessagingService.Application.Common.Dto;
using MediatR;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
diff --git a/src/core/DigitalData.MessagingService.Application/EmailReceiving/Queries/FetchEmailsQuery.cs b/src/core/DigitalData.MessagingService.Application/EmailReceiving/Queries/FetchEmailsQuery.cs
index a370581..d2bb708 100644
--- a/src/core/DigitalData.MessagingService.Application/EmailReceiving/Queries/FetchEmailsQuery.cs
+++ b/src/core/DigitalData.MessagingService.Application/EmailReceiving/Queries/FetchEmailsQuery.cs
@@ -1,7 +1,7 @@
#if NET
-using DigitalData.MessagingService.Abstraction;
+using DigitalData.MessagingService.Application.Common.Dto;
+using DigitalData.MessagingService.Application.Common.Dto.MailSearch;
using DigitalData.MessagingService.Application.Common.Interfaces;
-using DigitalData.MessagingService.Application.Common.Models.MailSearch;
using DigitalData.MessagingService.Application.EmailAccount.Queries;
using DigitalData.MessagingService.Domain.Exceptions;
using MediatR;
diff --git a/src/core/DigitalData.MessagingService.Application/EmailReceiving/Validators/DateFilterValidator.cs b/src/core/DigitalData.MessagingService.Application/EmailReceiving/Validators/DateFilterValidator.cs
index 5b697db..4e4c7f1 100644
--- a/src/core/DigitalData.MessagingService.Application/EmailReceiving/Validators/DateFilterValidator.cs
+++ b/src/core/DigitalData.MessagingService.Application/EmailReceiving/Validators/DateFilterValidator.cs
@@ -1,5 +1,5 @@
#if NET
-using DigitalData.MessagingService.Application.Common.Models.MailSearch;
+using DigitalData.MessagingService.Application.Common.Dto.MailSearch;
using FluentValidation;
namespace DigitalData.MessagingService.Application.EmailReceiving.Validators;
diff --git a/src/core/DigitalData.MessagingService.Application/EmailReceiving/Validators/MailSearchFilterValidator.cs b/src/core/DigitalData.MessagingService.Application/EmailReceiving/Validators/MailSearchFilterValidator.cs
index 0819a44..3b9219a 100644
--- a/src/core/DigitalData.MessagingService.Application/EmailReceiving/Validators/MailSearchFilterValidator.cs
+++ b/src/core/DigitalData.MessagingService.Application/EmailReceiving/Validators/MailSearchFilterValidator.cs
@@ -1,5 +1,5 @@
#if NET
-using DigitalData.MessagingService.Application.Common.Models.MailSearch;
+using DigitalData.MessagingService.Application.Common.Dto.MailSearch;
using FluentValidation;
namespace DigitalData.MessagingService.Application.EmailReceiving.Validators;
diff --git a/src/core/DigitalData.MessagingService.Application/EmailReceiving/Validators/UidFilterValidator.cs b/src/core/DigitalData.MessagingService.Application/EmailReceiving/Validators/UidFilterValidator.cs
index 4a5dd2c..9df3b6b 100644
--- a/src/core/DigitalData.MessagingService.Application/EmailReceiving/Validators/UidFilterValidator.cs
+++ b/src/core/DigitalData.MessagingService.Application/EmailReceiving/Validators/UidFilterValidator.cs
@@ -1,5 +1,5 @@
#if NET
-using DigitalData.MessagingService.Application.Common.Models.MailSearch;
+using DigitalData.MessagingService.Application.Common.Dto.MailSearch;
using FluentValidation;
namespace DigitalData.MessagingService.Application.EmailReceiving.Validators;
diff --git a/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/PublishEmailCommand.cs b/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/PublishEmailCommand.cs
index bcc496f..35585ba 100644
--- a/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/PublishEmailCommand.cs
+++ b/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/PublishEmailCommand.cs
@@ -2,9 +2,10 @@
using AutoMapper;
using DigitalData.MessagingService.Application.EmailAccount.Queries;
using DigitalData.MessagingService.Domain.Exceptions;
-using DigitalData.MessagingService.Abstraction;
+using DigitalData.MessagingService.Application.Common.Dto;
using MediatR;
using System.Text.Json.Serialization;
+using DigitalData.MessagingService.Application.Common.Interfaces;
namespace DigitalData.MessagingService.Application.EmailSending.Commands;
diff --git a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Queue/SendingEmailConsumer.cs b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Queue/SendingEmailConsumer.cs
index 0763124..80c6f0a 100644
--- a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Queue/SendingEmailConsumer.cs
+++ b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Queue/SendingEmailConsumer.cs
@@ -1,11 +1,11 @@
using System.Text;
using System.Text.Json;
using DigitalData.MessagingService.Application.Common.Interfaces;
-using DigitalData.MessagingService.Abstraction;
using DigitalData.MessagingService.RabbitMQ;
using Microsoft.Extensions.Logging;
using RabbitMQ.Client;
using RabbitMQ.Client.Events;
+using DigitalData.MessagingService.Application.Common.Dto;
namespace DigitalData.MessagingService.Infrastructure.Queue;
diff --git a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/Background/EmailSyncWorker.cs b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/Background/EmailSyncWorker.cs
index b1e2430..be01c30 100644
--- a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/Background/EmailSyncWorker.cs
+++ b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/Background/EmailSyncWorker.cs
@@ -1,5 +1,5 @@
+using DigitalData.MessagingService.Application.Common.Dto.MailSearch;
using DigitalData.MessagingService.Application.Common.Interfaces;
-using DigitalData.MessagingService.Application.Common.Models.MailSearch;
using DigitalData.MessagingService.Application.Common.Options;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Options;
diff --git a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsEmailService.cs b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsEmailService.cs
index c015a19..c0c1dd3 100644
--- a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsEmailService.cs
+++ b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsEmailService.cs
@@ -5,7 +5,7 @@ using Limilabs.Client.SMTP;
using Limilabs.Mail;
using Limilabs.Mail.Headers;
using DigitalData.MessagingService.Infrastructure.Services.Extensions;
-using DigitalData.MessagingService.Abstraction;
+using DigitalData.MessagingService.Application.Common.Dto;
namespace DigitalData.MessagingService.Infrastructure.Services;
diff --git a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsImapEmailService.cs b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsImapEmailService.cs
index 90f2499..672f992 100644
--- a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsImapEmailService.cs
+++ b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsImapEmailService.cs
@@ -1,6 +1,6 @@
-using DigitalData.MessagingService.Abstraction;
+using DigitalData.MessagingService.Application.Common.Dto;
+using DigitalData.MessagingService.Application.Common.Dto.MailSearch;
using DigitalData.MessagingService.Application.Common.Interfaces;
-using DigitalData.MessagingService.Application.Common.Models.MailSearch;
using DigitalData.MessagingService.Domain.Exceptions;
using DigitalData.MessagingService.Infrastructure.Services.Extensions;
using Limilabs.Client.IMAP;
@@ -15,10 +15,7 @@ namespace DigitalData.MessagingService.Infrastructure.Services;
/// IMAP email service using Limilabs Mail.dll.
/// Opens a fresh connection per call — stateless and thread-safe.
///
-public class LimilabsImapEmailService(
- IEncryptionService EncryptionService,
- ILogger Logger,
- IMemoryCache Cache) : IImapEmailService
+public class LimilabsImapEmailService(ILogger Logger, IMemoryCache Cache) : IImapEmailService
{
private static readonly string CacheKeyPrefix = Guid.NewGuid().ToString();
diff --git a/src/infrastructure/DigitalData.MessagingService.Publisher/DependencyInjection.cs b/src/infrastructure/DigitalData.MessagingService.Publisher/DependencyInjection.cs
index 214c2a3..c5a0246 100644
--- a/src/infrastructure/DigitalData.MessagingService.Publisher/DependencyInjection.cs
+++ b/src/infrastructure/DigitalData.MessagingService.Publisher/DependencyInjection.cs
@@ -1,6 +1,5 @@
-using DigitalData.MessagingService.Abstraction;
+using DigitalData.MessagingService.Application.Common.Interfaces;
using DigitalData.MessagingService.RabbitMQ;
-using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
namespace DigitalData.MessagingService.Publisher;
diff --git a/src/infrastructure/DigitalData.MessagingService.Publisher/DigitalData.MessagingService.Publisher.csproj b/src/infrastructure/DigitalData.MessagingService.Publisher/DigitalData.MessagingService.Publisher.csproj
index 46588ce..b3f5630 100644
--- a/src/infrastructure/DigitalData.MessagingService.Publisher/DigitalData.MessagingService.Publisher.csproj
+++ b/src/infrastructure/DigitalData.MessagingService.Publisher/DigitalData.MessagingService.Publisher.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/src/infrastructure/DigitalData.MessagingService.Publisher/SendingEmailPublisher.cs b/src/infrastructure/DigitalData.MessagingService.Publisher/SendingEmailPublisher.cs
index b6ca4b1..dd630e8 100644
--- a/src/infrastructure/DigitalData.MessagingService.Publisher/SendingEmailPublisher.cs
+++ b/src/infrastructure/DigitalData.MessagingService.Publisher/SendingEmailPublisher.cs
@@ -4,7 +4,8 @@ using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using RabbitMQ.Client;
using DigitalData.MessagingService.RabbitMQ;
-using DigitalData.MessagingService.Abstraction;
+using DigitalData.MessagingService.Application.Common.Dto;
+using DigitalData.MessagingService.Application.Common.Interfaces;
namespace DigitalData.MessagingService.Publisher;
diff --git a/src/presentation/DigitalData.MessagingService.API/Controllers/EmailController.cs b/src/presentation/DigitalData.MessagingService.API/Controllers/EmailController.cs
index cfdcfd2..f35aa42 100644
--- a/src/presentation/DigitalData.MessagingService.API/Controllers/EmailController.cs
+++ b/src/presentation/DigitalData.MessagingService.API/Controllers/EmailController.cs
@@ -1,10 +1,8 @@
using DigitalData.MessagingService.Application.EmailSending.Commands;
using DigitalData.MessagingService.Application.EmailReceiving.Queries;
-using DigitalData.MessagingService.Application.EmailReceiving.Commands;
-using DigitalData.MessagingService.Application.EmailAccount.Queries;
-using DigitalData.MessagingService.Abstraction;
using MediatR;
using Microsoft.AspNetCore.Mvc;
+using DigitalData.MessagingService.Application.Common.Dto;
namespace DigitalData.MessagingService.API.Controllers;
diff --git a/src/presentation/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj b/src/presentation/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj
index 0e11ac0..ef08718 100644
--- a/src/presentation/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj
+++ b/src/presentation/DigitalData.MessagingService.Client/DigitalData.MessagingService.Client.csproj
@@ -35,9 +35,6 @@
-
- all
-
all
diff --git a/src/presentation/DigitalData.MessagingService.Client/EmailSender.cs b/src/presentation/DigitalData.MessagingService.Client/EmailSender.cs
index 523f7f5..2e4b0b4 100644
--- a/src/presentation/DigitalData.MessagingService.Client/EmailSender.cs
+++ b/src/presentation/DigitalData.MessagingService.Client/EmailSender.cs
@@ -1,7 +1,8 @@
using DigitalData.MessagingService.Publisher;
-using DigitalData.MessagingService.Abstraction;
using DigitalData.MessagingService.RabbitMQ;
using Microsoft.Extensions.DependencyInjection;
+using DigitalData.MessagingService.Application.Common.Dto;
+using DigitalData.MessagingService.Application.Common.Interfaces;
namespace DigitalData.MessagingService.Client;
diff --git a/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderTests.cs b/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderTests.cs
index 0711572..920e21e 100644
--- a/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderTests.cs
+++ b/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderTests.cs
@@ -1,5 +1,5 @@
+using DigitalData.MessagingService.Application.Common.Dto;
using DigitalData.MessagingService.Client;
-using DigitalData.MessagingService.Abstraction;
namespace DigitalData.MessagingService.Tests.Integration;
diff --git a/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderUrlOverloadTests.cs b/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderUrlOverloadTests.cs
index 8fe46a4..1686d36 100644
--- a/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderUrlOverloadTests.cs
+++ b/tests/DigitalData.MessagingService.Tests/Integration/EmailSenderUrlOverloadTests.cs
@@ -1,5 +1,5 @@
+using DigitalData.MessagingService.Application.Common.Dto;
using DigitalData.MessagingService.Client;
-using DigitalData.MessagingService.Abstraction;
namespace DigitalData.MessagingService.Tests.Integration;
diff --git a/tests/DigitalData.MessagingService.Tests/Integration/SendingEmailPublisherTests.cs b/tests/DigitalData.MessagingService.Tests/Integration/SendingEmailPublisherTests.cs
index 1153075..56a0468 100644
--- a/tests/DigitalData.MessagingService.Tests/Integration/SendingEmailPublisherTests.cs
+++ b/tests/DigitalData.MessagingService.Tests/Integration/SendingEmailPublisherTests.cs
@@ -1,11 +1,10 @@
using System.Text;
using System.Text.Json;
using DigitalData.MessagingService.Publisher;
-using DigitalData.MessagingService.Abstraction;
using DigitalData.MessagingService.RabbitMQ;
using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using RabbitMQ.Client;
+using DigitalData.MessagingService.Application.Common.Dto;
+using DigitalData.MessagingService.Application.Common.Interfaces;
namespace DigitalData.MessagingService.Tests.Integration;