diff --git a/goofy-server/src/main/java/de/itvsh/goofy/attached_item/VorgangAttachedItem.java b/goofy-server/src/main/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItem.java
similarity index 88%
rename from goofy-server/src/main/java/de/itvsh/goofy/attached_item/VorgangAttachedItem.java
rename to goofy-server/src/main/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItem.java
index 12d2e399feabccf3a41a0a6a2c5113d3e5318c01..68f99ec311c1e56478cd9bed891c5f4dd2b55955 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/attached_item/VorgangAttachedItem.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItem.java
@@ -1,4 +1,4 @@
-package de.itvsh.goofy.attached_item;
+package de.itvsh.goofy.common.attacheditem;
 
 import java.util.Map;
 
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/attached_item/VorgangAttachedItemService.java b/goofy-server/src/main/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemService.java
similarity index 98%
rename from goofy-server/src/main/java/de/itvsh/goofy/attached_item/VorgangAttachedItemService.java
rename to goofy-server/src/main/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemService.java
index 7c9aac4d961e708cd108f1bfef3957a950b9130e..de236d619f152683cf74c467abb009421d8f143d 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/attached_item/VorgangAttachedItemService.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemService.java
@@ -1,4 +1,4 @@
-package de.itvsh.goofy.attached_item;
+package de.itvsh.goofy.common.attacheditem;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarService.java b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarService.java
index 1782047c75655978aab915e161fca893f8355634..1a6627031e2d66b5b420705f339c10c0ece767c4 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarService.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarService.java
@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import de.itvsh.goofy.attached_item.VorgangAttachedItemService;
+import de.itvsh.goofy.common.attacheditem.VorgangAttachedItemService;
 import de.itvsh.goofy.common.command.Command;
 import de.itvsh.goofy.common.user.CurrentUserService;
 
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageService.java b/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageService.java
index c878201f49cb833d647eb8ca408c870e12ee116e..e508c813a169c3ed9570239ff1add9df2491c2ae 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageService.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageService.java
@@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import de.itvsh.goofy.attached_item.VorgangAttachedItemService;
+import de.itvsh.goofy.common.attacheditem.VorgangAttachedItemService;
 import de.itvsh.goofy.common.command.Command;
 import de.itvsh.goofy.common.user.CurrentUserService;
 
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemServiceTest.java
similarity index 97%
rename from goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemServiceTest.java
rename to goofy-server/src/test/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemServiceTest.java
index 81c082d760808cca48b6d8939a1284d19e619dd8..119c69476263cf2451c055d215dfefcb07ce74cb 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemServiceTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemServiceTest.java
@@ -1,4 +1,4 @@
-package de.itvsh.goofy.attached_item;
+package de.itvsh.goofy.common.attacheditem;
 
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
@@ -13,6 +13,8 @@ import org.mockito.Spy;
 
 import static org.assertj.core.api.Assertions.*;
 
+import de.itvsh.goofy.common.attacheditem.VorgangAttachedItem;
+import de.itvsh.goofy.common.attacheditem.VorgangAttachedItemService;
 import de.itvsh.goofy.common.command.Command;
 import de.itvsh.goofy.common.command.CommandBodyMapper;
 import de.itvsh.goofy.common.command.CommandOrder;
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemTestFactory.java b/goofy-server/src/test/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemTestFactory.java
similarity index 86%
rename from goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemTestFactory.java
rename to goofy-server/src/test/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemTestFactory.java
index e60eb908369e7814decfbda69ee8436618764bcc..4ea3c9250428a4fb96f62434c21b8abebecb4416 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemTestFactory.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemTestFactory.java
@@ -1,8 +1,10 @@
-package de.itvsh.goofy.attached_item;
+package de.itvsh.goofy.common.attacheditem;
 
 import java.util.Map;
 import java.util.UUID;
 
+import de.itvsh.goofy.common.attacheditem.VorgangAttachedItem;
+
 public class VorgangAttachedItemTestFactory {
 
 	public static final String ID = UUID.randomUUID().toString();
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarServiceTest.java
index ed1fcd6c066689975a11ebd56958b81fc25e4170..ab903893f2acdc5e4566c6606bf40c432388a609 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarServiceTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarServiceTest.java
@@ -18,7 +18,7 @@ import org.mockito.Spy;
 
 import static org.assertj.core.api.Assertions.*;
 
-import de.itvsh.goofy.attached_item.VorgangAttachedItemService;
+import de.itvsh.goofy.common.attacheditem.VorgangAttachedItemService;
 import de.itvsh.goofy.common.command.Command;
 import de.itvsh.goofy.common.command.CommandTestFactory;
 import de.itvsh.goofy.common.user.CurrentUserService;
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageServiceTest.java
index 9e24db30593b9252b90aa6272c0ae03ce54209db..a3621a9d1f74a6170e124c36ad487de1520e733f 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageServiceTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageServiceTest.java
@@ -22,7 +22,7 @@ import org.mockito.Spy;
 
 import static org.assertj.core.api.Assertions.*;
 
-import de.itvsh.goofy.attached_item.VorgangAttachedItemService;
+import de.itvsh.goofy.common.attacheditem.VorgangAttachedItemService;
 import de.itvsh.goofy.common.command.Command;
 import de.itvsh.goofy.common.command.CommandService;
 import de.itvsh.goofy.common.command.CommandTestFactory;