diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/xdomea/ExportData.java b/alfa-xdomea/src/main/java/de/ozgcloud/xdomea/ExportData.java
new file mode 100644
index 0000000000000000000000000000000000000000..1470dc7023aaea7e56c24fcd62d7b40a4dcb90bc
--- /dev/null
+++ b/alfa-xdomea/src/main/java/de/ozgcloud/xdomea/ExportData.java
@@ -0,0 +1,14 @@
+package de.ozgcloud.xdomea;
+
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Getter
+@Builder(toBuilder = true)
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@ToString
+class ExportData {
+}
diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/xdomea/XDomeaController.java b/alfa-xdomea/src/main/java/de/ozgcloud/xdomea/XDomeaController.java
deleted file mode 100644
index 382b1442252bfc0fbdf07a55b1732209bfdadc5f..0000000000000000000000000000000000000000
--- a/alfa-xdomea/src/main/java/de/ozgcloud/xdomea/XDomeaController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package de.ozgcloud.xdomea;
-
-class XDomeaController {
-}
diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/xdomea/XDomeaModelAssembler.java b/alfa-xdomea/src/main/java/de/ozgcloud/xdomea/XDomeaModelAssembler.java
deleted file mode 100644
index 85e96158a3d47cea7910337fb9fa4e16eec1da63..0000000000000000000000000000000000000000
--- a/alfa-xdomea/src/main/java/de/ozgcloud/xdomea/XDomeaModelAssembler.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package de.ozgcloud.xdomea;
-
-class XDomeaModelAssembler {
-}
diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/xdomea/XDomeaService.java b/alfa-xdomea/src/main/java/de/ozgcloud/xdomea/XDomeaService.java
index 5cc88680d4f6b006de80d9f8ef608fbae7714ed9..1589b93d639f90ba208bd4ec04235ad317c2256b 100644
--- a/alfa-xdomea/src/main/java/de/ozgcloud/xdomea/XDomeaService.java
+++ b/alfa-xdomea/src/main/java/de/ozgcloud/xdomea/XDomeaService.java
@@ -12,11 +12,11 @@ import de.itvsh.kop.common.errorhandling.TechnicalException;
 @Service
 class XDomeaService {
 
-	public ByteArrayOutputStream createVorgangExport() {
+	public ByteArrayOutputStream createExport(ExportData exportData) {
 		ByteArrayOutputStream outputBytes = new ByteArrayOutputStream();
 		try (ZipOutputStream zipOutputStream = new ZipOutputStream(outputBytes)) {
 
-			putZipEntry("fake_file.txt", "data", zipOutputStream);
+			putZipEntry("export_test.txt", "test", zipOutputStream);
 
 		} catch (IOException ioe) {
 			throw new TechnicalException("Error creating zip file with Vorgang export", ioe);
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/xdomea/ExportDataTestFactory.java b/alfa-xdomea/src/test/java/de/ozgcloud/xdomea/ExportDataTestFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..63fc2cc5dfd7230cf0e66fc0b8b053d812fef529
--- /dev/null
+++ b/alfa-xdomea/src/test/java/de/ozgcloud/xdomea/ExportDataTestFactory.java
@@ -0,0 +1,13 @@
+package de.ozgcloud.xdomea;
+
+class ExportDataTestFactory {
+
+	public static ExportData create() {
+		return createBuilder().build();
+	}
+
+	public static ExportData.ExportDataBuilder createBuilder() {
+		return ExportData.builder();
+	}
+
+}
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/xdomea/XDomeaControllerTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/xdomea/XDomeaControllerTest.java
deleted file mode 100644
index 905bc9fa1416bdf0aaffe66f1bde0a2d6ff80e61..0000000000000000000000000000000000000000
--- a/alfa-xdomea/src/test/java/de/ozgcloud/xdomea/XDomeaControllerTest.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.ozgcloud.xdomea;
-
-class XDomeaControllerTest {
-
-}
\ No newline at end of file
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/xdomea/XDomeaModelAssemblerTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/xdomea/XDomeaModelAssemblerTest.java
deleted file mode 100644
index cdec514ccff5eeb0553349e7e8a3a1c5a66bd8db..0000000000000000000000000000000000000000
--- a/alfa-xdomea/src/test/java/de/ozgcloud/xdomea/XDomeaModelAssemblerTest.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.ozgcloud.xdomea;
-
-class XDomeaModelAssemblerTest {
-
-}
\ No newline at end of file
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/xdomea/XDomeaServiceTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/xdomea/XDomeaServiceTest.java
index 99312919ce01e9a884115f6a0aefbc14d09aede4..0a3a7c716d2fd70089eb73cde64933d3b1985b6c 100644
--- a/alfa-xdomea/src/test/java/de/ozgcloud/xdomea/XDomeaServiceTest.java
+++ b/alfa-xdomea/src/test/java/de/ozgcloud/xdomea/XDomeaServiceTest.java
@@ -10,11 +10,11 @@ class XDomeaServiceTest {
 	private XDomeaService service = new XDomeaService();
 
 	@Nested
-	class TestCreateVorgangExport {
+	class TestCreateExport {
 
 		@Test
 		void shouldCreate() {
-			var zipBytesStream = service.createVorgangExport();
+			var zipBytesStream = service.createExport(ExportDataTestFactory.create());
 
 			assertThat(zipBytesStream).isNotNull();
 			assertThat(zipBytesStream.toByteArray()).hasSizeGreaterThan(100);