diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs
index 0e271484..c743b1e2 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs
@@ -1,4 +1,4 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.Envelopes.Commands;
 using EnvelopeGenerator.Application.Envelopes.Queries.Read;
@@ -6,8 +6,6 @@ using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 
@@ -31,6 +29,7 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 public class EnvelopeController : ControllerBase
 {
     private readonly ILogger<EnvelopeController> _logger;
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeService _envelopeService;
     private readonly IMediator _mediator;
 
@@ -40,6 +39,7 @@ public class EnvelopeController : ControllerBase
     /// <param name="logger">Der Logger, der für das Protokollieren von Informationen verwendet wird.</param>
     /// <param name="envelopeService">Der Dienst, der für die Verarbeitung von Umschlägen zuständig ist.</param>
     /// <param name="mediator"></param>
+    [Obsolete("Use MediatR")]
     public EnvelopeController(ILogger<EnvelopeController> logger, IEnvelopeService envelopeService, IMediator mediator)
     {
         _logger = logger;
@@ -59,6 +59,7 @@ public class EnvelopeController : ControllerBase
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
     [Authorize]
     [HttpGet]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> GetAsync([FromQuery] ReadEnvelopeQuery envelope)
     {
         if (User.GetId() is int intId)
@@ -98,6 +99,7 @@ public class EnvelopeController : ControllerBase
     /// <response code="404">Das Dokument wurde nicht gefunden oder ist nicht verfügbar.</response>
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
     [HttpGet("doc-result")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> GetDocResultAsync([FromQuery] int id, [FromQuery] bool view = false)
     {
         if (User.GetId() is int intId)
@@ -154,4 +156,4 @@ public class EnvelopeController : ControllerBase
         else
             return Ok(res);
     }
-}
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
index 24249b44..8f988138 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
@@ -1,5 +1,5 @@
 using AutoMapper;
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.Contracts.SQLExecutor;
 using EnvelopeGenerator.Application.DTOs.Receiver;
@@ -31,6 +31,7 @@ public class EnvelopeReceiverController : ControllerBase
 {
     private readonly ILogger<EnvelopeReceiverController> _logger;
 
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeReceiverService _erService;
 
     private readonly IMediator _mediator;
@@ -56,6 +57,7 @@ public class EnvelopeReceiverController : ControllerBase
     /// <param name="erExecutor"></param>
     /// <param name="documentExecutor"></param>
     /// <param name="csOpt"></param>
+    [Obsolete("Use MediatR")]
     public EnvelopeReceiverController(ILogger<EnvelopeReceiverController> logger, IEnvelopeReceiverService envelopeReceiverService, IMediator mediator, IMapper mapper, IEnvelopeExecutor envelopeExecutor, IEnvelopeReceiverExecutor erExecutor, IDocumentExecutor documentExecutor, IOptions<ConnectionString> csOpt)
     {
         _logger = logger;
@@ -82,6 +84,7 @@ public class EnvelopeReceiverController : ControllerBase
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
     [Authorize]
     [HttpGet]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> GetEnvelopeReceiver([FromQuery] ReadEnvelopeReceiverQuery envelopeReceiver)
     {
         var username = User.GetUsernameOrDefault();
@@ -123,6 +126,7 @@ public class EnvelopeReceiverController : ControllerBase
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
     [Authorize]
     [HttpGet("salute")]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> GetReceiverName([FromQuery] ReadReceiverNameQuery receiver)
     {
         return await _erService.ReadLastUsedReceiverNameByMailAsync(receiver.EmailAddress, receiver.Id, receiver.Signature).ThenAsync(
diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeTypeController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeTypeController.cs
index c49d9a3b..d41a9660 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeTypeController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeTypeController.cs
@@ -1,23 +1,39 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 
+/// <summary>
+/// 
+/// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
 [Route("api/[controller]")]
 [ApiController]
 public class EnvelopeTypeController : ControllerBase
 {
     private readonly ILogger<EnvelopeTypeController> _logger;
+
+    [Obsolete("Use MediatR")]
     private readonly IEnvelopeTypeService _service;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="logger"></param>
+    /// <param name="service"></param>
+    [Obsolete("Use MediatR")]
     public EnvelopeTypeController(ILogger<EnvelopeTypeController> logger, IEnvelopeTypeService service)
     {
         _logger = logger;
         _service = service;
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    [Obsolete("Use MediatR")]
     [HttpGet]
     public async Task<IActionResult> GetAllAsync()
     {
diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs
index 0062a43f..943e8e51 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs
@@ -1,5 +1,5 @@
-using DigitalData.Core.API;
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
+using DigitalData.Core.API;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Application.Receivers.Queries.Read;
@@ -19,6 +19,7 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 [Route("api/[controller]")]
 [ApiController]
 [Authorize]
+[Obsolete("Use MediatR")]
 public class ReceiverController : CRUDControllerBaseWithErrorHandling<IReceiverService, ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>
 {
     /// <summary>
@@ -94,4 +95,4 @@ public class ReceiverController : CRUDControllerBaseWithErrorHandling<IReceiverS
         return base.GetById(id);
     }
     #endregion
-}
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Infrastructure/DependencyExtensions.cs b/EnvelopeGenerator.Infrastructure/DependencyExtensions.cs
index 09f94b40..aabeafa6 100644
--- a/EnvelopeGenerator.Infrastructure/DependencyExtensions.cs
+++ b/EnvelopeGenerator.Infrastructure/DependencyExtensions.cs
@@ -32,6 +32,7 @@ public static class DIExtensions
     /// This method ensures that the repositories are registered as scoped services, meaning that a new instance of each repository 
     /// will be created per HTTP request (or per scope) within the dependency injection container.
     /// </remarks>
+    [Obsolete("Use IRepository")]
     public static IServiceCollection AddEnvelopeGeneratorInfrastructureServices(this IServiceCollection services,
         Action<IServiceProvider, DbContextOptionsBuilder>? dbContextOptions = null,
         IConfiguration? sqlExecutorConfiguration = null,
@@ -157,4 +158,4 @@ public static class DIExtensions
 
         return services;
     }
-}
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Terminal/DependencyInjection.cs b/EnvelopeGenerator.Terminal/DependencyInjection.cs
index 421a57d2..60561ac3 100644
--- a/EnvelopeGenerator.Terminal/DependencyInjection.cs
+++ b/EnvelopeGenerator.Terminal/DependencyInjection.cs
@@ -14,6 +14,7 @@ namespace EnvelopeGenerator.Terminal;
 
 public static class DependencyInjection
 {
+    [Obsolete("Use MediatR")]
     public static IServiceCollection AddCommandManagerRunner(this IServiceCollection services, IConfiguration configuration, Case @case = Case.KebabCase, string connectionStringKeyName = "Default")
     {
         var connStr = configuration.GetConnectionString(connectionStringKeyName)
@@ -52,4 +53,4 @@ public static class DependencyInjection
     }
 
     public static Task<int> RunCommandManagerRunner(this IHost host, string[] args) => host.Services.RunCommandManagerRunner(args);
-}
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Tests.Application/Mock.cs b/EnvelopeGenerator.Tests.Application/Mock.cs
index b14108e8..4d1410e0 100644
--- a/EnvelopeGenerator.Tests.Application/Mock.cs
+++ b/EnvelopeGenerator.Tests.Application/Mock.cs
@@ -10,6 +10,7 @@ namespace EnvelopeGenerator.Tests.Application;
 
 public class Mock
 {
+    [Obsolete("Use MediatR")]
     public static IHost CreateHost(Action<HostApplicationBuilder>? builderOptions = null, string configPath = "appsettings.json", bool useRealDb = false, params string[] args)
     {
         var builder = Host.CreateApplicationBuilder(args.Any() ? args : null);