diff --git a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverService.cs b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverService.cs
index 1599df10..9bf8ca10 100644
--- a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverService.cs
+++ b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverService.cs
@@ -4,7 +4,7 @@ using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Dto.Messaging;
 using EnvelopeGenerator.Application.Envelopes;
-using EnvelopeGenerator.Application.Envelopes.Queries.Read;
+using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Application.Receivers.Queries.Read;
 using EnvelopeGenerator.Domain.Entities;
 
diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
index 2da2937d..d02bf253 100644
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Envelopes.Queries.Read;
+using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Application.Receivers.Queries.Read;
 using MediatR;
 using EnvelopeGenerator.Domain;
diff --git a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs
index 8cbe8add..6cfd8e62 100644
--- a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs
+++ b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs
@@ -1,5 +1,5 @@
 using EnvelopeGenerator.Application.Dto;
-using EnvelopeGenerator.Application.Envelopes.Queries.Read;
+using EnvelopeGenerator.Application.Envelopes.Queries;
 using MediatR;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using System.ComponentModel.DataAnnotations;
diff --git a/EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeQuery.cs b/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs
similarity index 86%
rename from EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeQuery.cs
rename to EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs
index f4a79d21..92a62197 100644
--- a/EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeQuery.cs
+++ b/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs
@@ -1,6 +1,6 @@
 using MediatR;
 
-namespace EnvelopeGenerator.Application.Envelopes.Queries.Read;
+namespace EnvelopeGenerator.Application.Envelopes.Queries;
 
 /// <summary>
 /// Repräsentiert eine Abfrage für Umschläge.
diff --git a/EnvelopeGenerator.Application/Envelopes/Queries/ReceiverName/ReadReceiverNameQuery.cs b/EnvelopeGenerator.Application/Envelopes/Queries/ReadReceiverNameQuery.cs
similarity index 81%
rename from EnvelopeGenerator.Application/Envelopes/Queries/ReceiverName/ReadReceiverNameQuery.cs
rename to EnvelopeGenerator.Application/Envelopes/Queries/ReadReceiverNameQuery.cs
index 55b477a3..b18d05fe 100644
--- a/EnvelopeGenerator.Application/Envelopes/Queries/ReceiverName/ReadReceiverNameQuery.cs
+++ b/EnvelopeGenerator.Application/Envelopes/Queries/ReadReceiverNameQuery.cs
@@ -1,6 +1,6 @@
 using EnvelopeGenerator.Application.Receivers.Queries.Read;
 
-namespace EnvelopeGenerator.Application.Envelopes.Queries.ReceiverName;
+namespace EnvelopeGenerator.Application.Envelopes.Queries;
 
 /// <summary>
 /// Eine Abfrage, um die zuletzt verwendete Anrede eines Empfängers zu ermitteln, 
diff --git a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
index 39adbff0..ba804c31 100644
--- a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
+++ b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
@@ -12,7 +12,7 @@ using EnvelopeGenerator.Application.Dto.Messaging;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.Envelopes;
 using EnvelopeGenerator.Application.Receivers.Queries.Read;
-using EnvelopeGenerator.Application.Envelopes.Queries.Read;
+using EnvelopeGenerator.Application.Envelopes.Queries;
 
 namespace EnvelopeGenerator.Application.Services;
 
diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs
index c743b1e2..01747eb9 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs
@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.Envelopes.Commands;
-using EnvelopeGenerator.Application.Envelopes.Queries.Read;
+using EnvelopeGenerator.Application.Envelopes.Queries;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
index 74c0c8b1..15a8a8da 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
@@ -5,7 +5,7 @@ using EnvelopeGenerator.Application.Contracts.SQLExecutor;
 using EnvelopeGenerator.Application.Dto.Receiver;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
-using EnvelopeGenerator.Application.Envelopes.Queries.ReceiverName;
+using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Application.SQL;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.GeneratorAPI.Models;