diff --git a/src/main/java/de/ozgcloud/processor/vorgang/VorgangEventListener.java b/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java
similarity index 86%
rename from src/main/java/de/ozgcloud/processor/vorgang/VorgangEventListener.java
rename to src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java
index 6584a2e3a401eecf43ab4264c5b52d7c7dd08a98..53df8b9fba7c05f2387aada41468b507f7a287e7 100644
--- a/src/main/java/de/ozgcloud/processor/vorgang/VorgangEventListener.java
+++ b/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java
@@ -1,12 +1,14 @@
-package de.ozgcloud.processor.vorgang;
+package de.ozgcloud.processor.processor;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
 import de.itvsh.ozg.pluto.command.VorgangCreatedEvent;
-import de.ozgcloud.processor.processor.ProcessorService;
 import de.ozgcloud.processor.result.ResultService;
+import de.ozgcloud.processor.vorgang.Vorgang;
+import de.ozgcloud.processor.vorgang.VorgangId;
+import de.ozgcloud.processor.vorgang.VorgangService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
@@ -14,7 +16,7 @@ import lombok.extern.log4j.Log4j2;
 @ConditionalOnProperty(prefix = "ozgcloud.processors[0]", name = "address")
 @RequiredArgsConstructor
 @Log4j2
-class VorgangEventListener {
+class ProcessorEventListener {
 
 	private final VorgangService service;
 	private final ProcessorService processorService;
diff --git a/src/main/java/de/ozgcloud/processor/vorgang/VorgangService.java b/src/main/java/de/ozgcloud/processor/vorgang/VorgangService.java
index c0c1297c4254849a9670febf4e459e8235420fa9..059b71d6e3f4400d25cac30ac383c80a9b1fca88 100644
--- a/src/main/java/de/ozgcloud/processor/vorgang/VorgangService.java
+++ b/src/main/java/de/ozgcloud/processor/vorgang/VorgangService.java
@@ -9,7 +9,7 @@ import lombok.RequiredArgsConstructor;
 
 @Service("processorVorgangService")
 @RequiredArgsConstructor
-class VorgangService {
+public class VorgangService {
 
 	private final OzgCloudVorgangService ozgCloudService;
 	private final ProcessorVorgangMapper mapper;
diff --git a/src/test/java/de/ozgcloud/processor/vorgang/VorgangEventListenerITCase.java b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
similarity index 81%
rename from src/test/java/de/ozgcloud/processor/vorgang/VorgangEventListenerITCase.java
rename to src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
index e4c0b1d647bf5b5d588f65428f6062dbf13c1ed6..479fb7f501f8833113c2af5f76c7c8476740959f 100644
--- a/src/test/java/de/ozgcloud/processor/vorgang/VorgangEventListenerITCase.java
+++ b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.processor.vorgang;
+package de.ozgcloud.processor.processor;
 
 import static org.mockito.Mockito.*;
 
@@ -12,9 +12,12 @@ import de.itvsh.ozg.pluto.command.VorgangCreatedEvent;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
 import de.ozgcloud.processor.processor.ProcessorService;
 import de.ozgcloud.processor.result.ResultService;
+import de.ozgcloud.processor.vorgang.VorgangId;
+import de.ozgcloud.processor.vorgang.VorgangService;
+import de.ozgcloud.processor.vorgang.VorgangTestFactory;
 
 @ITCase
-class VorgangEventListenerITCase {
+class ProcessorEventListenerITCase {
 
 	@Autowired
 	private ApplicationEventPublisher publisher;
diff --git a/src/test/java/de/ozgcloud/processor/vorgang/VorgangEventListenerTest.java b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java
similarity index 89%
rename from src/test/java/de/ozgcloud/processor/vorgang/VorgangEventListenerTest.java
rename to src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java
index 8bc0c7ccc78a7d46cb10d75ec24bde69dfc957ab..48fe807fb471635e777279d108e224c6beff5f68 100644
--- a/src/test/java/de/ozgcloud/processor/vorgang/VorgangEventListenerTest.java
+++ b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.processor.vorgang;
+package de.ozgcloud.processor.processor;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -16,20 +16,21 @@ import org.mockito.Spy;
 
 import de.itvsh.ozg.pluto.command.VorgangCreatedEvent;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
-import de.ozgcloud.processor.processor.ProcessorResult;
-import de.ozgcloud.processor.processor.ProcessorResultTestFactory;
-import de.ozgcloud.processor.processor.ProcessorService;
 import de.ozgcloud.processor.result.ProcessorTechnicalException;
 import de.ozgcloud.processor.result.ResultService;
+import de.ozgcloud.processor.vorgang.Vorgang;
+import de.ozgcloud.processor.vorgang.VorgangId;
+import de.ozgcloud.processor.vorgang.VorgangService;
+import de.ozgcloud.processor.vorgang.VorgangTestFactory;
 import reactor.core.publisher.Mono;
 
-class VorgangEventListenerTest {
+class ProcessorEventListenerTest {
 
 	private static final VorgangCreatedEvent EVENT = new VorgangCreatedEvent(OzgCloudVorgangTestFactory.ID.toString());
 
 	@Spy
 	@InjectMocks
-	private VorgangEventListener vorgangEventListener;
+	private ProcessorEventListener vorgangEventListener;
 
 	@Mock
 	private VorgangService vorgangService;