diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceDeserializer.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceDeserializer.java
index b2d646267a947ec174fc6ff001fc829ca874fdbb..25985dfde38d8bb67701a155769de952deddc66a 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceDeserializer.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceDeserializer.java
@@ -43,7 +43,7 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
 import lombok.Getter;
 
 abstract class AbstractLinkedResourceDeserializer extends StdDeserializer<Object> implements ContextualDeserializer {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceSerializer.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceSerializer.java
index b57564cd6a6300e8d6a86fe0301b71bcc1e61d1c..0fbe54646a8bda0e5ffb6e004703f2a9a7b01ef7 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceSerializer.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceSerializer.java
@@ -31,7 +31,7 @@ import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 
 abstract class AbstractLinkedResourceSerializer extends JsonSerializer<Object> implements ContextualSerializer {
 	@Override
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResourceDeserializer.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResourceDeserializer.java
index bc89185832367bfe67394605165a76d2c915e69d..98fe7ade06acf2edc285ae36df3d53786f1a3650 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResourceDeserializer.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResourceDeserializer.java
@@ -31,7 +31,7 @@ import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 
 public class LinkedResourceDeserializer extends AbstractLinkedResourceDeserializer {
 
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResourceSerializer.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResourceSerializer.java
index 54c8540fe99b2d7afeb12079df4e46ac6d1aa7be..9d20608f6c9bccb9f2a3b9fa7d34ceb65f8814ca 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResourceSerializer.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResourceSerializer.java
@@ -33,7 +33,7 @@ import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 import lombok.NoArgsConstructor;
 
 @NoArgsConstructor
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceDeserializer.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceDeserializer.java
index 5cbd8fbad25395f06b12675e09827d700f5522d9..810ab26db92bf1d6a0c8216dc84ac6b9e33ecffd 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceDeserializer.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceDeserializer.java
@@ -31,7 +31,7 @@ import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 
 public class LinkedUserProfileResourceDeserializer extends AbstractLinkedResourceDeserializer {
 
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceSerializer.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceSerializer.java
index dd5112baf8b31349c72f0609704c294e3a7d0513..ef61858ee41ab001c8cf8811188e520e826cd35a 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceSerializer.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceSerializer.java
@@ -36,7 +36,7 @@ import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 import lombok.NoArgsConstructor;
 
 @NoArgsConstructor
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileController.java
index b0ade6fed81052e7b930f0fa5be35c9c7afbcfeb..f448b1e3da5ef7a8cd296629185e0fec5569a6e5 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileController.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileController.java
@@ -46,8 +46,8 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.alfa.common.file.OzgFile;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 
 @RestController
 @RequestMapping(BinaryFileController.PATH)
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserver.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserver.java
index d864231f7a939fdc9479802718d3eb9a84253ec8..bd3f6ca760839603efee7f2cd647d2606083d203 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserver.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserver.java
@@ -27,7 +27,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.concurrent.CompletableFuture;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 import de.ozgcloud.vorgang.grpc.binaryFile.GrpcGetBinaryFileDataResponse;
 import io.grpc.stub.StreamObserver;
 import lombok.AccessLevel;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteService.java
index cfce2e02b3de4a19f6d0a62bea16bfa996d27fba..9a4bc693b085665b3dff4ba659702f038da136bd 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteService.java
@@ -36,11 +36,11 @@ import org.springframework.stereotype.Service;
 
 import com.google.protobuf.ByteString;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.alfa.common.GrpcUtil;
 import de.ozgcloud.alfa.common.callcontext.ContextService;
 import de.ozgcloud.alfa.common.file.OzgFile;
 import de.ozgcloud.alfa.common.file.OzgFileMapper;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
 import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
 import de.ozgcloud.vorgang.grpc.binaryFile.GrpcBinaryFilesRequest;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSender.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSender.java
index 4e902f7213016e795564a57f2dbd5b5baf5be8b9..00512d3bf2ec1abcdfb28063d565469070385ecf 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSender.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSender.java
@@ -23,16 +23,17 @@
  */
 package de.ozgcloud.alfa.common.binaryfile;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
-import io.grpc.stub.CallStreamObserver;
-import lombok.AllArgsConstructor;
-import org.apache.commons.io.IOUtils;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 
+import org.apache.commons.io.IOUtils;
+
+import de.ozgcloud.common.errorhandling.TechnicalException;
+import io.grpc.stub.CallStreamObserver;
+import lombok.AllArgsConstructor;
+
 @AllArgsConstructor
 class ChunkedFileSender<T> {
 
@@ -53,7 +54,7 @@ class ChunkedFileSender<T> {
 	}
 
 	private void sendMetadata(CallStreamObserver<T> streamObserver) {
-		if(requestMetadata != null) {
+		if (requestMetadata != null) {
 			streamObserver.onNext(requestMetadata);
 			requestMetadata = null;
 		}
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/FileId.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/FileId.java
index edff7225dec2ed427cfba76f715c26a6d5e278d4..71e85e7fa55535422a2865f1a32a07e425fc6cd7 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/FileId.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/FileId.java
@@ -25,7 +25,7 @@ package de.ozgcloud.alfa.common.binaryfile;
 
 import java.util.UUID;
 
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
 import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilter.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilter.java
index e2824c6edfb29aababf2e32ef78a04364acdb468..1b2a43b3de7bf62ed56e9108b6716d2a9f96269c 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilter.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilter.java
@@ -36,7 +36,7 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 
 @Component
 @Order(0)
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java
index d0c0e08ecebc65b24fdd82a2b2afcd23cb97a1d8..a050612ded87307edea1152e4e937b63f03db2ca 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java
@@ -27,8 +27,6 @@ import static de.ozgcloud.alfa.JwtTokenUtil.*;
 
 import java.util.Optional;
 
-import jakarta.servlet.http.HttpServletRequest;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -39,14 +37,15 @@ import org.springframework.stereotype.Service;
 
 import com.auth0.jwt.exceptions.JWTVerificationException;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.alfa.JwtTokenUtil;
-import de.ozgcloud.alfa.common.binaryfile.FileId;
 import de.ozgcloud.alfa.common.binaryfile.AlfaUserWithFileId;
+import de.ozgcloud.alfa.common.binaryfile.FileId;
 import de.ozgcloud.alfa.common.user.CurrentUserService;
 import de.ozgcloud.alfa.common.user.UserId;
 import de.ozgcloud.alfa.common.user.UserProfile;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 import io.jsonwebtoken.Claims;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ExceptionController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ExceptionController.java
index 018624fea26e30f86f059b898038ce02efdf0059..8c729bb9b02d8582e101978f313d9095ae0408c8 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ExceptionController.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ExceptionController.java
@@ -33,11 +33,6 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Stream;
 
-import jakarta.validation.ConstraintViolation;
-import jakarta.validation.ConstraintViolationException;
-import jakarta.validation.Path;
-import jakarta.validation.metadata.ConstraintDescriptor;
-
 import org.hibernate.validator.engine.HibernateConstraintViolation;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
@@ -47,9 +42,13 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-import de.itvsh.kop.common.errorhandling.ExceptionUtil;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.alfa.common.binaryfile.DynamicViolationParameter;
+import de.ozgcloud.common.errorhandling.ExceptionUtil;
+import de.ozgcloud.common.errorhandling.TechnicalException;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Path;
+import jakarta.validation.metadata.ConstraintDescriptor;
 import lombok.extern.log4j.Log4j2;
 
 @ControllerAdvice
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/FunctionalException.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/FunctionalException.java
index 82a71399c51ba2448fd2768e44ea779fe8938f8a..89774df44d7a2c28e7f9ec4deb89fa2e54f5710f 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/FunctionalException.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/FunctionalException.java
@@ -25,9 +25,9 @@ package de.ozgcloud.alfa.common.errorhandling;
 
 import java.util.UUID;
 
-import de.itvsh.kop.common.errorhandling.ExceptionUtil;
-import de.itvsh.kop.common.errorhandling.FunctionalErrorCode;
-import de.itvsh.kop.common.errorhandling.IdentifiableException;
+import de.ozgcloud.common.errorhandling.ExceptionUtil;
+import de.ozgcloud.common.errorhandling.FunctionalErrorCode;
+import de.ozgcloud.common.errorhandling.IdentifiableException;
 
 public class FunctionalException extends RuntimeException implements IdentifiableException {
 
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionController.java
index b83918b6b50be3368ca09376fa37c5fa00a07827..6a8a3a03406f428d6cdb1f7070585e72d896f216 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionController.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionController.java
@@ -36,9 +36,9 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 
-import de.itvsh.kop.common.errorhandling.ExceptionUtil;
-import de.itvsh.kop.common.errorhandling.FunctionalErrorCode;
 import de.ozgcloud.alfa.common.GrpcUtil;
+import de.ozgcloud.common.errorhandling.ExceptionUtil;
+import de.ozgcloud.common.errorhandling.FunctionalErrorCode;
 import io.grpc.Metadata;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/OrderNotAllowedException.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/OrderNotAllowedException.java
index 6a0c85ff123da982c3c4c3f60ccd827dfdf946cb..ac28f529ddbf79da3a9a7af962c53a9758bb3764 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/OrderNotAllowedException.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/OrderNotAllowedException.java
@@ -1,7 +1,7 @@
 package de.ozgcloud.alfa.common.errorhandling;
 
-import de.itvsh.kop.common.errorhandling.FunctionalErrorCode;
 import de.ozgcloud.alfa.common.command.CommandOrder;
+import de.ozgcloud.common.errorhandling.FunctionalErrorCode;
 
 public class OrderNotAllowedException extends FunctionalException {
 
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ResourceNotFoundException.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ResourceNotFoundException.java
index c6a0dfc73557a301833cefed1289e51aabe70413..0905a72e59471eb519b5b42734442f4b61a07191 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ResourceNotFoundException.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ResourceNotFoundException.java
@@ -23,7 +23,7 @@
  */
 package de.ozgcloud.alfa.common.errorhandling;
 
-import de.itvsh.kop.common.errorhandling.FunctionalErrorCode;
+import de.ozgcloud.common.errorhandling.FunctionalErrorCode;
 import lombok.Getter;
 
 @Getter
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserService.java
index 8dbf19e9fbc39cacb75481067c13566de38f3840..81ddfb139f273627653798ac0a8368ce32f6ab39 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserService.java
@@ -35,8 +35,8 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.stereotype.Service;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.alfa.common.binaryfile.AlfaUserWithFileId;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 
 @Service
 public class CurrentUserService {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserId.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserId.java
index 60310c7685d52dbe9d649e93b63ddf7b97097d61..7015d616ad67e8bfac84364dd7f950e9106e2f6f 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserId.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserId.java
@@ -27,7 +27,7 @@ import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
 
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
 import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerUnavailableException.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerUnavailableException.java
index 4c11fed98cb9a9944e59784ffc8850c21c745c8f..48711299318f6df896e47188a39990968f15e77e 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerUnavailableException.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerUnavailableException.java
@@ -1,7 +1,7 @@
 package de.ozgcloud.alfa.common.user;
 
-import de.itvsh.kop.common.errorhandling.FunctionalErrorCode;
 import de.ozgcloud.alfa.common.errorhandling.FunctionalException;
+import de.ozgcloud.common.errorhandling.FunctionalErrorCode;
 
 public class UserManagerUnavailableException extends FunctionalException {
 
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungService.java
index d478b7f56b218436f5c30404ad132c4261b331ae..4688388f573260f27add8685ec8e3ad1a1c668c8 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungService.java
@@ -3,14 +3,11 @@ package de.ozgcloud.alfa.loeschanforderung;
 import java.util.List;
 import java.util.Optional;
 
-import jakarta.validation.Valid;
-
 import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.alfa.common.attacheditem.VorgangAttachedItem;
 import de.ozgcloud.alfa.common.attacheditem.VorgangAttachedItemService;
 import de.ozgcloud.alfa.common.command.Command;
@@ -21,6 +18,8 @@ import de.ozgcloud.alfa.common.command.RequiredOrder;
 import de.ozgcloud.alfa.common.user.CurrentUserService;
 import de.ozgcloud.alfa.common.user.UserRole;
 import de.ozgcloud.alfa.vorgang.Vorgang;
+import de.ozgcloud.common.errorhandling.TechnicalException;
+import jakarta.validation.Valid;
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtId.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtId.java
index 26166364ac72ab9555f87f88093f14e388984e51..301f2f7bee2c844fb14183831b7771a8d410aa01 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtId.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtId.java
@@ -23,7 +23,7 @@
  */
 package de.ozgcloud.alfa.postfach;
 
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
 import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadService.java
index bafdff0bd5d35581094c8bee2432d114f821fec4..9c79a7378ad5930330cb812b245510d9b03cbcfe 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadService.java
@@ -40,7 +40,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandController.java
index 18edcca8983c5c2a9be02c6b3ddb9a736e1d053f..a6ac5d9193580f1681fe75a36090722c8e4cf679 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandController.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandController.java
@@ -33,9 +33,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.alfa.common.command.Command;
 import de.ozgcloud.alfa.common.command.CommandController;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 
 @RestController
 @RequestMapping(WiedervorlageCommandController.WIEDERVORLAGE_COMMANDS)
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/AlfaServerApplication.java b/alfa-service/src/test/java/de/ozgcloud/alfa/AlfaServerApplication.java
index 38814989905b94b6a5996c4d32a92290e55d0fe6..29c015f4bb0a26cdd67cda1da166f7460724ecc3 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/AlfaServerApplication.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/AlfaServerApplication.java
@@ -40,7 +40,7 @@ import org.springframework.web.filter.ForwardedHeaderFilter;
 @SpringBootApplication
 @EnableAsync
 @EnableAspectJAutoProxy(proxyTargetClass = true)
-@ComponentScan({ "de.ozgcloud.*", "de.itvsh.*" })
+@ComponentScan({ "de.ozgcloud.*" })
 public class AlfaServerApplication {
 
 	public static void main(String[] args) {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileControllerTest.java
index 0f5144fd99a6d7ebf48a6dd3c5caad4f9bb1b052..899746bcbd0608f670984c4be9a3005fa5d3be8a 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileControllerTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileControllerTest.java
@@ -55,10 +55,10 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.alfa.common.file.OzgFile;
 import de.ozgcloud.alfa.common.file.OzgFileTestFactory;
 import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 
 class BinaryFileControllerTest {
 
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteServiceTest.java
index 4f5a25c5db1d05ddbaae46ef41ea1133d8482c9c..b21968a738d0c45edff8714ee48385d3ef0c2b5a 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteServiceTest.java
@@ -49,13 +49,13 @@ import org.mockito.Spy;
 
 import com.google.protobuf.ByteString;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.alfa.common.GrpcCallContextTestFactory;
 import de.ozgcloud.alfa.common.callcontext.ContextService;
 import de.ozgcloud.alfa.common.file.GrpcOzgFileTestFactory;
 import de.ozgcloud.alfa.common.file.OzgFile;
 import de.ozgcloud.alfa.common.file.OzgFileMapper;
 import de.ozgcloud.alfa.common.file.OzgFileTestFactory;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
 import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
 import de.ozgcloud.vorgang.grpc.binaryFile.GrpcFindFilesResponse;
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSenderTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSenderTest.java
index 4fec83d09e26c0e351dba7723d038f1f261c22a7..ea236c52eb07660d513e1a39e1ba2d1a99689210 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSenderTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSenderTest.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileRequest;
 import io.grpc.stub.CallStreamObserver;
 import lombok.SneakyThrows;
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenServiceTest.java
index 24bf8ab7f626e0e52f8d6a89b164e3dccb2e7934..ba9466b8b3ea4b2ac9f09562599967094ba00676 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenServiceTest.java
@@ -33,9 +33,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -44,13 +41,15 @@ import org.mockito.Mock;
 
 import com.auth0.jwt.exceptions.JWTVerificationException;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.alfa.JwtTokenUtil;
 import de.ozgcloud.alfa.common.binaryfile.FileId;
 import de.ozgcloud.alfa.common.user.CurrentUserService;
 import de.ozgcloud.alfa.common.user.UserProfile;
 import de.ozgcloud.alfa.common.user.UserProfileTestFactory;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 import io.jsonwebtoken.Claims;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 class DownloadTokenServiceTest {
 
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionControllerTest.java
index 53fcd7d7e86047df2a8a4450c903de8c652bcb19..f339c51de6ba865c557dd2108ebcd971ad12f9df 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionControllerTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionControllerTest.java
@@ -29,8 +29,6 @@ import static org.mockito.Mockito.*;
 import java.util.Collections;
 import java.util.Map;
 
-import jakarta.validation.ConstraintViolationException;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -39,9 +37,10 @@ import org.mockito.InjectMocks;
 import org.mockito.Spy;
 import org.springframework.security.access.AccessDeniedException;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.alfa.common.binaryfile.DynamicViolationParameter;
 import de.ozgcloud.alfa.common.command.CommandOrder;
+import de.ozgcloud.common.errorhandling.TechnicalException;
+import jakarta.validation.ConstraintViolationException;
 
 class ExceptionControllerTest {
 
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungServiceTest.java
index a89a638bcb949bad520c7bab63b46b8c54740a16..f32c1d21e0f9321c5bf18c28386ebbce2d836cf1 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungServiceTest.java
@@ -20,7 +20,6 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.alfa.common.attacheditem.VorgangAttachedItem;
 import de.ozgcloud.alfa.common.attacheditem.VorgangAttachedItemService;
 import de.ozgcloud.alfa.common.attacheditem.VorgangAttachedItemTestFactory;
@@ -38,6 +37,7 @@ import de.ozgcloud.alfa.vorgang.Vorgang.VorgangStatus;
 import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
 import de.ozgcloud.alfa.vorgang.VorgangWithEingang;
 import de.ozgcloud.alfa.vorgang.VorgangWithEingangTestFactory;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 
 class LoeschAnforderungServiceTest {
 
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandControllerTest.java
index 4bb6ab2e699c445a5e0b341ba4833d2980588d98..5155900af505863d2446aeacfff17eb651df6774 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandControllerTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandControllerTest.java
@@ -45,7 +45,6 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.alfa.common.binaryfile.FileId;
 import de.ozgcloud.alfa.common.command.Command;
 import de.ozgcloud.alfa.common.command.CommandOrder;
@@ -53,6 +52,7 @@ import de.ozgcloud.alfa.common.command.CommandService;
 import de.ozgcloud.alfa.common.command.CommandTestFactory;
 import de.ozgcloud.alfa.common.command.CreateCommand;
 import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 
 class WiedervorlageCommandControllerTest {
 
diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/DateConverter.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/DateConverter.java
index b41173ea1bcc9246309dce3ca752d24dc4dbb715..f564300eb2b28c507f84ed17fd789fcb1e08b485 100644
--- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/DateConverter.java
+++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/DateConverter.java
@@ -11,7 +11,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.springframework.stereotype.Component;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 
 @Component
 class DateConverter {
diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XDomeaService.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XDomeaService.java
index ae924df290489e4851084caec61c45654da41d89..d4189560d61dfe343829813da309e35efc3f866c 100644
--- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XDomeaService.java
+++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XDomeaService.java
@@ -13,11 +13,11 @@ import java.util.zip.ZipOutputStream;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.itvsh.kop.common.binaryfile.TempFileUtils;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.alfa.common.file.OzgFile;
 import de.ozgcloud.alfa.vorgang.VorgangController;
 import de.ozgcloud.alfa.vorgang.VorgangWithEingang;
+import de.ozgcloud.common.binaryfile.TempFileUtils;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 
 @Service
 class XDomeaService {
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/DateConverterTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/DateConverterTest.java
index c296eff263a96f41fe254f6fdfe07e8520766a16..8aae80c8cbeb21d9133b41734dcb89bf92ca7dfd 100644
--- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/DateConverterTest.java
+++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/DateConverterTest.java
@@ -16,7 +16,7 @@ import org.mockito.InjectMocks;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 
 class DateConverterTest {
 
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/XDomeaServiceTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/XDomeaServiceTest.java
index f2471d907ae8b11e38264726ff7fb1245c72435d..91433d1db42f57c62da258afcb7570b76b7f7351 100644
--- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/XDomeaServiceTest.java
+++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/XDomeaServiceTest.java
@@ -24,7 +24,6 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.alfa.common.TestUtils;
 import de.ozgcloud.alfa.common.file.OzgFile;
 import de.ozgcloud.alfa.common.file.OzgFileTestFactory;
@@ -33,6 +32,7 @@ import de.ozgcloud.alfa.vorgang.VorgangController;
 import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
 import de.ozgcloud.alfa.vorgang.VorgangWithEingang;
 import de.ozgcloud.alfa.vorgang.VorgangWithEingangTestFactory;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 import de.xoev.xdomea.AbgabeAbgabe0401;
 import lombok.SneakyThrows;