diff --git a/refarch-integrations/refarch-s3-integration/pom.xml b/refarch-integrations/refarch-s3-integration/pom.xml
index 3ddf7ccd..5df67af2 100644
--- a/refarch-integrations/refarch-s3-integration/pom.xml
+++ b/refarch-integrations/refarch-s3-integration/pom.xml
@@ -21,10 +21,6 @@
         <module>refarch-s3-integration-starter</module>
         <module>refarch-s3-integration-client-core</module>
         <!-- REST -->
-        <module>refarch-s3-integration-rest-core</module>
-        <module>refarch-s3-integration-rest-starter</module>
-        <module>refarch-s3-integration-rest-service</module>
-        <module>refarch-s3-integration-rest-client</module>
-        <module>refarch-s3-integration-rest-client-starter</module>
+        <module>refarch-s3-integration-rest</module>
     </modules>
 </project>
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/pom.xml b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/pom.xml
new file mode 100644
index 00000000..e3e2b057
--- /dev/null
+++ b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         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.muenchen.refarch</groupId>
+        <artifactId>refarch-s3-integration</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+    </parent>
+
+
+    <artifactId>refarch-s3-integration-rest</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>refarch-s3-integration-rest-core</module>
+        <module>refarch-s3-integration-rest-starter</module>
+        <module>refarch-s3-integration-rest-service</module>
+
+        <module>refarch-s3-integration-rest-client</module>
+        <module>refarch-s3-integration-rest-client-starter</module>
+    </modules>
+</project>
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client-starter/pom.xml b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client-starter/pom.xml
similarity index 97%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client-starter/pom.xml
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client-starter/pom.xml
index d491c169..42ad4435 100644
--- a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client-starter/pom.xml
+++ b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client-starter/pom.xml
@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>de.muenchen.refarch</groupId>
-        <artifactId>refarch-s3-integration</artifactId>
+        <artifactId>refarch-s3-integration-rest</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client-starter/src/main/java/de/muenchen/refarch/integration/s3/client/configuration/S3IntegrationClientAutoConfiguration.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client-starter/src/main/java/de/muenchen/refarch/integration/s3/client/configuration/S3IntegrationClientAutoConfiguration.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client-starter/src/main/java/de/muenchen/refarch/integration/s3/client/configuration/S3IntegrationClientAutoConfiguration.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client-starter/src/main/java/de/muenchen/refarch/integration/s3/client/configuration/S3IntegrationClientAutoConfiguration.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client-starter/src/main/java/de/muenchen/refarch/integration/s3/client/properties/S3IntegrationClientProperties.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client-starter/src/main/java/de/muenchen/refarch/integration/s3/client/properties/S3IntegrationClientProperties.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client-starter/src/main/java/de/muenchen/refarch/integration/s3/client/properties/S3IntegrationClientProperties.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client-starter/src/main/java/de/muenchen/refarch/integration/s3/client/properties/S3IntegrationClientProperties.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/pom.xml b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/pom.xml
similarity index 98%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/pom.xml
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/pom.xml
index 1da39830..4d85adf6 100644
--- a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/pom.xml
+++ b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/pom.xml
@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>de.muenchen.refarch</groupId>
-        <artifactId>refarch-s3-integration</artifactId>
+        <artifactId>refarch-s3-integration-rest</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/main/api/api-docs.json b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/main/api/api-docs.json
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/main/api/api-docs.json
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/main/api/api-docs.json
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/main/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFileRestRepository.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/main/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFileRestRepository.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/main/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFileRestRepository.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/main/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFileRestRepository.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/main/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFolderRestRepository.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/main/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFolderRestRepository.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/main/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFolderRestRepository.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/main/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFolderRestRepository.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/main/java/de/muenchen/refarch/integration/s3/client/repository/presignedurl/PresignedUrlRestRepository.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/main/java/de/muenchen/refarch/integration/s3/client/repository/presignedurl/PresignedUrlRestRepository.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/main/java/de/muenchen/refarch/integration/s3/client/repository/presignedurl/PresignedUrlRestRepository.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/main/java/de/muenchen/refarch/integration/s3/client/repository/presignedurl/PresignedUrlRestRepository.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/test/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFileRestRepositoryTest.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/test/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFileRestRepositoryTest.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/test/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFileRestRepositoryTest.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/test/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFileRestRepositoryTest.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/test/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFolderRestRepositoryTest.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/test/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFolderRestRepositoryTest.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/test/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFolderRestRepositoryTest.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/test/java/de/muenchen/refarch/integration/s3/client/repository/DocumentStorageFolderRestRepositoryTest.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/test/java/de/muenchen/refarch/integration/s3/client/repository/presignedurl/PresignedUrlRestRepositoryTest.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/test/java/de/muenchen/refarch/integration/s3/client/repository/presignedurl/PresignedUrlRestRepositoryTest.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/test/java/de/muenchen/refarch/integration/s3/client/repository/presignedurl/PresignedUrlRestRepositoryTest.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/test/java/de/muenchen/refarch/integration/s3/client/repository/presignedurl/PresignedUrlRestRepositoryTest.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/test/resources/logback-test.xml b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/test/resources/logback-test.xml
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-client/src/test/resources/logback-test.xml
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-client/src/test/resources/logback-test.xml
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/pom.xml b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/pom.xml
similarity index 95%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/pom.xml
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/pom.xml
index 61f9d067..97f0d0fd 100644
--- a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/pom.xml
+++ b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/pom.xml
@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>de.muenchen.refarch</groupId>
-        <artifactId>refarch-s3-integration</artifactId>
+        <artifactId>refarch-s3-integration-rest</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/FileController.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/FileController.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/FileController.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/FileController.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/FolderController.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/FolderController.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/FolderController.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/FolderController.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/RestExceptionMapping.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/RestExceptionMapping.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/RestExceptionMapping.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/RestExceptionMapping.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FileDataDto.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FileDataDto.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FileDataDto.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FileDataDto.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FileSizeDto.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FileSizeDto.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FileSizeDto.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FileSizeDto.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FileSizesInFolderDto.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FileSizesInFolderDto.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FileSizesInFolderDto.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FileSizesInFolderDto.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FilesInFolderDto.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FilesInFolderDto.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FilesInFolderDto.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/FilesInFolderDto.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/PresignedUrlDto.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/PresignedUrlDto.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/PresignedUrlDto.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/dto/PresignedUrlDto.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FileDataMapper.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FileDataMapper.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FileDataMapper.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FileDataMapper.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FileSizeMapper.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FileSizeMapper.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FileSizeMapper.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FileSizeMapper.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FileSizesInFolderMapper.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FileSizesInFolderMapper.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FileSizesInFolderMapper.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FileSizesInFolderMapper.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FilesInFolderMapper.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FilesInFolderMapper.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FilesInFolderMapper.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/FilesInFolderMapper.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/PresignedUrlMapper.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/PresignedUrlMapper.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/PresignedUrlMapper.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/main/java/de/muenchen/refarch/integration/s3/adapter/in/rest/mapper/PresignedUrlMapper.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/test/java/de/muenchen/refarch/integration/s3/adapter/in/rest/FolderInFilePathValidatorTest.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/test/java/de/muenchen/refarch/integration/s3/adapter/in/rest/FolderInFilePathValidatorTest.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-core/src/test/java/de/muenchen/refarch/integration/s3/adapter/in/rest/FolderInFilePathValidatorTest.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-core/src/test/java/de/muenchen/refarch/integration/s3/adapter/in/rest/FolderInFilePathValidatorTest.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/Dockerfile b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/Dockerfile
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/Dockerfile
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/Dockerfile
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/pom.xml b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/pom.xml
similarity index 98%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/pom.xml
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/pom.xml
index e68c7f6c..ead10a9c 100644
--- a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/pom.xml
+++ b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/pom.xml
@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>de.muenchen.refarch</groupId>
-        <artifactId>refarch-s3-integration</artifactId>
+        <artifactId>refarch-s3-integration-rest</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/S3IntegrationApplication.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/S3IntegrationApplication.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/S3IntegrationApplication.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/S3IntegrationApplication.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/CacheControlConfiguration.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/CacheControlConfiguration.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/CacheControlConfiguration.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/CacheControlConfiguration.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/ForwardedHeaderConfiguration.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/ForwardedHeaderConfiguration.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/ForwardedHeaderConfiguration.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/ForwardedHeaderConfiguration.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/JwtUserInfoAuthenticationConverter.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/JwtUserInfoAuthenticationConverter.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/JwtUserInfoAuthenticationConverter.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/JwtUserInfoAuthenticationConverter.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/NoSecurityConfiguration.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/NoSecurityConfiguration.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/NoSecurityConfiguration.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/NoSecurityConfiguration.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/SecurityConfiguration.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/SecurityConfiguration.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/SecurityConfiguration.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/SecurityConfiguration.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/UnicodeConfiguration.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/UnicodeConfiguration.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/UnicodeConfiguration.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/UnicodeConfiguration.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/UserInfoAuthoritiesService.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/UserInfoAuthoritiesService.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/UserInfoAuthoritiesService.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/UserInfoAuthoritiesService.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcHelper.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcHelper.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcHelper.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcHelper.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcReader.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcReader.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcReader.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcReader.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcRequest.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcRequest.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcRequest.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcRequest.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcRequestFilter.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcRequestFilter.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcRequestFilter.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcRequestFilter.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcServletInputStream.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcServletInputStream.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcServletInputStream.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcServletInputStream.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/security/AuthUtils.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/security/AuthUtils.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/security/AuthUtils.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/security/AuthUtils.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/security/RequestResponseLoggingFilter.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/security/RequestResponseLoggingFilter.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/security/RequestResponseLoggingFilter.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/java/de/muenchen/refarch/integration/s3/security/RequestResponseLoggingFilter.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/resources/application-local.yml b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/application-local.yml
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/resources/application-local.yml
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/application-local.yml
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/resources/application.yml b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/application.yml
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/resources/application.yml
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/application.yml
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/resources/banner.txt b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/banner.txt
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/resources/banner.txt
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/banner.txt
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/resources/logback-spring.xml b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/logback-spring.xml
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/main/resources/logback-spring.xml
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/logback-spring.xml
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/test/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcConverterTest.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/test/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcConverterTest.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/test/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcConverterTest.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/test/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcConverterTest.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/test/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcHelperTest.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/test/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcHelperTest.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/test/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcHelperTest.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/test/java/de/muenchen/refarch/integration/s3/configuration/nfcconverter/NfcHelperTest.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/test/resources/logback-test.xml b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/test/resources/logback-test.xml
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-service/src/test/resources/logback-test.xml
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/test/resources/logback-test.xml
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-starter/pom.xml b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-starter/pom.xml
similarity index 94%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-starter/pom.xml
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-starter/pom.xml
index 0ba81f57..7c2205e7 100644
--- a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-starter/pom.xml
+++ b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-starter/pom.xml
@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>de.muenchen.refarch</groupId>
-        <artifactId>refarch-s3-integration</artifactId>
+        <artifactId>refarch-s3-integration-rest</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-starter/src/main/java/de/muenchen/refarch/integration/s3/configuration/S3IntegrationRestAutoConfiguration.java b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-starter/src/main/java/de/muenchen/refarch/integration/s3/configuration/S3IntegrationRestAutoConfiguration.java
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-starter/src/main/java/de/muenchen/refarch/integration/s3/configuration/S3IntegrationRestAutoConfiguration.java
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-starter/src/main/java/de/muenchen/refarch/integration/s3/configuration/S3IntegrationRestAutoConfiguration.java
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports