diff --git a/.gitignore b/.gitignore
index 3fc1d884b983db7cd48581b4198239e70ebc5119..174f39620a3a67eaad565eae9eaff3b03614809e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ target/
 .idea
 *.iml
 *.orig
+.vscode/
diff --git a/document-manager-server/src/main/java/de/ozgcloud/document/DocumentEventListener.java b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentEventListener.java
index 316388c1057e9a90a9459d21abf64f01dec871a3..2c746fefb71d95b231ea89de0bdf8b76c06c2ce5 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/document/DocumentEventListener.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentEventListener.java
@@ -33,7 +33,7 @@ import org.springframework.context.event.EventListener;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.stereotype.Component;
 
-import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
+import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandCreatedEvent;
 import de.ozgcloud.command.CommandFailedEvent;
@@ -47,8 +47,8 @@ import lombok.extern.log4j.Log4j2;
 public class DocumentEventListener {
 
 	static final String CREATE_BESCHEID_DOCUMENT_FROM_FILE_ORDER = "CREATE_BESCHEID_DOCUMENT_FROM_FILE";
-	 public static final Predicate<Command> IS_CREATE_BESCHEID_DOCUMENT_FROM_FILE_COMMAND = command ->
-			CREATE_BESCHEID_DOCUMENT_FROM_FILE_ORDER.equals(command.getOrder());
+	public static final Predicate<Command> IS_CREATE_BESCHEID_DOCUMENT_FROM_FILE_COMMAND = command -> CREATE_BESCHEID_DOCUMENT_FROM_FILE_ORDER
+			.equals(command.getOrder());
 	private static final String IS_CREATE_BESCHEID_DOCUMENT_FROM_FILE = "{T(de.ozgcloud.document.DocumentEventListener).IS_CREATE_BESCHEID_DOCUMENT_FROM_FILE_COMMAND.test(event.getSource())}";
 
 	private static final String ERROR_MESSAGE = "Error on executing Create Bescheid Document Command.";
diff --git a/document-manager-server/src/main/java/de/ozgcloud/document/DocumentMapper.java b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentMapper.java
index a0e8848a34a11b3f1f1a12c961b178563d935647..027bacfc4f5961be3cf21bca4f74dd4909abfaec 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/document/DocumentMapper.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentMapper.java
@@ -28,7 +28,7 @@ import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.NullValueCheckStrategy;
 
-import de.ozgcloud.common.attached_item.AttachedItem;
+import de.ozgcloud.document.common.attached_item.AttachedItem;
 
 @Mapper(nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 interface DocumentMapper {
diff --git a/document-manager-server/src/main/java/de/ozgcloud/document/DocumentService.java b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentService.java
index 0a4d0f0660902d0e74d1b93db4a5ac09d877ddda..d558e90b454a4251f8b02db3559c4b0d9391ae11 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/document/DocumentService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentService.java
@@ -38,12 +38,12 @@ import org.springframework.stereotype.Service;
 import de.ozgcloud.apilib.common.command.OzgCloudCommand;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
-import de.ozgcloud.bescheid.Bescheid;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
-import de.ozgcloud.bescheid.BescheidResponse;
+import de.ozgcloud.document.bescheid.Bescheid;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidResponse;
 import de.ozgcloud.command.Command;
-import de.ozgcloud.common.attached_item.AttachedItemService;
-import de.ozgcloud.common.attached_item.AttachedItem;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItem;
 import de.ozgcloud.common.errorhandling.TechnicalException;
 
 @Service
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/Bescheid.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/Bescheid.java
similarity index 95%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/Bescheid.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/Bescheid.java
index 63f65d84733dae7ab98e63095234692c04f09dc7..e6bbed63a6270573fe026936f2269f29a57b310e 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/Bescheid.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/Bescheid.java
@@ -1,10 +1,10 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
 
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
 import de.ozgcloud.common.binaryfile.FileId;
 import lombok.Builder;
 import lombok.Getter;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidCallContextAttachingInterceptor.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidCallContextAttachingInterceptor.java
similarity index 94%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidCallContextAttachingInterceptor.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidCallContextAttachingInterceptor.java
index c3e424ba83e903aee750e69067b037cd5a6e4875..6837a33f67fca31cd204c6b6ed8e4dd7f7f2c734 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidCallContextAttachingInterceptor.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidCallContextAttachingInterceptor.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import static de.ozgcloud.common.grpc.GrpcUtil.*;
 
@@ -7,7 +7,7 @@ import java.util.UUID;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
+import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
 import io.grpc.CallOptions;
 import io.grpc.Channel;
 import io.grpc.ClientCall;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidCreatedEvent.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidCreatedEvent.java
similarity index 89%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidCreatedEvent.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidCreatedEvent.java
index 237f07e8205b684d16980017556901a95034ec2f..5e68e886fb1ce4767faddab962c90a67d57547be 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidCreatedEvent.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidCreatedEvent.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandExecutedEvent;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidDeletedEvent.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidDeletedEvent.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidDeletedEvent.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidDeletedEvent.java
index dd8fc4c9c180a9bd7125415509125ad57ab830a0..2ddbfb07b53b1d7003c6172abb3587b179a168fb 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidDeletedEvent.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidDeletedEvent.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandExecutedEvent;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidEventListener.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidEventListener.java
similarity index 89%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidEventListener.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidEventListener.java
index 3beaadf3f4fd167bba8a29b34c613afe2348604c..13829cac80c313d668d4c384b084354bc84181ee 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidEventListener.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidEventListener.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import static java.util.Objects.*;
 
@@ -39,16 +39,16 @@ import org.springframework.context.event.EventListener;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.stereotype.Component;
 
-import de.ozgcloud.bescheid.Bescheid.SendBy;
-import de.ozgcloud.bescheid.binaryfile.BinaryFileService;
-import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
-import de.ozgcloud.bescheid.common.user.UserProfileService;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.Bescheid.SendBy;
+import de.ozgcloud.document.bescheid.binaryfile.BinaryFileService;
+import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
+import de.ozgcloud.document.bescheid.common.user.UserProfileService;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandCreatedEvent;
 import de.ozgcloud.command.CommandExecutedEvent;
 import de.ozgcloud.command.CommandFailedEvent;
-import de.ozgcloud.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
 import de.ozgcloud.common.errorhandling.TechnicalException;
 import de.ozgcloud.document.BescheidDocumentCreatedEvent;
 import de.ozgcloud.document.Document;
@@ -69,20 +69,20 @@ class BescheidEventListener {
 	public static final String SEND_BESCHEID_ORDER = "SEND_BESCHEID";
 
 	public static final Predicate<Command> IS_CREATE_BESCHEID_COMMAND = command -> CREATE_BESCHEID_ORDER.equals(command.getOrder());
-	private static final String IS_CREATE_BESCHEID = "{T(de.ozgcloud.bescheid.BescheidEventListener).IS_CREATE_BESCHEID_COMMAND.test(event.getSource())}";
+	private static final String IS_CREATE_BESCHEID = "{T(de.ozgcloud.document.bescheid.BescheidEventListener).IS_CREATE_BESCHEID_COMMAND.test(event.getSource())}";
 
 	public static final Predicate<Command> IS_DELETE_BESCHEID_COMMAND = command -> DELETE_BESCHEID_ORDER.equals(command.getOrder());
-	private static final String IS_DELETE_BESCHEID = "{T(de.ozgcloud.bescheid.BescheidEventListener).IS_DELETE_BESCHEID_COMMAND.test(event.getSource())}";
+	private static final String IS_DELETE_BESCHEID = "{T(de.ozgcloud.document.bescheid.BescheidEventListener).IS_DELETE_BESCHEID_COMMAND.test(event.getSource())}";
 
 	public static final Predicate<Command> IS_UPDATE_BESCHEID_COMMAND = command -> UPDATE_BESCHEID_ORDER.equals(command.getOrder());
-	private static final String IS_UPDATE_BESCHEID = "{T(de.ozgcloud.bescheid.BescheidEventListener).IS_UPDATE_BESCHEID_COMMAND.test(event.getSource())}";
+	private static final String IS_UPDATE_BESCHEID = "{T(de.ozgcloud.document.bescheid.BescheidEventListener).IS_UPDATE_BESCHEID_COMMAND.test(event.getSource())}";
 
 	public static final Predicate<Command> IS_CREATE_BESCHEID_DOCUMENT_COMMAND = command -> CREATE_BESCHEID_DOCUMENT_ORDER.equals(command.getOrder());
-	private static final String IS_CREATE_BESCHEID_DOCUMENT = "{T(de.ozgcloud.bescheid.BescheidEventListener).IS_CREATE_BESCHEID_DOCUMENT_COMMAND.test(event.getSource())}";
+	private static final String IS_CREATE_BESCHEID_DOCUMENT = "{T(de.ozgcloud.document.bescheid.BescheidEventListener).IS_CREATE_BESCHEID_DOCUMENT_COMMAND.test(event.getSource())}";
 
 	public static final Predicate<Command> IS_SEND_BESCHEID_COMMAND = command -> nonNull(command) && SEND_BESCHEID_ORDER.equals(command.getOrder());
-	private static final String IS_SEND_BESCHEID = "{T(de.ozgcloud.bescheid.BescheidEventListener).IS_SEND_BESCHEID_COMMAND.test(event.getSource())}";
-	private static final String IS_SEND_BESCHEID_ORDER = "{T(de.ozgcloud.bescheid.BescheidEventListener).IS_SEND_BESCHEID_COMMAND.test(event.getCommand())}";
+	private static final String IS_SEND_BESCHEID = "{T(de.ozgcloud.document.bescheid.BescheidEventListener).IS_SEND_BESCHEID_COMMAND.test(event.getSource())}";
+	private static final String IS_SEND_BESCHEID_ORDER = "{T(de.ozgcloud.document.bescheid.BescheidEventListener).IS_SEND_BESCHEID_COMMAND.test(event.getCommand())}";
 
 	static final String VORGANG_ID_BODY_KEY = "vorgangId";
 	static final String BESCHEID_VOM_BODY_KEY = "bescheidVom";
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidGrpcService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidGrpcService.java
similarity index 91%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidGrpcService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidGrpcService.java
index a4636f96286f70d63b1edc7c45ea6d317744cc2f..f750de1880615b05db5ce20d22326540c258865d 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidGrpcService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidGrpcService.java
@@ -1,10 +1,10 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import de.ozgcloud.bescheid.BescheidServiceGrpc.BescheidServiceImplBase;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.BescheidServiceGrpc.BescheidServiceImplBase;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
 import io.grpc.stub.StreamObserver;
 import lombok.RequiredArgsConstructor;
 import net.devh.boot.grpc.server.service.GrpcService;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidId.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidId.java
similarity index 85%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidId.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidId.java
index 4c0f60434f23ebdc201ed906cdc5eb80f9a363cd..902fb8548844979796f91a9baaa2d80b6ae9c094 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidId.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidId.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import de.ozgcloud.common.datatype.StringBasedValue;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidManagerConfig.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidManagerConfig.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidManagerConfig.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidManagerConfig.java
index 7fbeae993b492c3a8f0d891641640faac9958065..dc5df2d19e975513cdc894ab7a98c6bf1b7b3439 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidManagerConfig.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidManagerConfig.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import lombok.Builder;
 import lombok.Getter;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidManagerConfiguration.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidManagerConfiguration.java
similarity index 93%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidManagerConfiguration.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidManagerConfiguration.java
index 824f5ad0608057bec16dd5ef1d701fe481d9ff71..6c0b29124edb2604ea79fe6f0b843c8e17578f8b 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidManagerConfiguration.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidManagerConfiguration.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
 import de.ozgcloud.apilib.common.command.grpc.GrpcOzgCloudCommandService;
-import de.ozgcloud.bescheid.common.callcontext.BescheidManagerCallContextProvider;
+import de.ozgcloud.document.bescheid.common.callcontext.BescheidManagerCallContextProvider;
 import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidMapper.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidMapper.java
index 28d4be14a789e33ff2b5b301c70341ad80f0b560..ab9ef90ae1d809f602f0a716747a9e79dd1525b4 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidMapper.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
-import static de.ozgcloud.bescheid.Bescheid.*;
+import static de.ozgcloud.document.bescheid.Bescheid.*;
 
 import java.time.LocalDate;
 import java.util.Collection;
@@ -21,10 +21,10 @@ import org.mapstruct.NullValuePropertyMappingStrategy;
 import org.mapstruct.ReportingPolicy;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
 import de.ozgcloud.command.Command;
-import de.ozgcloud.common.attached_item.AttachedItem;
-import de.ozgcloud.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItem;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
 import de.ozgcloud.common.binaryfile.FileId;
 import de.ozgcloud.common.datatype.StringBasedValue;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidRemoteService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidRemoteService.java
similarity index 55%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidRemoteService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidRemoteService.java
index 3110e878975886da00f8989e378afc465415f67c..d071c93ff3720b78a8f4f760f56996172c15b681 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidRemoteService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidRemoteService.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
-import de.ozgcloud.bescheid.vorgang.Vorgang;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang;
 
 public interface BescheidRemoteService {
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidRequest.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidRequest.java
similarity index 61%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidRequest.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidRequest.java
index bd827b7b2f17effbf96c62304087fcf873925227..e3e88ea12469eeac49b4237189f08581c7266974 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidRequest.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidRequest.java
@@ -1,9 +1,9 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import java.time.LocalDate;
 
-import de.ozgcloud.bescheid.common.user.UserProfile;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.common.user.UserProfile;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
 import lombok.Builder;
 import lombok.Getter;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidResponse.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidResponse.java
similarity index 82%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidResponse.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidResponse.java
index 234aec472536d4d2b549abda4606d2368f2bbd74..0368ed72f4f577fa1e15f0def821069eb57b4c82 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidResponse.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidResponse.java
@@ -1,11 +1,11 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import java.io.File;
 import java.util.List;
 import java.util.Optional;
 
-import de.ozgcloud.bescheid.vorgang.Vorgang.ServiceKonto;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang.ServiceKonto;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
 import de.ozgcloud.common.binaryfile.FileId;
 import lombok.Builder;
 import lombok.Getter;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidSentEvent.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidSentEvent.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidSentEvent.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidSentEvent.java
index 8bfb22f6eec2e1cdee3bef6f7414dedfad82bd26..7a75f059a9e04865edd9ee5cee0ac1b6c8cb9fb3 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidSentEvent.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidSentEvent.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandExecutedEvent;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidService.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidService.java
index cd1d2fc2ccb45a29beedfc74b4d90b7ecc8d559f..dab645b8e5410fa2c35cf3e50fe84b9ddc4586b3 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidService.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import static java.util.Objects.*;
 
@@ -26,16 +26,16 @@ import de.ozgcloud.apilib.common.command.OzgCloudCommand;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.apilib.common.command.OzgCloudCreateSubCommandsRequest;
 import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
-import de.ozgcloud.bescheid.administration.AdministrationService;
-import de.ozgcloud.bescheid.attributes.ClientAttributeService;
-import de.ozgcloud.bescheid.common.freemarker.TemplateHandler;
-import de.ozgcloud.bescheid.common.user.UserProfileService;
-import de.ozgcloud.bescheid.vorgang.Vorgang;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
-import de.ozgcloud.bescheid.vorgang.VorgangService;
+import de.ozgcloud.document.bescheid.administration.AdministrationService;
+import de.ozgcloud.document.bescheid.attributes.ClientAttributeService;
+import de.ozgcloud.document.bescheid.common.freemarker.TemplateHandler;
+import de.ozgcloud.document.bescheid.common.user.UserProfileService;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.VorgangService;
 import de.ozgcloud.command.Command;
-import de.ozgcloud.common.attached_item.AttachedItem;
-import de.ozgcloud.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItem;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
 import de.ozgcloud.common.binaryfile.FileId;
 import de.ozgcloud.common.errorhandling.TechnicalException;
 import de.ozgcloud.document.Document;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidUpdatedEvent.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidUpdatedEvent.java
similarity index 84%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidUpdatedEvent.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidUpdatedEvent.java
index a6021663da81fbecf37f177b3d522cefeb7d8afb..5b3095715f5368509307a4fa5686248a47ffb58f 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidUpdatedEvent.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidUpdatedEvent.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandExecutedEvent;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/SentInfo.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/SentInfo.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/SentInfo.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/SentInfo.java
index a3e1fb0389b3612d212fa0678aedfd11ecf950e4..67a38febf39a9ad1a9036cda11e1ce33814814e7 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/SentInfo.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/SentInfo.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import java.time.ZonedDateTime;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/SentInfoMapper.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/SentInfoMapper.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/SentInfoMapper.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/SentInfoMapper.java
index 95c5b586e88adc7881815f3331ad7213f5bcb530..de5a3d0f00e565f82b79d41385ec02c66a17a5e3 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/SentInfoMapper.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/SentInfoMapper.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/UserId.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/UserId.java
similarity index 90%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/UserId.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/UserId.java
index d92b4024521b151c049a71edc1f22f3bafa55de0..2487f7292668b7af3e1b62eaa1fd3d62669160b4 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/UserId.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/UserId.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import java.util.Objects;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationProperties.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationProperties.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationProperties.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationProperties.java
index 59f93a0239f649eb4156fb5512494e06749066d9..58573d83fbd0f29919e237a9c967840ef1fb652d 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationProperties.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationProperties.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.administration;
+package de.ozgcloud.document.bescheid.administration;
 
 import java.util.Optional;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationService.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationService.java
index 920c5ea67d8285d1646b7840bf6c5fd91fb8c1ab..fcf5c76065f89d8ee543bcab99d8ed76003f2a58 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationService.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.administration;
+package de.ozgcloud.document.bescheid.administration;
 
 import java.util.Optional;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationSyncScheduler.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationSyncScheduler.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationSyncScheduler.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationSyncScheduler.java
index 41fde870cc01fe94e9d2089742e77ffffd6a3f4a..57c036728e7f3d7d3463f056337104cab6946e14 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationSyncScheduler.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationSyncScheduler.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.administration;
+package de.ozgcloud.document.bescheid.administration;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/attributes/ClientAttributeRemoteService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeRemoteService.java
similarity index 95%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/attributes/ClientAttributeRemoteService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeRemoteService.java
index d87ae7496591bc23df9ba65148ca8c5f2ba24559..311480536d4d7a4b8771bfa37782e39d133f01b3 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/attributes/ClientAttributeRemoteService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeRemoteService.java
@@ -21,12 +21,12 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.attributes;
+package de.ozgcloud.document.bescheid.attributes;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
 import de.ozgcloud.vorgang.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
 import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcAccessPermission;
 import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/attributes/ClientAttributeService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeService.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/attributes/ClientAttributeService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeService.java
index 158597163c2ee60cfc4640a47e4704b453bda5b6..5f6ffecd4356c211e085657f9bbf13ed431898da 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/attributes/ClientAttributeService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeService.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.attributes;
+package de.ozgcloud.document.bescheid.attributes;
 
 import org.springframework.stereotype.Service;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileRemoteService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/binaryfile/BinaryFileRemoteService.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileRemoteService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/binaryfile/BinaryFileRemoteService.java
index 08cac0cfb0bb41e32c4c71b4ad88556326607c4f..8af3827ee299c2a2cde22363e8df93311dcaf63e 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileRemoteService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/binaryfile/BinaryFileRemoteService.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.binaryfile;
+package de.ozgcloud.document.bescheid.binaryfile;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
 
 import com.google.protobuf.ByteString;
 
-import de.ozgcloud.bescheid.BescheidResponse;
+import de.ozgcloud.document.bescheid.BescheidResponse;
 import de.ozgcloud.common.binaryfile.FileId;
 import de.ozgcloud.common.binaryfile.GrpcFileUploadUtils;
 import de.ozgcloud.common.binaryfile.GrpcFileUploadUtils.FileSender;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/binaryfile/BinaryFileService.java
similarity index 80%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/binaryfile/BinaryFileService.java
index 11ddd6e95554acaf4a7839057a92489f373fa1c2..db5c540da14b5cca906eb8136d3c0f867f34449e 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/binaryfile/BinaryFileService.java
@@ -1,9 +1,9 @@
-package de.ozgcloud.bescheid.binaryfile;
+package de.ozgcloud.document.bescheid.binaryfile;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.ozgcloud.bescheid.BescheidResponse;
+import de.ozgcloud.document.bescheid.BescheidResponse;
 import lombok.NonNull;
 
 @Service
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/BescheidManagerCallContextProvider.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/BescheidManagerCallContextProvider.java
similarity index 93%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/BescheidManagerCallContextProvider.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/BescheidManagerCallContextProvider.java
index 40cbdaffe962730c81d9c95239babda672aac989..95d316ed29d63470ac34762608fb4c7b6d70d72c 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/BescheidManagerCallContextProvider.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/BescheidManagerCallContextProvider.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.common.callcontext;
+package de.ozgcloud.document.bescheid.common.callcontext;
 
 import java.util.Optional;
 
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Component;
 import de.ozgcloud.apilib.common.callcontext.CallContext;
 import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
 import de.ozgcloud.apilib.user.OzgCloudUserId;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
 import lombok.RequiredArgsConstructor;
 
 @Component
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CallContextAuthenticationToken.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CallContextAuthenticationToken.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CallContextAuthenticationToken.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CallContextAuthenticationToken.java
index 77ec99f9581295e299a16064de28351cfc3ffaf4..43b3c13142b7d13c3ea2f410d4732df1a1a22637 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CallContextAuthenticationToken.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CallContextAuthenticationToken.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.common.callcontext;
+package de.ozgcloud.document.bescheid.common.callcontext;
 
 import java.util.Collection;
 import java.util.stream.Collectors;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CallContextUser.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CallContextUser.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CallContextUser.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CallContextUser.java
index 667bb03d8dacb64af48b7d542c893cdca0d594c2..f124e7a1f8d687cde09fca5f3890ac2c47d8615d 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CallContextUser.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CallContextUser.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.common.callcontext;
+package de.ozgcloud.document.bescheid.common.callcontext;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CurrentUserService.java
similarity index 98%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CurrentUserService.java
index b77b10a648b85eb1da8a39dfc30ecd6a00f18cd9..fe7f499a99ddf78e04ba27a381ff4da9451ac6a9 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CurrentUserService.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.common.callcontext;
+package de.ozgcloud.document.bescheid.common.callcontext;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/freemarker/TemplateHandler.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/freemarker/TemplateHandler.java
similarity index 95%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/freemarker/TemplateHandler.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/freemarker/TemplateHandler.java
index 8355a9ffca2cf8b9ad91449133240e11745131c5..cdf302d6094a36ae42ce851011db4379720dde8e 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/freemarker/TemplateHandler.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/freemarker/TemplateHandler.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.common.freemarker;
+package de.ozgcloud.document.bescheid.common.freemarker;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfile.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfile.java
similarity index 92%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfile.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfile.java
index 889dbbad42e09d5195cc3daa107994e9af542b5f..9618ea6d45c940400dc21fd2ef79ae6f2de5826d 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfile.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfile.java
@@ -21,9 +21,9 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.common.user;
+package de.ozgcloud.document.bescheid.common.user;
 
-import de.ozgcloud.bescheid.UserId;
+import de.ozgcloud.document.bescheid.UserId;
 import lombok.Builder;
 import lombok.Getter;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileMapper.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileMapper.java
similarity index 93%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileMapper.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileMapper.java
index 0c7c5ceda1c008597995a38a5306b704226085b6..7591a79552a9c9aaffc02ef1a7b75ecf0e34c000 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileMapper.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileMapper.java
@@ -21,13 +21,13 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.common.user;
+package de.ozgcloud.document.bescheid.common.user;
 
 import org.mapstruct.Mapper;
 
 import de.ozgcloud.apilib.user.OzgCloudUserId;
 import de.ozgcloud.apilib.user.OzgCloudUserProfile;
-import de.ozgcloud.bescheid.UserId;
+import de.ozgcloud.document.bescheid.UserId;
 
 @Mapper
 public interface UserProfileMapper {
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileService.java
similarity index 93%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileService.java
index 5346ead50451064408dd1db5146536520b566b99..1e359c48249b333213d538ef5cc8d46dc6a5d7dd 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileService.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.common.user;
+package de.ozgcloud.document.bescheid.common.user;
 
 import java.util.Optional;
 
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
 
 import de.ozgcloud.apilib.user.OzgCloudUserId;
 import de.ozgcloud.apilib.user.OzgCloudUserProfileService;
-import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
+import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
 import de.ozgcloud.common.errorhandling.TechnicalException;
 import lombok.RequiredArgsConstructor;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileTestFactory.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileTestFactory.java
similarity index 94%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileTestFactory.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileTestFactory.java
index 60949bbe87cf4d3b6c2a366dcc529d4be45c99bf..b5f900ef6de937ef8e3c2b95a32b1384be892a68 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileTestFactory.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileTestFactory.java
@@ -21,13 +21,13 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.common.user;
+package de.ozgcloud.document.bescheid.common.user;
 
 import java.util.UUID;
 
 import com.thedeanda.lorem.LoremIpsum;
 
-import de.ozgcloud.bescheid.UserId;
+import de.ozgcloud.document.bescheid.UserId;
 
 public class UserProfileTestFactory {
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/dummy/DummyBescheidRemoteService.java
similarity index 80%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/dummy/DummyBescheidRemoteService.java
index ef9589219948ef6c2db265e1d6653b1f06403ba3..8b4b7af00ef84439029494d3a566eeb454d64646 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/dummy/DummyBescheidRemoteService.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.dummy;
+package de.ozgcloud.document.bescheid.dummy;
 
 import java.util.Optional;
 
@@ -7,10 +7,10 @@ import org.springframework.stereotype.Service;
 
 import com.google.common.net.MediaType;
 
-import de.ozgcloud.bescheid.BescheidResponse;
-import de.ozgcloud.bescheid.BescheidRemoteService;
-import de.ozgcloud.bescheid.BescheidRequest;
-import de.ozgcloud.bescheid.vorgang.Vorgang;
+import de.ozgcloud.document.bescheid.BescheidResponse;
+import de.ozgcloud.document.bescheid.BescheidRemoteService;
+import de.ozgcloud.document.bescheid.BescheidRequest;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang;
 import de.ozgcloud.common.binaryfile.TempFileUtils;
 
 @Service
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
similarity index 89%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
index b93412e26623f5b7f04b7f96a1e38a51b56018d2..fa59373d7e97b8284e09e45ce8ba1fa16febfa65 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.smartdocuments;
+package de.ozgcloud.document.bescheid.smartdocuments;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,17 +27,17 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
-import de.ozgcloud.bescheid.BescheidResponse;
-import de.ozgcloud.bescheid.BescheidRemoteService;
-import de.ozgcloud.bescheid.BescheidRequest;
-import de.ozgcloud.bescheid.common.user.UserProfile;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentDocument;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentFile;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData.BescheidData;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData.UserData;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsRequest.SmartDocument.Selection;
-import de.ozgcloud.bescheid.vorgang.Vorgang;
+import de.ozgcloud.document.bescheid.BescheidResponse;
+import de.ozgcloud.document.bescheid.BescheidRemoteService;
+import de.ozgcloud.document.bescheid.BescheidRequest;
+import de.ozgcloud.document.bescheid.common.user.UserProfile;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentDocument;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentFile;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData.BescheidData;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData.UserData;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsRequest.SmartDocument.Selection;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang;
 import de.ozgcloud.common.binaryfile.FileDataDeserializer;
 import de.ozgcloud.common.errorhandling.TechnicalException;
 import lombok.AllArgsConstructor;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsConfiguration.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsConfiguration.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsConfiguration.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsConfiguration.java
index 579a53d016fe65a7a0c9110173ead505b2793476..cc0967ad8760b949a30a7c616430dc9ca9beb85a 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsConfiguration.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsConfiguration.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.smartdocuments;
+package de.ozgcloud.document.bescheid.smartdocuments;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsProperties.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsProperties.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsProperties.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsProperties.java
index c45e9383c581e237dbf565d6daab0a5b9c217dc7..256b1f11caa21c02ebffd384c38f8d0bbbf477f1 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsProperties.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsProperties.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.smartdocuments;
+package de.ozgcloud.document.bescheid.smartdocuments;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsRequest.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsRequest.java
similarity index 93%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsRequest.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsRequest.java
index d842134f98b72ab6a3961ecef0f6aad924d90637..eb3ec30233db0350628b0a272158e02acf8d3efa 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsRequest.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsRequest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.smartdocuments;
+package de.ozgcloud.document.bescheid.smartdocuments;
 
 import java.time.LocalDate;
 
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 
-import de.ozgcloud.bescheid.vorgang.Vorgang;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.ToString;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/BescheidVorgangMapper.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapper.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/BescheidVorgangMapper.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapper.java
index a5445250df8668b4c23a5c8db18295914e78a9ae..474dfa78912344cbe2141e9103d4b83ffda15707 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/BescheidVorgangMapper.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapper.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntry.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntry.java
similarity index 95%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntry.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntry.java
index e0e2988ba7883c82f423e767b6df2b0d8cd34b87..2c39527a6266daa7f34d793bf1774e37cc72c258 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntry.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntry.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
 import java.util.List;
 
@@ -13,6 +13,7 @@ import lombok.Singular;
 public interface FormDataEntry {
 
 	String getName();
+
 	@JsonIgnore
 	String getLabel();
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntryMapper.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntryMapper.java
similarity index 83%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntryMapper.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntryMapper.java
index 6cd404f3247936a7b6c6ff83e07c00c85c914b20..616d515f21edac273187fcee906e456c924f67b9 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntryMapper.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntryMapper.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
 import java.util.List;
 import java.util.stream.Stream;
@@ -8,8 +8,8 @@ import org.mapstruct.Mapping;
 import org.mapstruct.Named;
 import org.mapstruct.ReportingPolicy;
 
-import de.ozgcloud.bescheid.vorgang.FormDataEntry.FormField;
-import de.ozgcloud.bescheid.vorgang.FormDataEntry.SubForm;
+import de.ozgcloud.document.bescheid.vorgang.FormDataEntry.FormField;
+import de.ozgcloud.document.bescheid.vorgang.FormDataEntry.SubForm;
 import de.ozgcloud.vorgang.vorgang.GrpcFormField;
 import de.ozgcloud.vorgang.vorgang.GrpcSubForm;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializer.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntrySerializer.java
similarity index 92%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializer.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntrySerializer.java
index 0a3b48dbe0074d56570a050af1f196edf4da2222..9ba98dac8d256b3f71159189160d3dad826d1455 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializer.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntrySerializer.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
 import java.io.IOException;
 import java.util.List;
@@ -10,8 +10,8 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
-import de.ozgcloud.bescheid.vorgang.FormDataEntry.FormField;
-import de.ozgcloud.bescheid.vorgang.FormDataEntry.SubForm;
+import de.ozgcloud.document.bescheid.vorgang.FormDataEntry.FormField;
+import de.ozgcloud.document.bescheid.vorgang.FormDataEntry.SubForm;
 import de.ozgcloud.common.errorhandling.TechnicalException;
 
 public class FormDataEntrySerializer extends StdSerializer<FormDataEntry> {
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/Vorgang.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/Vorgang.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/Vorgang.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/Vorgang.java
index ba0e51d7681c81f51a00cad46317330410b98d1e..faf84a017ee4feb1e04afd42f5f1f7f35a929ec3 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/Vorgang.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/Vorgang.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
 import java.util.List;
 import java.util.Map;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangId.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangId.java
similarity index 84%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangId.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangId.java
index 2cb8785e563dbbff842baa5996e971d905be1bc7..534373753ccd04ccc7cead214a32f32cee978c39 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangId.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangId.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
 import de.ozgcloud.common.datatype.StringBasedValue;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangRemoteService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangRemoteService.java
similarity index 95%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangRemoteService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangRemoteService.java
index c3a1aa72e30e3147d913117c6f5f4d77e8ee6a12..fdf8940f08e2ba8c84e4fc01a32cb694098fb2f0 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangRemoteService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangRemoteService.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangService.java
similarity index 88%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangService.java
index 98689c96ea25c66ffcfbe9cab54556b148b7fc65..a5d8c451351889a0a3cc7ffd76f491b9a53fff77 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangService.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
 import org.springframework.stereotype.Service;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItem.java b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItem.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItem.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItem.java
index f47223bc22488d80380ad986dd37ebf79e4c27db..ad89aba9fd5ebe14bcaf15cb650cec49b5465281 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItem.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItem.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
 
 import java.util.Map;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItemMapper.java b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemMapper.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItemMapper.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemMapper.java
index c3431d175ebf43e14f6a7fd15baf34cb7b81a5f6..575c2d651cf3c17ff8fbfc2082f33a9bf97b267c 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItemMapper.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemMapper.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
 
 import java.util.Map;
 
diff --git a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItemService.java b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemService.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItemService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemService.java
index d0ad2ed4e32a2eb9fe424440629f23e0e50e9331..8881932dd1cb1f1b8ce9c0b7355eb2d1a6f10aed 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItemService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemService.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -37,12 +37,12 @@ import org.springframework.stereotype.Service;
 import de.ozgcloud.apilib.common.command.OzgCloudCommand;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
-import de.ozgcloud.bescheid.Bescheid;
-import de.ozgcloud.bescheid.Bescheid.Status;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
-import de.ozgcloud.bescheid.BescheidManagerConfiguration;
-import de.ozgcloud.bescheid.BescheidMapper;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.Bescheid;
+import de.ozgcloud.document.bescheid.Bescheid.Status;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidManagerConfiguration;
+import de.ozgcloud.document.bescheid.BescheidMapper;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
 import de.ozgcloud.command.Command;
 import de.ozgcloud.common.errorhandling.TechnicalException;
 import de.ozgcloud.document.Document;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/VorgangAttachedItemRemoteService.java b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/VorgangAttachedItemRemoteService.java
similarity index 93%
rename from document-manager-server/src/main/java/de/ozgcloud/common/attached_item/VorgangAttachedItemRemoteService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/VorgangAttachedItemRemoteService.java
index 1d8756a0c968d0463e6f94391afb91fad9143c04..20a6ab4f684d4f060f4f5cb26a76e23ff37ff649 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/VorgangAttachedItemRemoteService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/VorgangAttachedItemRemoteService.java
@@ -21,9 +21,9 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
 
-import static de.ozgcloud.common.attached_item.AttachedItemService.*;
+import static de.ozgcloud.document.common.attached_item.AttachedItemService.*;
 
 import java.time.LocalDate;
 import java.util.Comparator;
@@ -35,9 +35,9 @@ import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.ozgcloud.bescheid.Bescheid;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.Bescheid;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
 import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
 import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
 import de.ozgcloud.vorgang.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/document/DocumentEventListenerTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/DocumentEventListenerTest.java
index b95890c8ea0e39afabade13339e3790d947137f1..d777d735efa678a3c23d1918e166eb9d1d307eaf 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/document/DocumentEventListenerTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/DocumentEventListenerTest.java
@@ -38,7 +38,7 @@ import org.mockito.Spy;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.core.context.SecurityContext;
 
-import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
+import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandCreatedEventTestFactory;
 import de.ozgcloud.command.CommandFailedEvent;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/document/DocumentMapperTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/DocumentMapperTest.java
index 50405df503f49f1a8ef42d20921d9cb0dbc62e99..172a59d88446330ff4e62b3108690fb7a095d0de 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/document/DocumentMapperTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/DocumentMapperTest.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mapstruct.factory.Mappers;
 
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
 
 class DocumentMapperTest {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/document/DocumentServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/DocumentServiceTest.java
index 9a059e860e5fd527fdc18b6e236f5363ce7311e4..eedc1645b67a228c4c4dfc17cbf3de086162ac17 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/document/DocumentServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/DocumentServiceTest.java
@@ -45,16 +45,16 @@ import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
 import de.ozgcloud.apilib.common.datatypes.GenericId;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
-import de.ozgcloud.bescheid.Bescheid;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
-import de.ozgcloud.bescheid.BescheidTestFactory;
-import de.ozgcloud.bescheid.BescheidResponse;
-import de.ozgcloud.bescheid.BescheidResponseTestFactory;
+import de.ozgcloud.document.bescheid.Bescheid;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidTestFactory;
+import de.ozgcloud.document.bescheid.BescheidResponse;
+import de.ozgcloud.document.bescheid.BescheidResponseTestFactory;
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItem;
-import de.ozgcloud.common.attached_item.AttachedItemService;
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItem;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
 import de.ozgcloud.common.binaryfile.FileId;
 import de.ozgcloud.common.errorhandling.TechnicalException;
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidEventListenerITCase.java
similarity index 92%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidEventListenerITCase.java
index 66403e2e7b83b2ac4ce30cb2b532cbdca881da64..cf444b519bbaabb4cbb2fcdf0bc49d4daf96975b 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidEventListenerITCase.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
@@ -14,14 +14,14 @@ import org.springframework.context.ApplicationEventPublisher;
 
 import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
-import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
-import de.ozgcloud.bescheid.common.user.UserProfile;
-import de.ozgcloud.bescheid.common.user.UserProfileService;
+import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
+import de.ozgcloud.document.bescheid.common.user.UserProfile;
+import de.ozgcloud.document.bescheid.common.user.UserProfileService;
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandCreatedEventTestFactory;
 import de.ozgcloud.command.CommandExecutedEvent;
 import de.ozgcloud.command.CommandTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
 import de.ozgcloud.common.test.ITCase;
 
 @ITCase
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidEventListenerTest.java
similarity index 95%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidEventListenerTest.java
index a3734e17d99a07d77410d213ebbe30415424cb1f..1cb76248df26d921c2530e5138f138b4967349c1 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidEventListenerTest.java
@@ -1,7 +1,7 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
-import static de.ozgcloud.bescheid.BescheidEventListener.*;
-import static de.ozgcloud.bescheid.BescheidRequestTestFactory.*;
+import static de.ozgcloud.document.bescheid.BescheidEventListener.*;
+import static de.ozgcloud.document.bescheid.BescheidRequestTestFactory.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
@@ -24,21 +24,21 @@ import org.mockito.Spy;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.core.context.SecurityContext;
 
-import de.ozgcloud.bescheid.Bescheid.SendBy;
-import de.ozgcloud.bescheid.binaryfile.BinaryFileService;
-import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
-import de.ozgcloud.bescheid.common.freemarker.TemplateHandler;
-import de.ozgcloud.bescheid.common.user.UserProfile;
-import de.ozgcloud.bescheid.common.user.UserProfileService;
-import de.ozgcloud.bescheid.common.user.UserProfileTestFactory;
+import de.ozgcloud.document.bescheid.Bescheid.SendBy;
+import de.ozgcloud.document.bescheid.binaryfile.BinaryFileService;
+import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
+import de.ozgcloud.document.bescheid.common.freemarker.TemplateHandler;
+import de.ozgcloud.document.bescheid.common.user.UserProfile;
+import de.ozgcloud.document.bescheid.common.user.UserProfileService;
+import de.ozgcloud.document.bescheid.common.user.UserProfileTestFactory;
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandCreatedEventTestFactory;
 import de.ozgcloud.command.CommandExecutedEvent;
 import de.ozgcloud.command.CommandFailedEvent;
 import de.ozgcloud.command.CommandTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItem;
-import de.ozgcloud.common.attached_item.AttachedItemService;
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItem;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
 import de.ozgcloud.common.errorhandling.TechnicalException;
 import de.ozgcloud.document.BescheidDocumentCreatedEvent;
 import de.ozgcloud.document.Document;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidGrpcServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidGrpcServiceTest.java
similarity index 94%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidGrpcServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidGrpcServiceTest.java
index 04871bb15ac3d213da2197b73610bd3660bd410e..f3864deb4295ad5c256e2b3709492ea12a8b644c 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidGrpcServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidGrpcServiceTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -17,11 +17,11 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.ozgcloud.bescheid.vorgang.VorgangId;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItemMapper;
-import de.ozgcloud.common.attached_item.AttachedItemService;
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItemMapper;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
 import io.grpc.stub.StreamObserver;
 
 class BescheidGrpcServiceTest {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidManagerConfigTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidManagerConfigTestFactory.java
similarity index 87%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidManagerConfigTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidManagerConfigTestFactory.java
index cdd3c20e856282db187f1f101422e449e2ecd354..450f96ff3fdaeb71884f904e2474bd55dbeca240 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidManagerConfigTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidManagerConfigTestFactory.java
@@ -21,10 +21,10 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
-import de.ozgcloud.bescheid.BescheidManagerConfig.BescheidManagerConfigBuilder;
-import de.ozgcloud.bescheid.BescheidManagerConfig.Features;
+import de.ozgcloud.document.bescheid.BescheidManagerConfig.BescheidManagerConfigBuilder;
+import de.ozgcloud.document.bescheid.BescheidManagerConfig.Features;
 
 public class BescheidManagerConfigTestFactory {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidMapperTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidMapperTest.java
similarity index 96%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidMapperTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidMapperTest.java
index 4e867c490dcc6bdcecd99e3b26cbc221caf686be..ffe6f40fd2aa692c850361eb9cea27df4add992a 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidMapperTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidMapperTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -17,10 +17,10 @@ import org.mapstruct.factory.Mappers;
 import org.mockito.InjectMocks;
 import org.mockito.Spy;
 
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
 import de.ozgcloud.command.CommandTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItemService;
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
 import de.ozgcloud.document.DocumentTestFactory;
 
 class BescheidMapperTest {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidRequestTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidRequestTestFactory.java
similarity index 73%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidRequestTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidRequestTestFactory.java
index dbe4f9e43deb4fbcd43ea0b8b960bc3861570174..7629414ab73283100581cd0fd242082b80735834 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidRequestTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidRequestTestFactory.java
@@ -1,10 +1,10 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import java.time.LocalDate;
 
-import de.ozgcloud.bescheid.common.user.UserProfileTestFactory;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.common.user.UserProfileTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
 
 public class BescheidRequestTestFactory {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidResponseTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidResponseTestFactory.java
similarity index 84%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidResponseTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidResponseTestFactory.java
index 94581c9fe21016dfb70cdb0b7f5279b42f877b94..dadfe259357bf5bf3604af0f40c8e1d0094cc10a 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidResponseTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidResponseTestFactory.java
@@ -1,13 +1,13 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import java.io.File;
 import java.util.Optional;
 
 import org.springframework.http.MediaType;
 
-import de.ozgcloud.bescheid.common.user.UserProfileTestFactory;
-import de.ozgcloud.bescheid.vorgang.ServiceKontoTestFactory;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.common.user.UserProfileTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.ServiceKontoTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
 import de.ozgcloud.common.binaryfile.FileId;
 import de.ozgcloud.common.binaryfile.TempFileUtils;
 import de.ozgcloud.document.DocumentTestFactory;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidServiceTest.java
similarity index 97%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidServiceTest.java
index e593e429c550d90454013369ab01640091b5afef..0db2fa077317417ee42fcea27eb840e0ebe01ecb 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidServiceTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.junit.jupiter.api.Assertions.*;
@@ -39,24 +39,24 @@ import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
 import de.ozgcloud.apilib.common.datatypes.GenericId;
 import de.ozgcloud.apilib.user.OzgCloudUserId;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
-import de.ozgcloud.bescheid.Bescheid.SendBy;
-import de.ozgcloud.bescheid.administration.AdministrationService;
-import de.ozgcloud.bescheid.attributes.ClientAttributeService;
-import de.ozgcloud.bescheid.common.freemarker.TemplateHandler;
-import de.ozgcloud.bescheid.common.user.UserProfile;
-import de.ozgcloud.bescheid.common.user.UserProfileService;
-import de.ozgcloud.bescheid.common.user.UserProfileTestFactory;
-import de.ozgcloud.bescheid.vorgang.PostfachAddressTestFactory;
-import de.ozgcloud.bescheid.vorgang.ServiceKontoTestFactory;
-import de.ozgcloud.bescheid.vorgang.Vorgang;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
-import de.ozgcloud.bescheid.vorgang.VorgangService;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.Bescheid.SendBy;
+import de.ozgcloud.document.bescheid.administration.AdministrationService;
+import de.ozgcloud.document.bescheid.attributes.ClientAttributeService;
+import de.ozgcloud.document.bescheid.common.freemarker.TemplateHandler;
+import de.ozgcloud.document.bescheid.common.user.UserProfile;
+import de.ozgcloud.document.bescheid.common.user.UserProfileService;
+import de.ozgcloud.document.bescheid.common.user.UserProfileTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.PostfachAddressTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.ServiceKontoTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.VorgangService;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItem;
-import de.ozgcloud.common.attached_item.AttachedItemService;
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItem;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
 import de.ozgcloud.common.binaryfile.FileId;
 import de.ozgcloud.common.datatype.StringBasedValue;
 import de.ozgcloud.common.errorhandling.TechnicalException;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidTestApplication.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidTestApplication.java
similarity index 95%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidTestApplication.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidTestApplication.java
index b04cada3828d9fae6a85c5217c97df420972f353..fbb34ab96b4d1fb9faaff00a62729915bef46120 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidTestApplication.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidTestApplication.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.info.BuildProperties;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidTestFactory.java
similarity index 82%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidTestFactory.java
index 7b90a2215cbddb56900ea293d7bbfd5cb9f44363..30883d98e35696e54d1ae69815cc55dc37980a28 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -7,11 +7,11 @@ import java.util.UUID;
 
 import com.thedeanda.lorem.LoremIpsum;
 
-import de.ozgcloud.bescheid.Bescheid.SendBy;
-import de.ozgcloud.bescheid.Bescheid.Status;
-import de.ozgcloud.bescheid.common.user.UserProfileTestFactory;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.bescheid.Bescheid.SendBy;
+import de.ozgcloud.document.bescheid.Bescheid.Status;
+import de.ozgcloud.document.bescheid.common.user.UserProfileTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
 import de.ozgcloud.common.binaryfile.FileId;
 import de.ozgcloud.document.DocumentTestFactory;
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidManagerConfigResponseTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidManagerConfigResponseTestFactory.java
similarity index 97%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidManagerConfigResponseTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidManagerConfigResponseTestFactory.java
index 2657fdf48c5a7727715ec7c26bf3fb94b232b95f..7317259b8cde862947a6e437a5ded55268a2d28c 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidManagerConfigResponseTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidManagerConfigResponseTestFactory.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 public class GrpcBescheidManagerConfigResponseTestFactory {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidTestFactory.java
similarity index 88%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidTestFactory.java
index e3781092bf7bf1ea93256e5297715f0a89d6b07a..095f105213883ec7421a97803860ab7fca44d4eb 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 class GrpcBescheidTestFactory {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidWithoutDocumentTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidWithoutDocumentTestFactory.java
similarity index 89%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidWithoutDocumentTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidWithoutDocumentTestFactory.java
index 532945af74f9f78d30741021b1362b51b6c4ce73..509c59cb103cfcfa7c17f94caf6912cbeb527163 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidWithoutDocumentTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidWithoutDocumentTestFactory.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
 import de.ozgcloud.common.binaryfile.FileId;
 import de.ozgcloud.document.DocumentTestFactory;
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetAllBescheidRequestTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetAllBescheidRequestTestFactory.java
similarity index 74%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetAllBescheidRequestTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetAllBescheidRequestTestFactory.java
index af6362a99396ebfb72a8eac0ba14121e387f1a9c..9ff28dca8c3a713f171b8a55a9d5d8899ac055c1 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetAllBescheidRequestTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetAllBescheidRequestTestFactory.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
 
 public class GrpcGetAllBescheidRequestTestFactory {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidDraftRequestTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidDraftRequestTestFactory.java
similarity index 75%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidDraftRequestTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidDraftRequestTestFactory.java
index 290201a2f409bdd8462e4b6dbdd3a1f5768a1add..66155aa91a43ee3f2f00eeaa9d3c5664cbc83263 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidDraftRequestTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidDraftRequestTestFactory.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
 
 public class GrpcGetBescheidDraftRequestTestFactory {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidDraftResponseTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidDraftResponseTestFactory.java
similarity index 89%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidDraftResponseTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidDraftResponseTestFactory.java
index 2e3d5d8ca5a1d1bbf74211ebd20de9b674ee7f6f..fe532ec97463669b3db7c21f29962ba12363b910 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidDraftResponseTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidDraftResponseTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 public class GrpcGetBescheidDraftResponseTestFactory {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidRequestTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidRequestTestFactory.java
similarity index 72%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidRequestTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidRequestTestFactory.java
index 43f93b3eddbfc345130af34f26e6b9d6c85cfc0c..681c033752fe868e4c0e16ae0ed0dd76427a6fdd 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidRequestTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidRequestTestFactory.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
 
 public class GrpcGetBescheidRequestTestFactory {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidResponseTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidResponseTestFactory.java
similarity index 89%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidResponseTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidResponseTestFactory.java
index 3b87d8e4924566bd6028982f1760b86d5362468b..807b7603c85ce3e9f2fc2cf1e3ff0355cea4528d 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidResponseTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidResponseTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 public class GrpcGetBescheidResponseTestFactory {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcSentInfoTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcSentInfoTestFactory.java
similarity index 88%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcSentInfoTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcSentInfoTestFactory.java
index 86fd1c8373f7d09940ade469b09ba9bdfebb437c..fe1c071c9377c863b7c18d25056b2c51fddb8d42 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcSentInfoTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcSentInfoTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 public class GrpcSentInfoTestFactory {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/SentInfoMapperTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/SentInfoMapperTest.java
similarity index 96%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/SentInfoMapperTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/SentInfoMapperTest.java
index c3f9eea19a4f802f8214371b024f5bc3b7e08453..12dc2212d136720dcbb87647b03dcb5fe58a3c2b 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/SentInfoMapperTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/SentInfoMapperTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import static org.assertj.core.api.Assertions.*;
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/SentInfoTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/SentInfoTestFactory.java
similarity index 94%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/SentInfoTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/SentInfoTestFactory.java
index 8361e82f8c1459da781d70b4603f5e673ec77c81..52954077ca300f0dbb0fc6cdc1e7caa1b617b431 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/SentInfoTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/SentInfoTestFactory.java
@@ -21,12 +21,12 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
 
 import java.time.ZonedDateTime;
 import java.util.Map;
 
-import de.ozgcloud.bescheid.SentInfo.SentInfoBuilder;
+import de.ozgcloud.document.bescheid.SentInfo.SentInfoBuilder;
 
 public class SentInfoTestFactory {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/administration/AdministrationServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/administration/AdministrationServiceTest.java
similarity index 97%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/administration/AdministrationServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/administration/AdministrationServiceTest.java
index 13e64879f85860b95b1e2a71154e56dced290343..3ab9e79bfa9c95713c34bffe8a295d3a576276fa 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/administration/AdministrationServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/administration/AdministrationServiceTest.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.administration;
+package de.ozgcloud.document.bescheid.administration;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/attributes/ClientAttributeRemoteServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeRemoteServiceTest.java
similarity index 97%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/attributes/ClientAttributeRemoteServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeRemoteServiceTest.java
index cfa18131b58c3ccc123ba07d4848625fcbddfdfb..2498c37b7979c0345596ef91794f1bfb9fcc157c 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/attributes/ClientAttributeRemoteServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeRemoteServiceTest.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.attributes;
+package de.ozgcloud.document.bescheid.attributes;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
@@ -35,7 +35,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
 import de.ozgcloud.vorgang.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
 import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcAccessPermission;
 import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/attributes/ClientAttributeServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeServiceTest.java
similarity index 96%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/attributes/ClientAttributeServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeServiceTest.java
index 03d31e54d9df4e505ac172fff010acf8f94f996a..34a293da65a5c4717c69a81d007d69527178c69f 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/attributes/ClientAttributeServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeServiceTest.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.attributes;
+package de.ozgcloud.document.bescheid.attributes;
 
 import static org.mockito.Mockito.*;
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/common/callcontext/BescheidManagerCallContextProviderTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/callcontext/BescheidManagerCallContextProviderTest.java
similarity index 94%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/common/callcontext/BescheidManagerCallContextProviderTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/callcontext/BescheidManagerCallContextProviderTest.java
index ec9d3dee4685bb202d88fe617c8235ad2270b717..1af869eaf621b26bd864e96b951d1f73d6355d31 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/common/callcontext/BescheidManagerCallContextProviderTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/callcontext/BescheidManagerCallContextProviderTest.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.common.callcontext;
+package de.ozgcloud.document.bescheid.common.callcontext;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
@@ -36,7 +36,7 @@ import org.mockito.Mock;
 import org.mockito.Spy;
 
 import de.ozgcloud.apilib.user.OzgCloudUserId;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
 
 class BescheidManagerCallContextProviderTest {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/callcontext/CurrentUserServiceTest.java
similarity index 92%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/callcontext/CurrentUserServiceTest.java
index 656b191e256f1aef75cd7def1971953b260327aa..2349cfeedadbfdbf97bd0671be2894320bf4f488 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/callcontext/CurrentUserServiceTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.common.callcontext;
+package de.ozgcloud.document.bescheid.common.callcontext;
 
 import static org.assertj.core.api.Assertions.*;
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/common/freemarker/TemplateHandlerITCase.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/freemarker/TemplateHandlerITCase.java
similarity index 94%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/common/freemarker/TemplateHandlerITCase.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/freemarker/TemplateHandlerITCase.java
index eeca8c0c770782be6364a6f9ae130e440a1168d7..34fe1deba1da459a92a6a2bc0e2053e12d3a82ad 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/common/freemarker/TemplateHandlerITCase.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/freemarker/TemplateHandlerITCase.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.common.freemarker;
+package de.ozgcloud.document.bescheid.common.freemarker;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -13,7 +13,7 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 
 import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
-import de.ozgcloud.bescheid.BescheidService;
+import de.ozgcloud.document.bescheid.BescheidService;
 import de.ozgcloud.common.test.ITCase;
 
 @ITCase
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
similarity index 90%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
index 764fc28f4882f0f160b07deef03f080c4c8b975d..9c36356a30b28648d2a31ebc1c635bf9c8c47c2a 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.smartdocuments;
+package de.ozgcloud.document.bescheid.smartdocuments;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -14,9 +14,9 @@ import org.springframework.test.context.ActiveProfiles;
 
 import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
-import de.ozgcloud.bescheid.BescheidRequestTestFactory;
-import de.ozgcloud.bescheid.BescheidTestApplication;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.BescheidRequestTestFactory;
+import de.ozgcloud.document.bescheid.BescheidTestApplication;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
 import de.ozgcloud.common.binaryfile.TempFileUtils;
 import de.ozgcloud.common.test.ITCase;
 import de.ozgcloud.common.test.TestUtils;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceTest.java
similarity index 93%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceTest.java
index 86bc7f747b0e95edb9f633b95ba93879124f71ca..25fc00cb9266828e717375a8cb4ddd314cb1d94e 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.smartdocuments;
+package de.ozgcloud.document.bescheid.smartdocuments;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -16,11 +16,11 @@ import org.mockito.Spy;
 import org.w3c.dom.Document;
 import org.w3c.dom.Text;
 
-import de.ozgcloud.bescheid.BescheidRequestTestFactory;
-import de.ozgcloud.bescheid.BescheidResponseTestFactory;
-import de.ozgcloud.bescheid.common.user.UserProfileTestFactory;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData.UserData;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.BescheidRequestTestFactory;
+import de.ozgcloud.document.bescheid.BescheidResponseTestFactory;
+import de.ozgcloud.document.bescheid.common.user.UserProfileTestFactory;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData.UserData;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
 import lombok.SneakyThrows;
 
 class SmartDocumentsBescheidRemoteServiceTest {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsResponseTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsResponseTestFactory.java
similarity index 55%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsResponseTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsResponseTestFactory.java
index 32a0b3ac98768e565da86a25437605fa7c37cd60..c5c2d6b4c0473704c17bf2df5e039178e4461ea1 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsResponseTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsResponseTestFactory.java
@@ -1,11 +1,11 @@
-package de.ozgcloud.bescheid.smartdocuments;
+package de.ozgcloud.document.bescheid.smartdocuments;
 
 import java.util.List;
 
-import de.ozgcloud.bescheid.BescheidResponseTestFactory;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentDocument;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentFile;
+import de.ozgcloud.document.bescheid.BescheidResponseTestFactory;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentDocument;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentFile;
 
 public class SmartDocumentsResponseTestFactory {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/BescheidVorgangMapperTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapperTest.java
similarity index 94%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/BescheidVorgangMapperTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapperTest.java
index 6f64a48933ed0351295ef3415111f149ca3f6c7d..cea6bd973a2fee31920796d284ab72a8fdb14d28 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/BescheidVorgangMapperTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapperTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
 import static org.assertj.core.api.Assertions.*;
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializerTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntrySerializerTest.java
similarity index 88%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializerTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntrySerializerTest.java
index d647a90200e8c47fd8a08465fa5fa2048ad35de5..85828d9c2d2601915083f13d83f4e384623e1d89 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializerTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntrySerializerTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -7,9 +7,9 @@ import org.junit.jupiter.api.Test;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import de.ozgcloud.bescheid.vorgang.FormDataEntry.FormField;
-import de.ozgcloud.bescheid.vorgang.FormDataEntry.SubForm;
-import de.ozgcloud.bescheid.vorgang.Vorgang.Eingang;
+import de.ozgcloud.document.bescheid.vorgang.FormDataEntry.FormField;
+import de.ozgcloud.document.bescheid.vorgang.FormDataEntry.SubForm;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang.Eingang;
 import lombok.SneakyThrows;
 
 class FormDataEntrySerializerTest {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/GrpcEingangTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/GrpcEingangTestFactory.java
similarity index 83%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/GrpcEingangTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/GrpcEingangTestFactory.java
index 8c9dfc0daf02960be0d45ecb6ddd9a515552353c..3ecadc1ab693443c1f8d1be0ea575b28437d49ef 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/GrpcEingangTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/GrpcEingangTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
 import de.ozgcloud.vorgang.vorgang.GrpcEingang;
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/GrpcVorgangWithEingangTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/GrpcVorgangWithEingangTestFactory.java
similarity index 84%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/GrpcVorgangWithEingangTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/GrpcVorgangWithEingangTestFactory.java
index 63c8a880f63c6d9ceffc9f2a8a5028cce949ed34..44e9c43c2b868ba14d89d1188128c49f1cdefb3d 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/GrpcVorgangWithEingangTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/GrpcVorgangWithEingangTestFactory.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
-import static de.ozgcloud.bescheid.vorgang.VorgangTestFactory.*;
+import static de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory.*;
 
 import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangWithEingangResponse;
 import de.ozgcloud.vorgang.vorgang.GrpcVorgangWithEingang;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/PostfachAddressTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/PostfachAddressTestFactory.java
similarity index 91%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/PostfachAddressTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/PostfachAddressTestFactory.java
index 5d01a8b7573c16643a61e602ff06bc94aa0cd155..c6d27d768e3e7eb3def7fd9ae4c4a568febec5d2 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/PostfachAddressTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/PostfachAddressTestFactory.java
@@ -21,12 +21,12 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
 import java.util.Map;
 import java.util.UUID;
 
-import de.ozgcloud.bescheid.vorgang.Vorgang.PostfachAddress.PostfachAddressBuilder;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang.PostfachAddress.PostfachAddressBuilder;
 
 public class PostfachAddressTestFactory {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/ServiceKontoTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/ServiceKontoTestFactory.java
similarity index 74%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/ServiceKontoTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/ServiceKontoTestFactory.java
index 2a30ada99a63098c255b97822a151a02558fd950..f3cc751698bc8e6094fcc85b11ac6ea8ab40f689 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/ServiceKontoTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/ServiceKontoTestFactory.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
-import de.ozgcloud.bescheid.vorgang.Vorgang.ServiceKonto;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang.ServiceKonto;
 
 public class ServiceKontoTestFactory {
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangRemoteServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangRemoteServiceTest.java
similarity index 97%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangRemoteServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangRemoteServiceTest.java
index 823dc761a8c5efcab9930fafde166d518d79b9ef..b4ce2e2970756e899821ce67d234df9cd0a0ba19 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangRemoteServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangRemoteServiceTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -36,7 +36,7 @@ class VorgangRemoteServiceTest {
 		void prepareGrpc() {
 			when(serviceStub.withInterceptors(any())).thenReturn(serviceStub);
 			when(serviceStub.findVorgangWithEingang(any())).thenReturn(GrpcVorgangWithEingangTestFactory.createResponse());
-			
+
 		}
 
 		@BeforeEach
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangServiceTest.java
similarity index 95%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangServiceTest.java
index cc93692c7831628dd87ada5bf0cf21f2250b5bb4..3666f80b75096f221843fe4da32785f459a20bb1 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangServiceTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangTestFactory.java
similarity index 92%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangTestFactory.java
index 000bc28d0aea983e85485a76638fbb0e33727ba2..a9c3f21cc2ec440c3739d6c9c29893d02de8a4e7 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
 
 import java.util.UUID;
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemMapperTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemMapperTest.java
similarity index 96%
rename from document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemMapperTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemMapperTest.java
index 25998524cc118900d7f705f2ff8c7268e2007b7b..be1da57d5bd3e3d73910e5150aed3bac6ef4825b 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemMapperTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemMapperTest.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -37,7 +37,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.ozgcloud.bescheid.SentInfoMapper;
+import de.ozgcloud.document.bescheid.SentInfoMapper;
 import de.ozgcloud.command.CommandTestFactory;
 import de.ozgcloud.document.DocumentService;
 import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemServiceTest.java
similarity index 98%
rename from document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemServiceTest.java
index aaa9b15a805e2c989b97f0d77577c2499ec18a56..56d10e3db14065d3cbaa601b5f92df3b80c7b20b 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemServiceTest.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.junit.jupiter.api.Assertions.*;
@@ -47,12 +47,12 @@ import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
 import de.ozgcloud.apilib.common.datatypes.GenericId;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
-import de.ozgcloud.bescheid.Bescheid;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
-import de.ozgcloud.bescheid.BescheidMapper;
-import de.ozgcloud.bescheid.BescheidTestFactory;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.Bescheid;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidMapper;
+import de.ozgcloud.document.bescheid.BescheidTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandTestFactory;
 import de.ozgcloud.common.errorhandling.TechnicalException;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemTestFactory.java
similarity index 90%
rename from document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemTestFactory.java
index 9b3ac12ebfa3c1f1385bedaab9d8383c25c750a8..7073b4e55d43b9de38765e3d2c7dd937afcf519a 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemTestFactory.java
@@ -21,23 +21,23 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
 
-import static de.ozgcloud.bescheid.SentInfoTestFactory.*;
+import static de.ozgcloud.document.bescheid.SentInfoTestFactory.*;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import de.ozgcloud.bescheid.Bescheid;
-import de.ozgcloud.bescheid.BescheidTestFactory;
-import de.ozgcloud.bescheid.SentInfo;
-import de.ozgcloud.bescheid.SentInfoTestFactory;
-import de.ozgcloud.bescheid.common.user.UserProfileTestFactory;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.Bescheid;
+import de.ozgcloud.document.bescheid.BescheidTestFactory;
+import de.ozgcloud.document.bescheid.SentInfo;
+import de.ozgcloud.document.bescheid.SentInfoTestFactory;
+import de.ozgcloud.document.bescheid.common.user.UserProfileTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
 import de.ozgcloud.command.CommandTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItem.AttachedItemBuilder;
+import de.ozgcloud.document.common.attached_item.AttachedItem.AttachedItemBuilder;
 import de.ozgcloud.common.binaryfile.FileId;
 import de.ozgcloud.document.Document;
 import de.ozgcloud.document.DocumentService;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/GrpcFindVorgangAttachedItemResponseTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/GrpcFindVorgangAttachedItemResponseTestFactory.java
similarity index 96%
rename from document-manager-server/src/test/java/de/ozgcloud/common/attached_item/GrpcFindVorgangAttachedItemResponseTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/GrpcFindVorgangAttachedItemResponseTestFactory.java
index 6a1ebaafcff9eb040990d3d2809fd1cc7ba8194a..ed4ff172945dc55768fbbe53ac766504302b48f5 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/GrpcFindVorgangAttachedItemResponseTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/GrpcFindVorgangAttachedItemResponseTestFactory.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
 
 import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemResponse;
 
diff --git a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/GrpcVorgangAttachedItemTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/GrpcVorgangAttachedItemTestFactory.java
similarity index 97%
rename from document-manager-server/src/test/java/de/ozgcloud/common/attached_item/GrpcVorgangAttachedItemTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/GrpcVorgangAttachedItemTestFactory.java
index daa37d39f9417cb153ae0d83361be572634698e2..0c84b4946896af8e2d0c4b3820ed315232aaa997 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/GrpcVorgangAttachedItemTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/GrpcVorgangAttachedItemTestFactory.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
 
 import de.ozgcloud.command.CommandTestFactory;
 import de.ozgcloud.vorgang.common.GrpcObject;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/VorgangAttachedItemRemoteServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/VorgangAttachedItemRemoteServiceTest.java
similarity index 98%
rename from document-manager-server/src/test/java/de/ozgcloud/common/attached_item/VorgangAttachedItemRemoteServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/VorgangAttachedItemRemoteServiceTest.java
index 104ace168b6b7486c39adf39df9657a825b8d577..f36508f3f6b0f9486a2c8ed8f8c7bc89175300cb 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/VorgangAttachedItemRemoteServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/VorgangAttachedItemRemoteServiceTest.java
@@ -23,7 +23,7 @@
  *  unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -42,9 +42,9 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.ozgcloud.bescheid.Bescheid;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.Bescheid;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
 import de.ozgcloud.command.CommandTestFactory;
 import de.ozgcloud.vorgang.common.GrpcObject;
 import de.ozgcloud.vorgang.common.GrpcProperty;