diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/EMailService.java b/mail-service/src/main/java/de/itvsh/ozg/mail/email/EMailService.java
similarity index 97%
rename from mail-service/src/main/java/de/itvsh/ozg/mail/EMailService.java
rename to mail-service/src/main/java/de/itvsh/ozg/mail/email/EMailService.java
index 9d6a42b9482f8c9849a126918f0abb7e46ced3b9..34a4df14d891b522b2b45ef044be41e04004953f 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/EMailService.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/email/EMailService.java
@@ -1,4 +1,4 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
 
 import java.util.Objects;
 
@@ -12,8 +12,8 @@ import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Service;
 
-import de.itvsh.ozg.mail.MailSendRequest.MailAttachment;
 import de.itvsh.ozg.mail.common.errorhandling.TechnicalException;
+import de.itvsh.ozg.mail.email.MailSendRequest.MailAttachment;
 import lombok.extern.log4j.Log4j2;
 
 @Service
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/MailSendErrorEvent.java b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSendErrorEvent.java
similarity index 93%
rename from mail-service/src/main/java/de/itvsh/ozg/mail/MailSendErrorEvent.java
rename to mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSendErrorEvent.java
index 9c1efd382a3f4261489b45d46916d963cd20f0a5..2ad1295a5b2de83f4c476700632fea2a0c4dae71 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/MailSendErrorEvent.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSendErrorEvent.java
@@ -1,4 +1,4 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
 
 import org.springframework.context.ApplicationEvent;
 
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/MailSendRequest.java b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSendRequest.java
similarity index 94%
rename from mail-service/src/main/java/de/itvsh/ozg/mail/MailSendRequest.java
rename to mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSendRequest.java
index f51ba8ce37f4831e28c28dc5bb48c781ea3635db..b7e19f11bdfc50be64a9d346654b2123dac2a93e 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/MailSendRequest.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSendRequest.java
@@ -1,4 +1,4 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
 
 import java.util.Collection;
 
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/MailSentEvent.java b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSentEvent.java
similarity index 90%
rename from mail-service/src/main/java/de/itvsh/ozg/mail/MailSentEvent.java
rename to mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSentEvent.java
index c343eefab01e27e68c8383bdd06fbce482718614..bd8b5df38a135c3461999ad87d4317e92ee7d137 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/MailSentEvent.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSentEvent.java
@@ -1,4 +1,4 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
 
 import org.springframework.context.ApplicationEvent;
 
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/MailService.java b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailService.java
similarity index 91%
rename from mail-service/src/main/java/de/itvsh/ozg/mail/MailService.java
rename to mail-service/src/main/java/de/itvsh/ozg/mail/email/MailService.java
index 5e50c48a46fc54d8508303150697ced54a422a58..6532bf123fc89cfe5ad7a69f869a0f09f72ff948 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/MailService.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailService.java
@@ -1,4 +1,4 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
diff --git a/mail-service/src/test/java/de/itvsh/ozg/mail/EMailServiceTest.java b/mail-service/src/test/java/de/itvsh/ozg/mail/email/EMailServiceTest.java
similarity index 95%
rename from mail-service/src/test/java/de/itvsh/ozg/mail/EMailServiceTest.java
rename to mail-service/src/test/java/de/itvsh/ozg/mail/email/EMailServiceTest.java
index 10575282af8c7e28cd19aee27d08635f845a91bb..b0a1eb2e16004cc7450857ac83984291575f4253 100644
--- a/mail-service/src/test/java/de/itvsh/ozg/mail/EMailServiceTest.java
+++ b/mail-service/src/test/java/de/itvsh/ozg/mail/email/EMailServiceTest.java
@@ -1,4 +1,4 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
 
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
@@ -18,6 +18,11 @@ import org.springframework.mail.MailSendException;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 
+import de.itvsh.ozg.mail.email.EMailService;
+import de.itvsh.ozg.mail.email.MailSendErrorEvent;
+import de.itvsh.ozg.mail.email.MailSendRequest;
+import de.itvsh.ozg.mail.email.MailSentEvent;
+
 class EMailServiceTest {
 
 	@Spy // NOSONAR
diff --git a/mail-service/src/test/java/de/itvsh/ozg/mail/MailSendErrorEventTestFactory.java b/mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSendErrorEventTestFactory.java
similarity index 63%
rename from mail-service/src/test/java/de/itvsh/ozg/mail/MailSendErrorEventTestFactory.java
rename to mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSendErrorEventTestFactory.java
index 57c43869a959f32c01f2faf2d167b7c4dcce64b5..4d92e0b5e53975b6744a9f33471fa09fc1876983 100644
--- a/mail-service/src/test/java/de/itvsh/ozg/mail/MailSendErrorEventTestFactory.java
+++ b/mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSendErrorEventTestFactory.java
@@ -1,4 +1,7 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
+
+import de.itvsh.ozg.mail.email.MailSendErrorEvent;
+import de.itvsh.ozg.mail.email.MailSendRequest;
 
 public class MailSendErrorEventTestFactory {
 
diff --git a/mail-service/src/test/java/de/itvsh/ozg/mail/MailSendRequestTestFactory.java b/mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSendRequestTestFactory.java
similarity index 87%
rename from mail-service/src/test/java/de/itvsh/ozg/mail/MailSendRequestTestFactory.java
rename to mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSendRequestTestFactory.java
index f8cadd668f46aaebf38a62f93c67a8f6b424842b..d68abf06c23babb77bd2ab8cca33f86daaa5e5ad 100644
--- a/mail-service/src/test/java/de/itvsh/ozg/mail/MailSendRequestTestFactory.java
+++ b/mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSendRequestTestFactory.java
@@ -1,10 +1,11 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
 
 import java.util.UUID;
 
 import javax.mail.util.ByteArrayDataSource;
 
-import de.itvsh.ozg.mail.MailSendRequest.MailAttachment;
+import de.itvsh.ozg.mail.email.MailSendRequest;
+import de.itvsh.ozg.mail.email.MailSendRequest.MailAttachment;
 
 class MailSendRequestTestFactory {
 
diff --git a/mail-service/src/test/java/de/itvsh/ozg/mail/MailSentEventTestFactory.java b/mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSentEventTestFactory.java
similarity index 72%
rename from mail-service/src/test/java/de/itvsh/ozg/mail/MailSentEventTestFactory.java
rename to mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSentEventTestFactory.java
index 68acc0d73a966bcd3caf222c4377035364fd944f..6cc2bea6acd5f061903cb252c2b214bfc519ca88 100644
--- a/mail-service/src/test/java/de/itvsh/ozg/mail/MailSentEventTestFactory.java
+++ b/mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSentEventTestFactory.java
@@ -1,4 +1,6 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
+
+import de.itvsh.ozg.mail.email.MailSentEvent;
 
 public class MailSentEventTestFactory {
 
diff --git a/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListener.java b/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListener.java
index 5e5cbd3d593c28184c28ddb8827254a5bdabecba..364bd2251b2bb92fdd2bf166eb1bbe93b67d2855 100644
--- a/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListener.java
+++ b/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListener.java
@@ -6,9 +6,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
-import de.itvsh.ozg.mail.MailSendErrorEvent;
-import de.itvsh.ozg.mail.MailSendRequest;
-import de.itvsh.ozg.mail.MailSentEvent;
+import de.itvsh.ozg.mail.email.MailSendErrorEvent;
+import de.itvsh.ozg.mail.email.MailSendRequest;
+import de.itvsh.ozg.mail.email.MailSentEvent;
 import de.itvsh.ozg.pluto.command.Command;
 import de.itvsh.ozg.pluto.command.CommandCreatedEvent;
 import de.itvsh.ozg.pluto.command.Order;
diff --git a/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingService.java b/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingService.java
index d584997d62d765416e7985e50c715f2dd6f2af5b..89511aec4f0fccbcaf152b30028f01f24426f9a0 100644
--- a/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingService.java
+++ b/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingService.java
@@ -19,9 +19,9 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.util.MimeTypeUtils;
 
-import de.itvsh.ozg.mail.MailSendRequest;
-import de.itvsh.ozg.mail.MailSendRequest.MailAttachment;
-import de.itvsh.ozg.mail.MailService;
+import de.itvsh.ozg.mail.email.MailSendRequest;
+import de.itvsh.ozg.mail.email.MailService;
+import de.itvsh.ozg.mail.email.MailSendRequest.MailAttachment;
 import de.itvsh.ozg.pluto.command.Command;
 import de.itvsh.ozg.pluto.common.errorhandling.TechnicalException;
 import de.itvsh.ozg.pluto.vorgang.Vorgang;
diff --git a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardVorgangITCase.java b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardVorgangITCase.java
index df58d774daceda11c0db0a7761e1ed3369318ffd..c4d788518f69106733eb0910624d74734b84768d 100644
--- a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardVorgangITCase.java
+++ b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardVorgangITCase.java
@@ -14,8 +14,8 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.mongodb.core.MongoOperations;
 
-import de.itvsh.ozg.mail.MailSendErrorEventTestFactory;
-import de.itvsh.ozg.mail.MailService;
+import de.itvsh.ozg.mail.email.MailSendErrorEventTestFactory;
+import de.itvsh.ozg.mail.email.MailService;
 import de.itvsh.ozg.pluto.command.Command;
 import de.itvsh.ozg.pluto.command.CommandStatus;
 import de.itvsh.ozg.pluto.command.GrpcCreateCommandRequestTestFactory;
diff --git a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerITCase.java b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerITCase.java
index bde113a900d3deea2f6c0f9e45db36c9855d9c52..c5c596f156cf8ddad447912e9965705b49b5fc60 100644
--- a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerITCase.java
+++ b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerITCase.java
@@ -13,7 +13,7 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.mail.javamail.JavaMailSender;
 
-import de.itvsh.ozg.mail.MailSentEventTestFactory;
+import de.itvsh.ozg.mail.email.MailSentEventTestFactory;
 import de.itvsh.ozg.pluto.command.Command;
 import de.itvsh.ozg.pluto.command.CommandCreatedEventTestFactory;
 import de.itvsh.ozg.pluto.command.CommandTestFactory;
diff --git a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerTest.java b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerTest.java
index 4695037bc033933583368565bb2e6b01692cb213..3126553a10fa58e3bc8b295359413ebe65332acb 100644
--- a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerTest.java
+++ b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerTest.java
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
-import de.itvsh.ozg.mail.MailSentEventTestFactory;
+import de.itvsh.ozg.mail.email.MailSentEventTestFactory;
 import de.itvsh.ozg.pluto.command.Command;
 import de.itvsh.ozg.pluto.command.CommandCreatedEventTestFactory;
 import de.itvsh.ozg.pluto.command.CommandTestFactory;
diff --git a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingServiceTest.java b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingServiceTest.java
index c0879a8702aea2a7fb3307bbc617881f070229fb..bdf1a0c7c1033ce1c01896822624fb08735eac02 100644
--- a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingServiceTest.java
+++ b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingServiceTest.java
@@ -18,8 +18,8 @@ import org.mockito.Spy;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import de.itvsh.ozg.mail.MailSendRequest.MailAttachment;
-import de.itvsh.ozg.mail.MailService;
+import de.itvsh.ozg.mail.email.MailService;
+import de.itvsh.ozg.mail.email.MailSendRequest.MailAttachment;
 import de.itvsh.ozg.pluto.command.Command;
 import de.itvsh.ozg.pluto.command.CommandTestFactory;
 import de.itvsh.ozg.pluto.vorgang.AntragstellerTestFactory;