diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b8a19ea4994b3b99a90ca7411c1ce1340e845934
--- /dev/null
+++ b/alfa-service/pom.xml
@@ -0,0 +1,224 @@
+<!--
+
+    Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+    Ministerpräsidenten des Landes Schleswig-Holstein
+    Staatskanzlei
+    Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+
+    Lizenziert unter der EUPL, Version 1.2 oder - sobald
+    diese von der Europäischen Kommission genehmigt wurden -
+    Folgeversionen der EUPL ("Lizenz");
+    Sie dürfen dieses Werk ausschließlich gemäß
+    dieser Lizenz nutzen.
+    Eine Kopie der Lizenz finden Sie hier:
+
+    https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+
+    Sofern nicht durch anwendbare Rechtsvorschriften
+    gefordert oder in schriftlicher Form vereinbart, wird
+    die unter der Lizenz verbreitete Software "so wie sie
+    ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+    ausdrücklich oder stillschweigend - verbreitet.
+    Die sprachspezifischen Genehmigungen und Beschränkungen
+    unter der Lizenz sind dem Lizenztext zu entnehmen.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>de.itvsh.ozg</groupId>
+		<artifactId>goofy</artifactId>
+		<version>1.15.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>alfa-service</artifactId>
+	<name>Goofy Server</name>
+	<description>Projekt packaging deployment artefact</description>
+	<packaging>jar</packaging>
+
+	<properties>
+		<maven.compiler.source>${java.version}</maven.compiler.source>
+		<maven.compiler.target>${java.version}</maven.compiler.target>
+	</properties>
+
+	<dependencies>
+		<!-- Spring -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-log4j2</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-hateoas</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>net.devh</groupId>
+			<artifactId>grpc-client-spring-boot-starter</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.keycloak</groupId>
+			<artifactId>keycloak-spring-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.keycloak</groupId>
+			<artifactId>keycloak-admin-client</artifactId>
+		</dependency>
+
+		<!-- jwt -->
+		<dependency>
+			<groupId>com.auth0</groupId>
+			<artifactId>java-jwt</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt</artifactId>
+		</dependency>
+
+		<!-- own projects -->
+		<dependency>
+			<groupId>de.itvsh.ozg.pluto</groupId>
+			<artifactId>pluto-interface</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>de.itvsh.ozg.pluto</groupId>
+			<artifactId>pluto-utils</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>de.itvsh.kop.common</groupId>
+			<artifactId>kop-common-pdf</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>de.itvsh.kop.user</groupId>
+			<artifactId>user-manager-interface</artifactId>
+		</dependency>
+
+		<!-- tools -->
+		<dependency>
+			<groupId>org.mapstruct</groupId>
+			<artifactId>mapstruct</artifactId>
+		</dependency>
+
+		<!-- aspectJ -->
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+		</dependency>
+
+		<!-- Dev -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
+		<!-- commons -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+		</dependency>
+
+		<!-- Test -->
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>de.itvsh.ozg.pluto</groupId>
+			<artifactId>pluto-utils</artifactId>
+			<type>test-jar</type>
+			<scope>test</scope>
+			<version>${pluto.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>com.thedeanda</groupId>
+			<artifactId>lorem</artifactId>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>pl.project13.maven</groupId>
+				<artifactId>git-commit-id-plugin</artifactId>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.3.0</version>
+				<executions>
+					<execution>
+						<id>Jar Tests Package</id>
+						<phase>package</phase>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/goofy-server/sonar-project.properties b/alfa-service/sonar-project.properties
similarity index 100%
rename from goofy-server/sonar-project.properties
rename to alfa-service/sonar-project.properties
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/CallBeanFactoryPostProcessor.java b/alfa-service/src/main/java/de/ozgcloud/alfa/CallBeanFactoryPostProcessor.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/CallBeanFactoryPostProcessor.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/CallBeanFactoryPostProcessor.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/CallScope.java b/alfa-service/src/main/java/de/ozgcloud/alfa/CallScope.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/CallScope.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/CallScope.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/EnvironmentController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/EnvironmentController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/EnvironmentController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/EnvironmentController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/FrontendEnvironment.java b/alfa-service/src/main/java/de/ozgcloud/alfa/FrontendEnvironment.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/FrontendEnvironment.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/FrontendEnvironment.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/JwtTokenUtil.java b/alfa-service/src/main/java/de/ozgcloud/alfa/JwtTokenUtil.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/JwtTokenUtil.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/JwtTokenUtil.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/RequestAttributes.java b/alfa-service/src/main/java/de/ozgcloud/alfa/RequestAttributes.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/RequestAttributes.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/RequestAttributes.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/RequestIdFilter.java b/alfa-service/src/main/java/de/ozgcloud/alfa/RequestIdFilter.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/RequestIdFilter.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/RequestIdFilter.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/Root.java b/alfa-service/src/main/java/de/ozgcloud/alfa/Root.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/Root.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/Root.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/RootController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/RootController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/RootController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/RootController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/RootModelAssembler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/RootModelAssembler.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/RootModelAssembler.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/RootModelAssembler.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/RootViewLinkHandler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/RootViewLinkHandler.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/RootViewLinkHandler.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/RootViewLinkHandler.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/SecurityConfiguration.java b/alfa-service/src/main/java/de/ozgcloud/alfa/SecurityConfiguration.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/SecurityConfiguration.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/SecurityConfiguration.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/WebConfig.java b/alfa-service/src/main/java/de/ozgcloud/alfa/WebConfig.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/WebConfig.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/WebConfig.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/attachment/AttachmentController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/attachment/AttachmentController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/attachment/AttachmentController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/attachment/AttachmentController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/attachment/AttachmentMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/attachment/AttachmentMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/attachment/AttachmentMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/attachment/AttachmentMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceDeserializer.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceDeserializer.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceDeserializer.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceDeserializer.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceSerializer.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceSerializer.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceSerializer.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceSerializer.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/BaseTypesMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/BaseTypesMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/BaseTypesMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/BaseTypesMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/CollectionModelBuilder.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/CollectionModelBuilder.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/CollectionModelBuilder.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/CollectionModelBuilder.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/FeatureToggleProperties.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/FeatureToggleProperties.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/FeatureToggleProperties.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/FeatureToggleProperties.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/GrpcUtil.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/GrpcUtil.java
similarity index 96%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/GrpcUtil.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/GrpcUtil.java
index 26dff92e9a65eac6ab7e4f836ef406be09894e9e..46689411c040cd99a6caaddac42cd65b7d221862 100644
--- a/goofy-server/src/main/java/de/ozgcloud/alfa/common/GrpcUtil.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/GrpcUtil.java
@@ -36,6 +36,8 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class GrpcUtil {
 
+	public static final String VORGANG_MANAGER_GRPC_CLIENT = "pluto";
+
 	public static final String SERVICE_KEY = "GRPC_SERVICE";
 
 	public static Key<String> keyOfString(String key) {
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/IdBuilder.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/IdBuilder.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/IdBuilder.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/IdBuilder.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/IdExtractor.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/IdExtractor.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/IdExtractor.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/IdExtractor.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/IgnoreGrpcFields.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/IgnoreGrpcFields.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/IgnoreGrpcFields.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/IgnoreGrpcFields.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/LinkedResource.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResource.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/LinkedResource.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResource.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/LinkedResourceDeserializer.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResourceDeserializer.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/LinkedResourceDeserializer.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResourceDeserializer.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/LinkedResourceSerializer.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResourceSerializer.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/LinkedResourceSerializer.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResourceSerializer.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResource.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResource.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResource.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResource.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceDeserializer.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceDeserializer.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceDeserializer.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceDeserializer.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceSerializer.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceSerializer.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceSerializer.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceSerializer.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/ModelBuilder.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/ModelBuilder.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/ModelBuilder.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/ModelBuilder.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/ObjectBuilder.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/ObjectBuilder.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/ObjectBuilder.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/ObjectBuilder.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/RegexUtil.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/RegexUtil.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/RegexUtil.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/RegexUtil.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/StringToNullMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/StringToNullMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/StringToNullMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/StringToNullMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/TimeMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/TimeMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/TimeMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/TimeMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/ToStringExtractor.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/ToStringExtractor.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/ToStringExtractor.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/ToStringExtractor.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/UserProfileUrlProvider.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/UserProfileUrlProvider.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/UserProfileUrlProvider.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/UserProfileUrlProvider.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/ValidationMessageCodes.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/ValidationMessageCodes.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/ValidationMessageCodes.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/ValidationMessageCodes.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItem.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItem.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItem.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItem.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteService.java
similarity index 94%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteService.java
index 5555924cfaf071f746deb96e0384f630dd6fe88f..cb39a46b232501008cb6075932dc6e6ddf897fdb 100644
--- a/goofy-server/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteService.java
@@ -9,7 +9,7 @@ import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest
 import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
 import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItemResponse;
 import de.itvsh.ozg.pluto.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
-import de.ozgcloud.alfa.AlfaServerApplication;
+import de.ozgcloud.alfa.common.GrpcUtil;
 import de.ozgcloud.alfa.common.errorhandling.ResourceNotFoundException;
 import io.grpc.Status.Code;
 import io.grpc.StatusRuntimeException;
@@ -18,7 +18,7 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
 @Service
 class VorgangAttachedItemRemoteService {
 
-	@GrpcClient(AlfaServerApplication.VORGANG_MANAGER_GRPC_CLIENT)
+	@GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT)
 	private VorgangAttachedItemServiceBlockingStub vorgangAttachedItemServiceStub;
 
 	@Autowired
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserver.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserver.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserver.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserver.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileMaxSizeConstraint.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileMaxSizeConstraint.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileMaxSizeConstraint.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileMaxSizeConstraint.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileModelAssembler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileModelAssembler.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileModelAssembler.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileModelAssembler.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileProperties.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileProperties.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileProperties.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileProperties.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserver.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserver.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserver.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserver.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSender.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSender.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSender.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSender.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandler.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandler.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandler.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/DynamicViolationParameter.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/DynamicViolationParameter.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/DynamicViolationParameter.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/DynamicViolationParameter.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/FileId.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/FileId.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/FileId.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/FileId.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/FileIdMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/FileIdMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/FileIdMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/FileIdMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/GoofyUserWithFileId.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/GoofyUserWithFileId.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/GoofyUserWithFileId.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/GoofyUserWithFileId.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileRequest.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileRequest.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileRequest.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileRequest.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidator.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidator.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidator.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidator.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/callcontext/CallContextAttachingInterceptor.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/CallContextAttachingInterceptor.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/callcontext/CallContextAttachingInterceptor.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/CallContextAttachingInterceptor.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/callcontext/CallContextMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/CallContextMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/callcontext/CallContextMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/CallContextMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/callcontext/ContextService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/ContextService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/callcontext/ContextService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/ContextService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteService.java
similarity index 93%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteService.java
index bfa35c2ceea99fbbd7dc4ab25903c45b61a632bb..027d3b9a4e788a422c84507cdb9431728b06827e 100644
--- a/goofy-server/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteService.java
@@ -26,13 +26,13 @@ package de.ozgcloud.alfa.common.clientattribute;
 import org.springframework.stereotype.Service;
 
 import de.itvsh.ozg.pluto.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
-import de.ozgcloud.alfa.AlfaServerApplication;
 import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcUpdateClientAttributeRequest;
+import de.ozgcloud.alfa.common.GrpcUtil;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Service
 class ClientAttributeRemoteService {
-	@GrpcClient(AlfaServerApplication.VORGANG_MANAGER_GRPC_CLIENT)
+	@GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT)
 	private ClientAttributeServiceBlockingStub service;
 
 	void resetPostfachNachricht(GrpcUpdateClientAttributeRequest request) {
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/Command.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/Command.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/Command.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/Command.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandBody.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandBody.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandBody.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandBody.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandBodyMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandBodyMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandBodyMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandBodyMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandHelper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandHelper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandHelper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandHelper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandModelAssembler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandModelAssembler.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandModelAssembler.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandModelAssembler.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandOrder.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandOrder.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandOrder.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandOrder.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandRemoteService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandRemoteService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandRemoteService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandStatus.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandStatus.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CommandStatus.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandStatus.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CreateCommand.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CreateCommand.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/CreateCommand.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CreateCommand.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/GenericCommandBody.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/GenericCommandBody.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/GenericCommandBody.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/GenericCommandBody.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrder.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrder.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrder.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrder.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrderValidator.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrderValidator.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrderValidator.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrderValidator.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/command/StatusPatch.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/StatusPatch.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/command/StatusPatch.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/command/StatusPatch.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilter.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilter.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilter.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilter.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenProperties.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenProperties.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenProperties.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenProperties.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenRequest.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenRequest.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenRequest.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenRequest.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenResponse.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenResponse.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenResponse.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenResponse.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/errorhandling/ApiError.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ApiError.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/errorhandling/ApiError.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ApiError.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/errorhandling/ExceptionController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ExceptionController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/errorhandling/ExceptionController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ExceptionController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/errorhandling/FunctionalException.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/FunctionalException.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/errorhandling/FunctionalException.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/FunctionalException.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/errorhandling/Issue.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/Issue.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/errorhandling/Issue.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/Issue.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/errorhandling/OrderNotAllowedException.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/OrderNotAllowedException.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/errorhandling/OrderNotAllowedException.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/OrderNotAllowedException.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/errorhandling/ResourceNotFoundException.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ResourceNotFoundException.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/errorhandling/ResourceNotFoundException.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ResourceNotFoundException.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/file/OzgFile.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFile.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/file/OzgFile.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFile.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/file/OzgFileMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFileMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/file/OzgFileMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFileMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/file/OzgFileRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFileRemoteService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/file/OzgFileRemoteService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFileRemoteService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/file/OzgFileService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFileService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/file/OzgFileService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFileService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserHelper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserHelper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserHelper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserHelper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserCallContextAttachingInterceptor.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserCallContextAttachingInterceptor.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserCallContextAttachingInterceptor.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserCallContextAttachingInterceptor.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserConfiguration.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserConfiguration.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserConfiguration.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserConfiguration.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserId.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserId.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserId.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserId.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserIdMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserIdMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserIdMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserIdMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserManagerClientProperties.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerClientProperties.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserManagerClientProperties.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerClientProperties.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserManagerProperties.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerProperties.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserManagerProperties.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerProperties.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserManagerUnavailableException.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerUnavailableException.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserManagerUnavailableException.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerUnavailableException.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserManagerUrlProvider.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerUrlProvider.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserManagerUrlProvider.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerUrlProvider.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserProfile.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserProfile.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserProfile.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserProfile.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserProfileMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserProfileMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserProfileMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserProfileMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserRemoteService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserRemoteService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserRemoteService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserRole.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserRole.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserRole.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserRole.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/common/user/UserService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/hint/Hint.java b/alfa-service/src/main/java/de/ozgcloud/alfa/hint/Hint.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/hint/Hint.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/hint/Hint.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/hint/HintController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/hint/HintController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/hint/HintController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/hint/HintController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/hint/HintModelAssembler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/hint/HintModelAssembler.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/hint/HintModelAssembler.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/hint/HintModelAssembler.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/hint/HintRootResourceProzessor.java b/alfa-service/src/main/java/de/ozgcloud/alfa/hint/HintRootResourceProzessor.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/hint/HintRootResourceProzessor.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/hint/HintRootResourceProzessor.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/hint/HintService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/hint/HintService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/hint/HintService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/hint/HintService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/historie/HistorieCommandHandler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/historie/HistorieCommandHandler.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/historie/HistorieCommandHandler.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/historie/HistorieCommandHandler.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/historie/HistorieController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/historie/HistorieController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/historie/HistorieController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/historie/HistorieController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/historie/HistorieModelAssembler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/historie/HistorieModelAssembler.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/historie/HistorieModelAssembler.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/historie/HistorieModelAssembler.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/historie/HistorieService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/historie/HistorieService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/historie/HistorieService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/historie/HistorieService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/Kommentar.java b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/Kommentar.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/Kommentar.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/Kommentar.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/KommentarCommand.java b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarCommand.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/KommentarCommand.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarCommand.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/KommentarCommandController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarCommandController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/KommentarCommandController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarCommandController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/KommentarController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/KommentarController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/KommentarMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/KommentarMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/KommentarModelAssembler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarModelAssembler.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/KommentarModelAssembler.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarModelAssembler.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/KommentarRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarRemoteService.java
similarity index 95%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/KommentarRemoteService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarRemoteService.java
index 118e9a089ff89034b3425e081ff93507daea7ae2..d14fa8cd29ab54afc996fe18abd065bcefe62263 100644
--- a/goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/KommentarRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarRemoteService.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Service;
 import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
 import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
 import de.itvsh.ozg.pluto.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
-import de.ozgcloud.alfa.AlfaServerApplication;
+import de.ozgcloud.alfa.common.GrpcUtil;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Service
@@ -39,7 +39,7 @@ class KommentarRemoteService {
 
 	static final String ITEM_NAME = "Kommentar";
 
-	@GrpcClient(AlfaServerApplication.VORGANG_MANAGER_GRPC_CLIENT)
+	@GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT)
 	private VorgangAttachedItemServiceBlockingStub vorgangAttachedItemServiceStub;
 	@Autowired
 	private KommentarMapper mapper;
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/KommentarService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/kommentar/KommentarService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/DeleteLoeschAnforderung.java b/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/DeleteLoeschAnforderung.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/DeleteLoeschAnforderung.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/DeleteLoeschAnforderung.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderung.java b/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderung.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderung.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderung.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandProzessor.java b/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandProzessor.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandProzessor.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandProzessor.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungModelAssembler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungModelAssembler.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungModelAssembler.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungModelAssembler.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungPreAuthorizeHandler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungPreAuthorizeHandler.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungPreAuthorizeHandler.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungPreAuthorizeHandler.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungVorgangProzessor.java b/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungVorgangProzessor.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungVorgangProzessor.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungVorgangProzessor.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/Features.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/Features.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/Features.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/Features.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/Postfach.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/Postfach.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/Postfach.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/Postfach.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachAddress.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachAddress.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachAddress.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachAddress.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachMail.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMail.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachMail.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMail.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailModelAssembler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailModelAssembler.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailModelAssembler.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailModelAssembler.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtComparator.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtComparator.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtComparator.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtComparator.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtHelper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtHelper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtHelper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtHelper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtId.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtId.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtId.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtId.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfData.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfData.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfData.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfData.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfModel.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfModel.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfModel.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfModel.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/postfach/ReplyOption.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/ReplyOption.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/postfach/ReplyOption.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/postfach/ReplyOption.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/representation/RepresentationController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/representation/RepresentationController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/representation/RepresentationController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/representation/RepresentationController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/statistic/ByStatus.java b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/ByStatus.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/statistic/ByStatus.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/statistic/ByStatus.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/statistic/CountVorgangResponse.java b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/CountVorgangResponse.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/statistic/CountVorgangResponse.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/statistic/CountVorgangResponse.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/statistic/Statistic.java b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/Statistic.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/statistic/Statistic.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/statistic/Statistic.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/statistic/StatisticController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/statistic/StatisticController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/statistic/StatisticMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/statistic/StatisticMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/statistic/StatisticRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticRemoteService.java
similarity index 97%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/statistic/StatisticRemoteService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticRemoteService.java
index 4963608aba3a86a045d9d9c0cedcd5e0fd0bf94c..ca2989926949cd23d9c585310a4706a68576acab 100644
--- a/goofy-server/src/main/java/de/ozgcloud/alfa/statistic/StatisticRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticRemoteService.java
@@ -15,7 +15,7 @@ import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticQuery.Operator;
 import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticRequest;
 import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticResponse;
 import de.itvsh.ozg.pluto.statistic.StatisticServiceGrpc.StatisticServiceBlockingStub;
-import de.ozgcloud.alfa.AlfaServerApplication;
+import de.ozgcloud.alfa.common.GrpcUtil;
 import de.ozgcloud.alfa.vorgang.Vorgang.VorgangStatus;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
@@ -31,7 +31,7 @@ class StatisticRemoteService {
 
 	static final String OPERAND_TODAY_DATE = "today()";
 
-	@GrpcClient(AlfaServerApplication.VORGANG_MANAGER_GRPC_CLIENT)
+	@GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT)
 	private StatisticServiceBlockingStub statisticServiceStub;
 	@Autowired
 	private StatisticMapper mapper;
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/statistic/StatisticResult.java b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticResult.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/statistic/StatisticResult.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticResult.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/statistic/StatisticService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/statistic/StatisticService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/system/PlutoSystemStatus.java b/alfa-service/src/main/java/de/ozgcloud/alfa/system/PlutoSystemStatus.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/system/PlutoSystemStatus.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/system/PlutoSystemStatus.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/system/RemoteSystemStatusMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/system/RemoteSystemStatusMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/system/RemoteSystemStatusMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/system/RemoteSystemStatusMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/system/SystemStatusRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/system/SystemStatusRemoteService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/system/SystemStatusRemoteService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/system/SystemStatusRemoteService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/system/SystemStatusService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/system/SystemStatusService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/system/SystemStatusService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/system/SystemStatusService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/Antragsteller.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/Antragsteller.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/Antragsteller.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/Antragsteller.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/AntragstellerMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/AntragstellerMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/AntragstellerMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/AntragstellerMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/AssignUserCommandBody.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/AssignUserCommandBody.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/AssignUserCommandBody.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/AssignUserCommandBody.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtils.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtils.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtils.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtils.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/Eingang.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/Eingang.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/Eingang.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/Eingang.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/EingangHeader.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EingangHeader.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/EingangHeader.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EingangHeader.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/EingangMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EingangMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/EingangMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EingangMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/EnhancedVorgang.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EnhancedVorgang.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/EnhancedVorgang.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EnhancedVorgang.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/FilterCriteria.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/FilterCriteria.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/FilterCriteria.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/FilterCriteria.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/FindVorgaengeHeaderRequestCriteria.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/FindVorgaengeHeaderRequestCriteria.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/FindVorgaengeHeaderRequestCriteria.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/FindVorgaengeHeaderRequestCriteria.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/OrderBy.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/OrderBy.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/OrderBy.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/OrderBy.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/ResetNewPostfachNachrichtBody.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ResetNewPostfachNachrichtBody.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/ResetNewPostfachNachrichtBody.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ResetNewPostfachNachrichtBody.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/ServiceKonto.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ServiceKonto.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/ServiceKonto.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ServiceKonto.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgaengeHeaderResponse.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgaengeHeaderResponse.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgaengeHeaderResponse.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgaengeHeaderResponse.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/Vorgang.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/Vorgang.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/Vorgang.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/Vorgang.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangAuthorizationService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangAuthorizationService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangAuthorizationService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangAuthorizationService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHead.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHead.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHead.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHead.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeader.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeader.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeader.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeader.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangModelAssembler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangModelAssembler.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangModelAssembler.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangModelAssembler.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java
similarity index 97%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java
index 6a826e2a43332dd56c6fba0ec96bab57beadf60d..a5d3605a8d1344e275f048cf837a676701d59859 100644
--- a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java
@@ -35,13 +35,13 @@ import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangResponse;
 import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangWithEingangRequest;
 import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangWithEingangResponse;
 import de.itvsh.ozg.pluto.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
-import de.ozgcloud.alfa.AlfaServerApplication;
+import de.ozgcloud.alfa.common.GrpcUtil;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Service
 class VorgangRemoteService {
 
-	@GrpcClient(AlfaServerApplication.VORGANG_MANAGER_GRPC_CLIENT)
+	@GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT)
 	private VorgangServiceBlockingStub vorgangServiceStub;
 	@Autowired
 	private VorgangHeaderMapper vorgangHeaderMapper;
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingang.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingang.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingang.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingang.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangProzessor.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangProzessor.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangProzessor.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangProzessor.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangResponse.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangResponse.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangResponse.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangResponse.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelle.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelle.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelle.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelle.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/command/VorgangCommandProzessor.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/command/VorgangCommandProzessor.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/command/VorgangCommandProzessor.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/command/VorgangCommandProzessor.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/command/VorgangWithEingangCommandProzessor.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/command/VorgangWithEingangCommandProzessor.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/command/VorgangWithEingangCommandProzessor.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/command/VorgangWithEingangCommandProzessor.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/Forwarding.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/Forwarding.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/Forwarding.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/Forwarding.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingModelAssembler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingModelAssembler.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingModelAssembler.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingModelAssembler.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordSizeConstraint.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordSizeConstraint.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordSizeConstraint.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordSizeConstraint.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidator.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidator.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidator.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidator.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoProperties.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoProperties.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoProperties.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoProperties.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadService.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/RedirectRequest.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/RedirectRequest.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/RedirectRequest.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/RedirectRequest.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/Wiedervorlage.java b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/Wiedervorlage.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/Wiedervorlage.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/Wiedervorlage.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommand.java b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommand.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommand.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommand.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageController.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageController.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageController.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapper.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapper.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapper.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageModelAssembler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageModelAssembler.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageModelAssembler.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageModelAssembler.java
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteService.java
similarity index 96%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteService.java
index 7ee73bb106933cd33f8af85d3927ddb88bcc3677..b96696248648afae84c81131beb374bd13aeea86 100644
--- a/goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteService.java
@@ -41,7 +41,7 @@ import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcSetClientAttributeRequest;
 import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
 import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
 import de.itvsh.ozg.pluto.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
-import de.ozgcloud.alfa.AlfaServerApplication;
+import de.ozgcloud.alfa.common.GrpcUtil;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Service
@@ -50,10 +50,10 @@ public class WiedervorlageRemoteService {
 	static final String CLIENT_ATTRIBUTE_NEXT_WIEDERVORLAGE_FRIST = "nextWiedervorlageFrist";
 	static final String ITEM_NAME = "Wiedervorlage";
 
-	@GrpcClient(AlfaServerApplication.VORGANG_MANAGER_GRPC_CLIENT)
+	@GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT)
 	private VorgangAttachedItemServiceBlockingStub vorgangAttachedItemServiceStub;
 
-	@GrpcClient(AlfaServerApplication.VORGANG_MANAGER_GRPC_CLIENT)
+	@GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT)
 	private ClientAttributeServiceBlockingStub clientAttributeServiceStub;
 
 	@Autowired
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageService.java
similarity index 100%
rename from goofy-server/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageService.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageService.java
diff --git a/goofy-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/alfa-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json
similarity index 100%
rename from goofy-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json
rename to alfa-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json
diff --git a/goofy-server/src/main/resources/files/LandesnetzInfo.html b/alfa-service/src/main/resources/files/LandesnetzInfo.html
similarity index 100%
rename from goofy-server/src/main/resources/files/LandesnetzInfo.html
rename to alfa-service/src/main/resources/files/LandesnetzInfo.html
diff --git a/goofy-server/src/main/resources/files/mailertable.txt b/alfa-service/src/main/resources/files/mailertable.txt
similarity index 100%
rename from goofy-server/src/main/resources/files/mailertable.txt
rename to alfa-service/src/main/resources/files/mailertable.txt
diff --git a/goofy-server/src/main/resources/fop/postfach-nachrichten.xsl b/alfa-service/src/main/resources/fop/postfach-nachrichten.xsl
similarity index 100%
rename from goofy-server/src/main/resources/fop/postfach-nachrichten.xsl
rename to alfa-service/src/main/resources/fop/postfach-nachrichten.xsl
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/AlfaServerApplication.java b/alfa-service/src/test/java/de/ozgcloud/alfa/AlfaServerApplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..38814989905b94b6a5996c4d32a92290e55d0fe6
--- /dev/null
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/AlfaServerApplication.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+ * Ministerpräsidenten des Landes Schleswig-Holstein
+ * Staatskanzlei
+ * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+ *
+ * Lizenziert unter der EUPL, Version 1.2 oder - sobald
+ * diese von der Europäischen Kommission genehmigt wurden -
+ * Folgeversionen der EUPL ("Lizenz");
+ * Sie dürfen dieses Werk ausschließlich gemäß
+ * dieser Lizenz nutzen.
+ * Eine Kopie der Lizenz finden Sie hier:
+ *
+ * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * Sofern nicht durch anwendbare Rechtsvorschriften
+ * gefordert oder in schriftlicher Form vereinbart, wird
+ * die unter der Lizenz verbreitete Software "so wie sie
+ * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+ * ausdrücklich oder stillschweigend - verbreitet.
+ * Die sprachspezifischen Genehmigungen und Beschränkungen
+ * unter der Lizenz sind dem Lizenztext zu entnehmen.
+ */
+package de.ozgcloud.alfa;
+
+import java.util.TimeZone;
+
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.security.concurrent.DelegatingSecurityContextRunnable;
+import org.springframework.web.filter.ForwardedHeaderFilter;
+
+@SpringBootApplication
+@EnableAsync
+@EnableAspectJAutoProxy(proxyTargetClass = true)
+@ComponentScan({ "de.ozgcloud.*", "de.itvsh.*" })
+public class AlfaServerApplication {
+
+	public static void main(String[] args) {
+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+		SpringApplication.run(AlfaServerApplication.class, args);
+	}
+
+	@Bean
+	public FilterRegistrationBean<ForwardedHeaderFilter> forwardedHeaderFilter() {
+		FilterRegistrationBean<ForwardedHeaderFilter> bean = new FilterRegistrationBean<>();
+		bean.setFilter(new ForwardedHeaderFilter());
+		return bean;
+	}
+
+	@Bean
+	public ThreadPoolTaskExecutor threadPoolTaskExecutor() {
+		ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+
+		executor.setThreadNamePrefix("async-");
+		executor.setTaskDecorator(DelegatingSecurityContextRunnable::new);
+		return executor;
+	}
+
+	@Bean
+	public CallScope callScope() {
+		return new CallScope();
+	}
+
+	@Bean
+	public BeanFactoryPostProcessor beanFactoryPostProcessor(CallScope callScope) {
+		return new CallBeanFactoryPostProcessor(callScope);
+	}
+}
\ No newline at end of file
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/AlfaServerApplicationTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/AlfaServerApplicationTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/AlfaServerApplicationTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/AlfaServerApplicationTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/ApplicationTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/ApplicationTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/ApplicationTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/ApplicationTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/EnvironmentControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/EnvironmentControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/EnvironmentControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/EnvironmentControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/JwtTokenUtilTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/JwtTokenUtilTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/JwtTokenUtilTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/JwtTokenUtilTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/RequestAttributesTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/RequestAttributesTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/RequestAttributesTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/RequestAttributesTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/RequestIdFilterITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/RequestIdFilterITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/RequestIdFilterITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/RequestIdFilterITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/RequestIdFilterTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/RequestIdFilterTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/RequestIdFilterTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/RequestIdFilterTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/RootControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/RootControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/RootControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/RootControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/RootModelAssemblerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/RootModelAssemblerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/RootModelAssemblerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/RootModelAssemblerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/RootTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/RootTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/RootTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/RootTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/RootViewLinkHandlerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/RootViewLinkHandlerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/RootViewLinkHandlerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/RootViewLinkHandlerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/SecurityTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/SecurityTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/SecurityTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/SecurityTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/TestSecurityConfiguration.java b/alfa-service/src/test/java/de/ozgcloud/alfa/TestSecurityConfiguration.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/TestSecurityConfiguration.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/TestSecurityConfiguration.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/attachment/AttachmentControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/attachment/AttachmentControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/attachment/AttachmentControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/attachment/AttachmentControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/attachment/AttachmentMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/attachment/AttachmentMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/attachment/AttachmentMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/attachment/AttachmentMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/attachment/GrpcGetAttachmentsResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/attachment/GrpcGetAttachmentsResponseTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/attachment/GrpcGetAttachmentsResponseTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/attachment/GrpcGetAttachmentsResponseTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/CollectionModelBuilderTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/CollectionModelBuilderTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/CollectionModelBuilderTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/CollectionModelBuilderTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/GrpcCallContextTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/GrpcCallContextTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/GrpcCallContextTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/GrpcCallContextTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/IdBuilderTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/IdBuilderTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/IdBuilderTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/IdBuilderTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/LinkedResourceDeserializerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/LinkedResourceDeserializerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/LinkedResourceDeserializerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/LinkedResourceDeserializerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/LinkedResourceSerializerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/LinkedResourceSerializerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/LinkedResourceSerializerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/LinkedResourceSerializerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/LinkedResourceTestObject.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/LinkedResourceTestObject.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/LinkedResourceTestObject.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/LinkedResourceTestObject.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceDeserializerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceDeserializerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceDeserializerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceDeserializerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceSerializerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceSerializerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceSerializerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceSerializerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceTestObject.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceTestObject.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceTestObject.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceTestObject.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/ModelBuilderTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/ModelBuilderTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/ModelBuilderTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/ModelBuilderTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/RegexUtilTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/RegexUtilTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/RegexUtilTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/RegexUtilTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/UserProfileUrlProviderTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/UserProfileUrlProviderTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/UserProfileUrlProviderTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/UserProfileUrlProviderTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemRequestTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemRequestTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemRequestTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemRequestTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemResponseTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemResponseTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemResponseTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemRequestTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemRequestTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemRequestTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemRequestTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemResponseTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemResponseTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemResponseTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileControllerITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileControllerITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileControllerITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileControllerITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserverTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserverTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserverTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserverTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileModelAssemblerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileModelAssemblerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileModelAssemblerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileModelAssemblerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserverTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserverTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserverTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserverTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSenderTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSenderTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSenderTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSenderTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandlerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandlerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandlerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandlerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadGoofyUserTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadGoofyUserTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadGoofyUserTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadGoofyUserTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileMetaDataTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileMetaDataTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileMetaDataTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileMetaDataTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileRequestTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileRequestTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileRequestTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileRequestTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidatorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidatorTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidatorTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidatorTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/callcontext/CallContextAttachingInterceptorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/callcontext/CallContextAttachingInterceptorTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/callcontext/CallContextAttachingInterceptorTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/callcontext/CallContextAttachingInterceptorTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/callcontext/CallContextTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/callcontext/CallContextTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/callcontext/CallContextTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/callcontext/CallContextTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/callcontext/ContextServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/callcontext/ContextServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/callcontext/ContextServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/callcontext/ContextServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/clientattribute/GrpcClientAttributeTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/GrpcClientAttributeTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/clientattribute/GrpcClientAttributeTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/GrpcClientAttributeTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandBodyMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandBodyMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandBodyMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandBodyMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandByRelationControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandByRelationControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandByRelationControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandByRelationControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandModelAssemblerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandModelAssemblerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandModelAssemblerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandModelAssemblerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandRemoteServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandRemoteServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandRemoteServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/command/CommandTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandResponseTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandResponseTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandResponseTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/command/GrpcPostfachCommandTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcPostfachCommandTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/command/GrpcPostfachCommandTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcPostfachCommandTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/command/RequiredOrderValidatorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/RequiredOrderValidatorTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/command/RequiredOrderValidatorTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/command/RequiredOrderValidatorTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/errorhandling/FunctionalExceptionTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/FunctionalExceptionTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/errorhandling/FunctionalExceptionTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/FunctionalExceptionTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/GrpcExceptionTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/file/GrpcOzgFileTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/file/GrpcOzgFileTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/file/GrpcOzgFileTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/file/GrpcOzgFileTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/file/OzgFileMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/file/OzgFileMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/file/OzgFileMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/file/OzgFileMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/file/OzgFileRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/file/OzgFileRemoteServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/file/OzgFileRemoteServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/file/OzgFileRemoteServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/file/OzgFileServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/file/OzgFileServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/file/OzgFileServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/file/OzgFileServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/file/OzgFileTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/file/OzgFileTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/file/OzgFileTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/file/OzgFileTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/user/CurrentUserServiceITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/CurrentUserServiceITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/user/CurrentUserServiceITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/user/CurrentUserServiceITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/user/CurrentUserServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/CurrentUserServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/user/CurrentUserServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/user/CurrentUserServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserProfileTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserProfileTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserProfileTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserProfileTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/user/UserManagerPropertiesTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserManagerPropertiesTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/user/UserManagerPropertiesTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserManagerPropertiesTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/user/UserManagerUrlProviderTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserManagerUrlProviderTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/user/UserManagerUrlProviderTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserManagerUrlProviderTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/user/UserProfileMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserProfileMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/user/UserProfileMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserProfileMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/user/UserProfileTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserProfileTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/user/UserProfileTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserProfileTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/user/UserRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserRemoteServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/user/UserRemoteServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserRemoteServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/common/user/UserServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/common/user/UserServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/hint/HintControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/hint/HintControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/hint/HintControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/hint/HintControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/hint/HintModelAssemblerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/hint/HintModelAssemblerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/hint/HintModelAssemblerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/hint/HintModelAssemblerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/hint/HintRootResourceProzessorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/hint/HintRootResourceProzessorTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/hint/HintRootResourceProzessorTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/hint/HintRootResourceProzessorTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/hint/HintServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/hint/HintServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/hint/HintServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/hint/HintServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/hint/HintTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/hint/HintTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/hint/HintTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/hint/HintTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/historie/HistorieCommandHandlerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieCommandHandlerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/historie/HistorieCommandHandlerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieCommandHandlerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/historie/HistorieControllerITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieControllerITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/historie/HistorieControllerITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieControllerITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/historie/HistorieControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/historie/HistorieControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/historie/HistorieModelAssemblerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieModelAssemblerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/historie/HistorieModelAssemblerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieModelAssemblerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/historie/HistorieServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/historie/HistorieServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarByVorgangControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarByVorgangControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarByVorgangControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarByVorgangControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarModelAssemblerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarModelAssemblerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarModelAssemblerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarModelAssemblerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarRemoteServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarRemoteServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarRemoteServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/kommentar/KommentarTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungByVorgangControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungByVorgangControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungByVorgangControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungByVorgangControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandControllerITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandControllerITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandControllerITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandControllerITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandProzessorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandProzessorTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandProzessorTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandProzessorTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungModelAssemblerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungModelAssemblerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungModelAssemblerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungModelAssemblerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungPreAuthorizeHandlerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungPreAuthorizeHandlerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungPreAuthorizeHandlerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungPreAuthorizeHandlerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungVorgangProzessorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungVorgangProzessorTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungVorgangProzessorTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungVorgangProzessorTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/FeaturesTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/FeaturesTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/FeaturesTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/FeaturesTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachAddressTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachAddressTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachAddressTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachAddressTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachMailTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachMailTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachMailTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachMailTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachAddressTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachAddressTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachAddressTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachAddressTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailCommandByVorgangControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailCommandByVorgangControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailCommandByVorgangControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailCommandByVorgangControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailCommandControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailCommandControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailCommandControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailCommandControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailModelAssemblerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailModelAssemblerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailModelAssemblerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailModelAssemblerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtComparatorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtComparatorTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtComparatorTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtComparatorTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtHelperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtHelperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtHelperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtHelperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfDataTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfDataTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfDataTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfDataTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/postfach/PostfachTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/representation/GrpcGetRepresentationsResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/representation/GrpcGetRepresentationsResponseTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/representation/GrpcGetRepresentationsResponseTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/representation/GrpcGetRepresentationsResponseTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/representation/RepresentationControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/representation/RepresentationControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/representation/RepresentationControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/representation/RepresentationControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/statistic/ByStatusTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/ByStatusTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/statistic/ByStatusTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/statistic/ByStatusTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/statistic/CountVorgangResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/CountVorgangResponseTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/statistic/CountVorgangResponseTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/statistic/CountVorgangResponseTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/statistic/GrpcByStatusResultTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcByStatusResultTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/statistic/GrpcByStatusResultTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcByStatusResultTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangCountTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangCountTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangCountTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangCountTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticResultTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticResultTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticResultTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticResultTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/statistic/StatisticControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/statistic/StatisticControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/statistic/StatisticMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/statistic/StatisticMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/statistic/StatisticRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticRemoteServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/statistic/StatisticRemoteServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticRemoteServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/statistic/StatisticResultTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticResultTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/statistic/StatisticResultTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticResultTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/statistic/StatisticServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/statistic/StatisticServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/statistic/StatisticTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/statistic/StatisticTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/system/GrpcGetSystemStatusResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/system/GrpcGetSystemStatusResponseTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/system/GrpcGetSystemStatusResponseTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/system/GrpcGetSystemStatusResponseTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/system/PlutoSystemStatusTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/system/PlutoSystemStatusTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/system/PlutoSystemStatusTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/system/PlutoSystemStatusTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/system/RemoteSystemStatusMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/system/RemoteSystemStatusMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/system/RemoteSystemStatusMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/system/RemoteSystemStatusMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/system/SystemStatusRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/system/SystemStatusRemoteServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/system/SystemStatusRemoteServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/system/SystemStatusRemoteServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/system/SystemStatusServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/system/SystemStatusServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/system/SystemStatusServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/system/SystemStatusServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/AntragstellerMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/AntragstellerMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/AntragstellerMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/AntragstellerMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/AntragstellerTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/AntragstellerTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/AntragstellerTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/AntragstellerTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtilsTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtilsTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtilsTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtilsTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/EingangHeaderTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangHeaderTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/EingangHeaderTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangHeaderTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/EingangMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/EingangMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/EingangTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/EingangTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/FilterCriteriaTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/FilterCriteriaTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/FilterCriteriaTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/FilterCriteriaTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/FindVorgaengeRequestCriteriaTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/FindVorgaengeRequestCriteriaTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/FindVorgaengeRequestCriteriaTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/FindVorgaengeRequestCriteriaTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcAntragstellerTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcAntragstellerTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcAntragstellerTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcAntragstellerTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcClientAttributeTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcClientAttributeTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcClientAttributeTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcClientAttributeTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangHeaderTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangHeaderTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangHeaderTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangHeaderTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFilterByTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFilterByTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFilterByTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFilterByTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFindVorgangRequestTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFindVorgangRequestTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFindVorgangRequestTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFindVorgangRequestTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormDataMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormDataMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormDataMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormDataMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormFieldTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormFieldTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormFieldTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormFieldTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcServiceKontoTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcServiceKontoTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcServiceKontoTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcServiceKontoTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcSubFormTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcSubFormTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcSubFormTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcSubFormTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangAttachedItemTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangAttachedItemTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangAttachedItemTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangAttachedItemTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangHeaderTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangHeaderTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangHeaderTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangHeaderTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangResponseTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangResponseTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangResponseTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcZustaendigeStelleTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcZustaendigeStelleTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/GrpcZustaendigeStelleTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcZustaendigeStelleTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/RedirectRequestTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/RedirectRequestTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/RedirectRequestTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/RedirectRequestTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/ServiceKontoTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ServiceKontoTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/ServiceKontoTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ServiceKontoTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangAuthorizationServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangAuthorizationServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangAuthorizationServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangAuthorizationServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangControllerITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangControllerITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangControllerITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangControllerITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeadTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeadTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeadTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeadTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangListResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangListResponseTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangListResponseTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangListResponseTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangModelAssemblerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangModelAssemblerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangModelAssemblerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangModelAssemblerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangRemoteServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangRemoteServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangRemoteServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangProzessorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangProzessorTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangProzessorTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangProzessorTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/command/VorgangCommandProzessorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/command/VorgangCommandProzessorTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/command/VorgangCommandProzessorTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/command/VorgangCommandProzessorTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/command/VorgangWithEingangCommandProzessorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/command/VorgangWithEingangCommandProzessorTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/command/VorgangWithEingangCommandProzessorTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/command/VorgangWithEingangCommandProzessorTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingModelAssemblerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingModelAssemblerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingModelAssemblerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingModelAssemblerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidatorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidatorTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidatorTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidatorTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/AttachmentsByWiedervorlageControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/AttachmentsByWiedervorlageControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/AttachmentsByWiedervorlageControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/AttachmentsByWiedervorlageControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandByVorgangControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandByVorgangControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandByVorgangControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandByVorgangControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandTestFactory.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageControllerITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageControllerITCase.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageControllerITCase.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageControllerITCase.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageControllerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageControllerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageControllerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapperTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapperTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapperTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageModelAssemblerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageModelAssemblerTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageModelAssemblerTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageModelAssemblerTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageServiceTest.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageServiceTest.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageServiceTest.java
diff --git a/goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageTestFactory.java
similarity index 100%
rename from goofy-server/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageTestFactory.java
diff --git a/goofy-server/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/alfa-service/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
similarity index 100%
rename from goofy-server/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
rename to alfa-service/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
diff --git a/goofy-server/src/test/resources/application-itcase.yml b/alfa-service/src/test/resources/application-itcase.yml
similarity index 100%
rename from goofy-server/src/test/resources/application-itcase.yml
rename to alfa-service/src/test/resources/application-itcase.yml
diff --git a/alfa-service/src/test/resources/application.yml b/alfa-service/src/test/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a46d7989678c79a6f2338deb269565b88e026824
--- /dev/null
+++ b/alfa-service/src/test/resources/application.yml
@@ -0,0 +1,83 @@
+logging:
+  level:
+    ROOT: WARN
+    '[de.itvsh]': INFO
+    '[de.ozgcloud]': INFO,
+    '[org.springframework.security]': WARN
+    '[org.keycloak.adapters]': WARN
+
+spring:
+  mvc:
+    pathmatch:
+      matching-strategy: ant-path-matcher
+  application:
+    name: Goofy
+  jackson:
+    deserialization:
+      'ADJUST_DATES_TO_CONTEXT_TIME_ZONE': false
+  servlet:
+    multipart:
+      max-file-size: 2GB
+      max-request-size: 2GB
+
+server:
+  http2:
+    enabled: true
+  error:
+    include-stacktrace: never
+
+management:
+  server:
+    port: 8081
+  health:
+    livenessState:
+      enabled: true
+    readinessState:
+      enabled: true
+  endpoint:
+    health:
+      group:
+        exploratory:
+          include: livenessState,readinessState,ping
+          show-details: always
+      probes:
+        enabled: true
+    prometheus:
+      enabled: true
+  endpoints:
+    web:
+      exposure:
+        include: health,prometheus
+
+goofy:
+  production: true
+
+keycloak:
+  auth-server-url: http://localhost:8088
+  realm: sh-kiel-dev
+  resource: sh-kiel-dev-goofy
+  public-client: true
+  use-resource-role-mappings: true
+
+grpc:
+  client:
+    pluto:
+      address: static://127.0.0.1:9090
+      negotiationType: PLAINTEXT
+    user-manager:
+      address: static://127.0.0.1:9000
+      negotiationType: TLS
+
+kop:
+  auth:
+    token:
+      secret: XPPWagXn3rDwKG6Ywoir
+      validity: 60000
+  upload:
+    maxFileSize:
+      postfachNachrichtAttachment: 3MB
+      wiedervorlageAttachment: 40MB
+  user-manager:
+    url: https://localhost
+    profile-template: /api/userProfiles/%s
+    search-template: /api/userProfiles/?searchBy={searchBy}
\ No newline at end of file
diff --git a/goofy-server/src/test/resources/jsonTemplates/command/commandAssignedToBody b/alfa-service/src/test/resources/jsonTemplates/command/commandAssignedToBody
similarity index 100%
rename from goofy-server/src/test/resources/jsonTemplates/command/commandAssignedToBody
rename to alfa-service/src/test/resources/jsonTemplates/command/commandAssignedToBody
diff --git a/goofy-server/src/test/resources/jsonTemplates/command/createCommandWithBody.json.tmpl b/alfa-service/src/test/resources/jsonTemplates/command/createCommandWithBody.json.tmpl
similarity index 100%
rename from goofy-server/src/test/resources/jsonTemplates/command/createCommandWithBody.json.tmpl
rename to alfa-service/src/test/resources/jsonTemplates/command/createCommandWithBody.json.tmpl
diff --git a/goofy-server/src/test/resources/jsonTemplates/command/createCommandWithKommentar.json.tmpl b/alfa-service/src/test/resources/jsonTemplates/command/createCommandWithKommentar.json.tmpl
similarity index 100%
rename from goofy-server/src/test/resources/jsonTemplates/command/createCommandWithKommentar.json.tmpl
rename to alfa-service/src/test/resources/jsonTemplates/command/createCommandWithKommentar.json.tmpl
diff --git a/goofy-server/src/test/resources/jsonTemplates/command/createCommandWithPostfachMail.json.tmpl b/alfa-service/src/test/resources/jsonTemplates/command/createCommandWithPostfachMail.json.tmpl
similarity index 100%
rename from goofy-server/src/test/resources/jsonTemplates/command/createCommandWithPostfachMail.json.tmpl
rename to alfa-service/src/test/resources/jsonTemplates/command/createCommandWithPostfachMail.json.tmpl
diff --git a/goofy-server/src/test/resources/jsonTemplates/command/createCommandWithRedirectRequest.json.tmpl b/alfa-service/src/test/resources/jsonTemplates/command/createCommandWithRedirectRequest.json.tmpl
similarity index 100%
rename from goofy-server/src/test/resources/jsonTemplates/command/createCommandWithRedirectRequest.json.tmpl
rename to alfa-service/src/test/resources/jsonTemplates/command/createCommandWithRedirectRequest.json.tmpl
diff --git a/goofy-server/src/test/resources/jsonTemplates/command/createCommandWithWiedervorlage.json.tmpl b/alfa-service/src/test/resources/jsonTemplates/command/createCommandWithWiedervorlage.json.tmpl
similarity index 100%
rename from goofy-server/src/test/resources/jsonTemplates/command/createCommandWithWiedervorlage.json.tmpl
rename to alfa-service/src/test/resources/jsonTemplates/command/createCommandWithWiedervorlage.json.tmpl
diff --git a/goofy-server/src/test/resources/jsonTemplates/command/createVorgangCommand.json.tmpl b/alfa-service/src/test/resources/jsonTemplates/command/createVorgangCommand.json.tmpl
similarity index 100%
rename from goofy-server/src/test/resources/jsonTemplates/command/createVorgangCommand.json.tmpl
rename to alfa-service/src/test/resources/jsonTemplates/command/createVorgangCommand.json.tmpl
diff --git a/goofy-server/src/test/resources/jsonTemplates/command/createWiedervorlageOrderCommand.json.tmpl b/alfa-service/src/test/resources/jsonTemplates/command/createWiedervorlageOrderCommand.json.tmpl
similarity index 100%
rename from goofy-server/src/test/resources/jsonTemplates/command/createWiedervorlageOrderCommand.json.tmpl
rename to alfa-service/src/test/resources/jsonTemplates/command/createWiedervorlageOrderCommand.json.tmpl
diff --git a/goofy-server/src/test/resources/jsonTemplates/command/patchStatus.json b/alfa-service/src/test/resources/jsonTemplates/command/patchStatus.json
similarity index 100%
rename from goofy-server/src/test/resources/jsonTemplates/command/patchStatus.json
rename to alfa-service/src/test/resources/jsonTemplates/command/patchStatus.json
diff --git a/goofy-server/src/test/resources/jsonTemplates/command/statusPatch.json.tmpl b/alfa-service/src/test/resources/jsonTemplates/command/statusPatch.json.tmpl
similarity index 100%
rename from goofy-server/src/test/resources/jsonTemplates/command/statusPatch.json.tmpl
rename to alfa-service/src/test/resources/jsonTemplates/command/statusPatch.json.tmpl
diff --git a/goofy-server/src/test/resources/jsonTemplates/downloadTokenRequest.json.tmpl b/alfa-service/src/test/resources/jsonTemplates/downloadTokenRequest.json.tmpl
similarity index 100%
rename from goofy-server/src/test/resources/jsonTemplates/downloadTokenRequest.json.tmpl
rename to alfa-service/src/test/resources/jsonTemplates/downloadTokenRequest.json.tmpl
diff --git a/goofy-server/src/test/resources/jsonTemplates/vorgangWithEingang.json.tmpl b/alfa-service/src/test/resources/jsonTemplates/vorgangWithEingang.json.tmpl
similarity index 100%
rename from goofy-server/src/test/resources/jsonTemplates/vorgangWithEingang.json.tmpl
rename to alfa-service/src/test/resources/jsonTemplates/vorgangWithEingang.json.tmpl
diff --git a/goofy-server/src/test/resources/junit-platform.properties b/alfa-service/src/test/resources/junit-platform.properties
similarity index 100%
rename from goofy-server/src/test/resources/junit-platform.properties
rename to alfa-service/src/test/resources/junit-platform.properties
diff --git a/goofy-server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/alfa-service/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
similarity index 100%
rename from goofy-server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
rename to alfa-service/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/alfa-xdomea/pom.xml b/alfa-xdomea/pom.xml
index 6f2e693bdd2a6d5bbe12e15d5da025b9e6e3ff25..5f3125ca788e8e8fed9fda3bf0a355e89c5b3b0e 100644
--- a/alfa-xdomea/pom.xml
+++ b/alfa-xdomea/pom.xml
@@ -47,6 +47,11 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>de.itvsh.ozg</groupId>
+			<artifactId>alfa-service</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>
 			<artifactId>jakarta.xml.bind-api</artifactId>
@@ -65,24 +70,7 @@
 		</dependency>
 		<dependency>
 			<groupId>de.itvsh.ozg</groupId>
-			<artifactId>goofy-server</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>de.itvsh.ozg</groupId>
-			<artifactId>goofy-server</artifactId>
-			<version>${project.version}</version>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>de.itvsh.ozg</groupId>
-			<artifactId>goofy-server</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>de.itvsh.ozg</groupId>
-			<artifactId>goofy-server</artifactId>
+			<artifactId>alfa-service</artifactId>
 			<version>${project.version}</version>
 			<type>test-jar</type>
 			<scope>test</scope>
diff --git a/goofy-server/pom.xml b/goofy-server/pom.xml
index 8871a7c080761ebca8aa4ae10b2a5caf2098d36f..3d10300f55b3f09e2044091cc76ea69c00caf813 100644
--- a/goofy-server/pom.xml
+++ b/goofy-server/pom.xml
@@ -1,272 +1,123 @@
-<!--
-
-    Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
-    Ministerpräsidenten des Landes Schleswig-Holstein
-    Staatskanzlei
-    Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
-
-    Lizenziert unter der EUPL, Version 1.2 oder - sobald
-    diese von der Europäischen Kommission genehmigt wurden -
-    Folgeversionen der EUPL ("Lizenz");
-    Sie dürfen dieses Werk ausschließlich gemäß
-    dieser Lizenz nutzen.
-    Eine Kopie der Lizenz finden Sie hier:
-
-    https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
-
-    Sofern nicht durch anwendbare Rechtsvorschriften
-    gefordert oder in schriftlicher Form vereinbart, wird
-    die unter der Lizenz verbreitete Software "so wie sie
-    ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
-    ausdrücklich oder stillschweigend - verbreitet.
-    Die sprachspezifischen Genehmigungen und Beschränkungen
-    unter der Lizenz sind dem Lizenztext zu entnehmen.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>de.itvsh.ozg</groupId>
-		<artifactId>goofy</artifactId>
-		<version>1.15.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>goofy-server</artifactId>
-	<name>Goofy Server</name>
-	<description>Projekt packaging deployment artefact</description>
-	<packaging>jar</packaging>
-
-	<properties>
-		<maven.compiler.source>${java.version}</maven.compiler.source>
-		<maven.compiler.target>${java.version}</maven.compiler.target>
-
-		<spring-boot.build-image.imageName>docker.ozg-sh.de/goofy:build-latest</spring-boot.build-image.imageName>
-	</properties>
-
-	<dependencies>
-		<!-- Spring -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-log4j2</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-hateoas</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>net.devh</groupId>
-			<artifactId>grpc-client-spring-boot-starter</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.keycloak</groupId>
-			<artifactId>keycloak-spring-boot-starter</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.keycloak</groupId>
-			<artifactId>keycloak-admin-client</artifactId>
-		</dependency>
-
-		<!-- jwt -->
-		<dependency>
-			<groupId>com.auth0</groupId>
-			<artifactId>java-jwt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.jsonwebtoken</groupId>
-			<artifactId>jjwt</artifactId>
-		</dependency>
-
-		<!-- own projects -->
-		<dependency>
-			<groupId>de.itvsh.ozg.pluto</groupId>
-			<artifactId>pluto-interface</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>de.itvsh.ozg.pluto</groupId>
-			<artifactId>pluto-utils</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>de.itvsh.kop.common</groupId>
-			<artifactId>kop-common-pdf</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>de.itvsh.kop.user</groupId>
-			<artifactId>user-manager-interface</artifactId>
-		</dependency>
-
-		<!-- tools -->
-		<dependency>
-			<groupId>org.mapstruct</groupId>
-			<artifactId>mapstruct</artifactId>
-		</dependency>
-
-		<!-- aspectJ -->
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjweaver</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-		</dependency>
-
-		<!-- Dev -->
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-
-		<!-- commons -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-beanutils</groupId>
-			<artifactId>commons-beanutils</artifactId>
-		</dependency>
-
-		<!-- Test -->
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>de.itvsh.ozg.pluto</groupId>
-			<artifactId>pluto-utils</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-			<version>${pluto.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-processor</artifactId>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>com.thedeanda</groupId>
-			<artifactId>lorem</artifactId>
-		</dependency>
-
-	</dependencies>
-
-	<build>
-		<finalName>${project.artifactId}</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<docker>
-						<publishRegistry>
-							<username>${docker-username}</username>
-							<password>${docker-password}</password>
-							<url>${docker-url}</url>
-						</publishRegistry>
-					</docker>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-client</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>
-								${project.build.directory}/classes/META-INF/resources</outputDirectory>
-							<resources>
-								<resource>
-									<directory>
-										../${project.parent.artifactId}-client/dist/apps/goofy/</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.3.0</version>
-				<executions>
-					<execution>
-						<id>Jar Tests Package</id>
-						<phase>package</phase>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>de.itvsh.ozg</groupId>
+    <artifactId>goofy</artifactId>
+    <version>1.15.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>goofy-server</artifactId>
+  <name>Goofy Server</name>
+  <groupId>de.itvsh.ozg</groupId>
+
+  <properties>
+    <maven.compiler.source>${java.version}</maven.compiler.source>
+    <maven.compiler.target>${java.version}</maven.compiler.target>
+
+    <spring-boot.build-image.imageName>docker.ozg-sh.de/goofy:build-latest</spring-boot.build-image.imageName>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>de.itvsh.ozg</groupId>
+      <artifactId>alfa-service</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>de.itvsh.ozg</groupId>
+      <artifactId>alfa-xdomea</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-security</artifactId>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <finalName>${project.artifactId}</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <configuration>
+          <docker>
+            <publishRegistry>
+              <username>${docker-username}</username>
+              <password>${docker-password}</password>
+              <url>${docker-url}</url>
+            </publishRegistry>
+          </docker>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>pl.project13.maven</groupId>
+        <artifactId>git-commit-id-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-client</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>
+                ${project.build.directory}/classes/META-INF/resources</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>
+                    ../${project.parent.artifactId}-client/dist/apps/goofy/</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.3.0</version>
+        <executions>
+          <execution>
+            <id>Jar Tests Package</id>
+            <phase>package</phase>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/goofy-server/src/main/java/de/ozgcloud/alfa/AlfaServerApplication.java b/goofy-server/src/main/java/de/ozgcloud/alfa/AlfaServerApplication.java
index b4f18b1891b772b767d2f3607f9db57026f9ae3e..38814989905b94b6a5996c4d32a92290e55d0fe6 100644
--- a/goofy-server/src/main/java/de/ozgcloud/alfa/AlfaServerApplication.java
+++ b/goofy-server/src/main/java/de/ozgcloud/alfa/AlfaServerApplication.java
@@ -43,8 +43,6 @@ import org.springframework.web.filter.ForwardedHeaderFilter;
 @ComponentScan({ "de.ozgcloud.*", "de.itvsh.*" })
 public class AlfaServerApplication {
 
-	public static final String VORGANG_MANAGER_GRPC_CLIENT = "pluto";
-
 	public static void main(String[] args) {
 		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
 		SpringApplication.run(AlfaServerApplication.class, args);
diff --git a/goofy-server/src/test/resources/application.yml b/goofy-server/src/test/resources/application.yml
deleted file mode 100644
index 21d2eb21d9d2215ef3ee7cd635fde3ccf446e47e..0000000000000000000000000000000000000000
--- a/goofy-server/src/test/resources/application.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-spring:
-  profiles:
-    active:
-    - itcase
-    - local
-  mvc:
-    pathmatch:
-      matching-strategy: ant-path-matcher
-      
-kop:
-  auth:
-    token:
-      secret: quatsch
-      validity: 60000
-  user-manager:
-    url: https://localhost
-    internalurl: http://localhost:8080
-    search-template: /api/userProfiles/?searchBy={searchBy}
-    profile-template: /api/userProfiles/%s
-      
-goofy:
-  production: false
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ce66cec71a872af4f38a791200ef99bfc761180e..46ae5cc7d1bce45bc36dd5ec8bf33208aa7dedea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,8 @@
 	<modules>
 		<module>goofy-client</module>
 		<module>goofy-server</module>
-    	<module>alfa-xdomea</module>
+		<module>alfa-xdomea</module>
+		<module>alfa-service</module>
   </modules>
 
 	<properties>