diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 411e9262e63da5737e455ecb35ad59d1e998fca1..a39778112bdcad709ea0500176958fbfd080314b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,12 +2,19 @@ include:
   - project: 'fit-connect/pipeline'
     ref: main
     file: 'reuse.gitlab-ci.yml'
+    
+variables:
+  MAVEN_CLI_OPTS: "-s .m2/release.xml --batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
+  MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
+  ENCRYPTED_GPG_SECRET_KEY: "U2FsdGVkX19sgs5SAergNISd1D5CfXljYKPtPM7kAaAOXyC3oXjZy2igEGavVGW0fCi9IG+g8bvejWWkM7YIm+d6n+yS8TGhBuYnMforExJ56h3zODligGSHa4k85BwHwliT+j2pSKnWZ7M1tAKRmF6foftAZMHOCtfRUxc7n4EJEaZtq3pnPnthe9NxvaEqjd72iEXbdwFjhI1NnjvRlbBF+luUbHGfjHfwyyMTtNNN79wcmDSU7pIbEnvmikuETdYKDi9pT2137s3f58UcdTnD8zjmT5F0UkLXXTvtrroDGVB/xHKG7ttsj4/uvhCOTxkA5vKUDz6QgaGXjmIEwhlu68reodliDWlz7L4nlAS2dIDevFNbzgFG2m5ebYCd2TpjvXF0irgS1ENpCScAFX63SlFPl6/KKyp/sCVi34xDunSClzEBX9Hebv/ACyuKjz4owZKr8YhzDOzJTSphoj+1Xb678GFnfY6T5amaBTrGSR6U2YbOKWp5/fO/GIoercRxywF17DoGF+AZs1bmptVpltcr/4XWQDTW+c9Nmg+6h/2WJ396Hbj+DmpekYuDNCE6sDosANwTyXWSVM/N96MG+WlomRpvDd+A7KuRZ0INGnctx4r2isn0mr9dH7VVAQ9PIafKLiXH4Ynzjn7iBQtapIA0da13qy31vOWqG1wb41v97So+zi7/xEa3W9tHzOGjRjdoMNWej2tC0Qq5yaG6vNGJ6a65ZAB846QcpHqZFa+pziOyoIbwshVq5fkz22HiJsDCzNmmqKFquLQG2K1KgyuVxBEeamFhKhfEDSlZEi4ig2WclbxudhIGfGtD7uG502pVGCz6OOQ6iguj897ZZ2SoJC1jTkd9xMCZ0rOjpcPEU7+EvtxWNc+kvX875u1J7Mlmj7SKu+BcaOJVOY+RmiMSb0WuCuNtgmHEGXs8/EWZ4kowrVsNe0nP9I778u/flP6dmOoTDxS4XchkcRHlHXHrSZrN5c/9m9wQF5QcNy8fV4SlghTU5Evmtx6AT/NLltzyvfhTgsV2/DCqPbDeYKNMUm5SmZsL+9PR+I2FntcTiMOW+97K5DwrNSXNIPknmYfcJo0+Q/X12s98iaNrcR2XDO6hBXNGh5xQWcp6EazZTtTxDEs7SA7TU5G1BfqwueT+lxzA0WifH/XPZEMu0n9vY/53qVhvMgO5ObKVsWpYQzlgqGlGLN99lBdP4NRkK1St6fDpw2BS3iPuEH1pPzKA4MlvFJdmv+FRAq5rd0EJDYIpty6lL9JW8Lk3y7VQJ/JPQcAAZMJIhfT4ZXiMpWV+bzG9H+mwbzUcmkdhf9zgEXY9cGEl0yX4iwNZba6/7XvPxoDmJJXMakKdujWoT1WOcAQcTjFlBFUsnQgaWH68soFU4Z0krha/Dbc9fOlGFvtleOr4yLyFIn+og7jw53qrLfZvOouWb7ClJj1f6mEU2YRU9qVxjPM7rTTowN4/ulLRja1F0llOA6nQTRitZTB5sRUCkmrdECuhCcf8XViCDUrehL6Uul2J57uVRsTyLPD34uDhP+H6BP9rJrzLlSBXE33X+lyDOEpRXlLplb+OK8oH2+DeimQyVmek5TPTsd6YPTQqNXRn7v5vqCSGTMaAQGS77L/g4pHRpqSzzp7Vi1nNgb76oOgQ7p050DD94qpChOP5bKwrBlc/tccFHmmaRhJq1CN/06ReelhUhF9kpOeB9AgZlGdhA3jiJLzYyBNIF68Zsok6W5s3TNapeBA30zEjUn9wynDC+wHOLPmbRcmrrM5b8awPUm5IiT8blwvYiSW44BA+WU3SY60C1uglkFDfoomIXXY5avZVraGNjvTKonBwcq2gQlAJmvl8n2CTZAznMYS/cmln3b/1CR4y61Rjz+k1aOklUwtfuQidTQoIv2dAasdpktl2uGUqg3QMaRrQT3IfRm9gKcSse9j9j1TPbTvFkRnhaHRGbMjwSlAhQNEujOl4XpmN/VpZM8O2PQSOLj0f2Shbo7dFFtxcMQBR0bWy82WYQs3CUiMlIOyMrDsHwAQYkh6Vq5I0ogHnl7SwebtvY1Hiw01RnZe0n8If6ZLKviJ3MVOhHdFFgldsH6MJ9+DxTxS7PTSKLA5v4R6azorsG5FCVUxaWF/lcEvOgShb+CySGWJniyyQPd5C5B8vCR6lEOdgbqm3zFMsQR81SmpmP4te9HO/Kmi9/g3QV8+YfxpaGtkHnZH4Oq79A5p8r6iEJrjSdKAbZzG8/wsFJAyZI1U0C+D6pT8Om2dxJ663IjBYEPKw0iMqb+rb4KCfrBqPAEJ2uInqDVmbP6TMUS9skRJaU7pZHdNxo6TgsQ/xZ8JT7mU0VKN9SBhWzut/178kA3Is6Okh4134njOYP0OUXCvS4e0B7bzOrzOcXemSLA6CdXLHPRnWDQxg8XtxeyI5AFYL0C25qJ7kPImExYyAyiEJz2ZlIfeOonqOepKgtUYiCU12rYLJjicGT7Ikj09C3XPgeqX9yfJwHmMvQE6PIJKiN82bU4X2JQEMPwsiFBKRqOkoK8TFEDC6dvnse+Dr6pSbGko2NQqrfXiGKOctnOPKgw81Ncf6SvL3CY9q5b1tkDO+wSTFXo6myQUMH+BIQK/uz38AfC3jnr5H+h+4hyhDn2lU8T0zBdBaFPeg6Gt6PsRCEhHRPymrpOd3ap1N/HCzxiquWLA6Sgcwamai/iPysssBtfJELfr8QQfRRN+jwMZzOvreed2yrmsn2r5fZIALzZhAMkfosf95yIxCGc3CpJOFVbGUQsctVUCzdL0JlD9q6n/waT3Hy/NIBtrm0lxet7gZgMzogFgltKJChfaokWQep64Mis0o0iT+Sj3/maLmngBg3DKTGF9Qa81a6Us4liyGh/5LoUKJQUUjv+DQu5WVOhdrXG33gyYcInbKjoEd3U/GKnpeXKeWnW5IG5FzJKtMRTX6cqPsq9ik+tjb1tivkvUxqNgQcPcepSgFZSrqOo66BwmDWulx1e3XKbdsFFKRnM9sPf+xxQXJSP6p0GQxFBiHkAdNhkd/kc9dS4uKZZ+B7C0o20rBeh7Axe1JGaoGjHKHMrxxwQ7AI6OLYX593DxCfuBaXF8CSAiEY/oZFYixqLIMborWK6Y7CITnILq+s6OQxX95ceHWr/1RuxOWo/tIHF4GA7JToVlRhI2S4vVntzBY9y6Pdd+HBGzXfieFSfZWLgAdJ/VrzlB7RZMlPkGkBLEDMno2Zq0hhvJImbFUwg43rKzMjy+Cr1tjVwEzrhVWkVrQgnxe2PdrEUFjGVZ02Je/8mtbhRv9FDVN4x68JVE5zrGNsqnzpQ5isIQMrvtQIf1ZktNetVIshz11mvcRNEAEBCj7oRzonvqgeRG6JPvDsOjz8hcwzvyrOiicMfDIv5Ft+n4oo9sOEANgCpCu+2LgTQnWC2JTI4MdwvAcUaqSv2MHz5KhjMduR0f9eDFu2ow5OhWYgczIHFDKI36ak6QqPpjoL1xgNMVY7srsHtJ7hFnjiBPh5gHHBFZIOQuKEEB4BErP/AM2U+0ONc5QgmHcSa4fqd/yeuRRKUDE3SLQLqRoSHhj854aBv9hXwMX4Mb4x+tu0TDRkIcPiiANSpEk5HPY2gMGHAxxWrxWsLC7k16ZBCoc76BgxO46oXyh57WPkamdyrgMAXDmPP9MrOSffBMbafyuRbbvF2PkF11GUbJxyJYxWN5XMPCGFhVYkb2ZiXB5Dhws04iaXw7PGp3/f5shAx6lspPg57RvDZz4P2ZzqHScUA0vvFNehv792K1WNdG7LELEalAPe0NcBYJRrXq0Jbt0CjZjr90eUASqGVXR6K7hTPHAP+xKO0jW65HpW+5wmLgxGD+pZimGGFxkRtLiafwXLXs9GATGzvZaNR7n/pI23w8BvPAXwcEwZZMpvePZ+aJlFqZFw0SIRUecW9KBhiCYqOVGmXNJpOoBP5XlpWl6L7+ict4wH0/+eAoRMgc6qDVPaysawhHns8niYciqQhkEcz3WucXQYKOvLyhmsTHtkkkKPrJxDV6k97LL8wUuyPNVvUL4X3GFWjlLFpEDX5B0RE3wB/SkSfDY0oxDrQyEHpGeO4mTJthQvsJMl/XUhRC6o0wVodL4coe0qFKQDK8XP35kyUcpBysy8M+dzA25x60fvv4bgb42htYtNEfDP2hM35aVHRQIS0E9QkTaaTzfBZMYemlvyJy39LRotaqJ/Fg8LKstcey8IhS8jsIDZkDkjd2sqV4YfjW0Zgi56sGo2dXs0Kk9GY5jvQmr20jaiz+E/u/cP1S3r1iS9BKCoPEpmt8uF4gb56z14xVN1d8+KJMpjYCpspMaIuH4L5LzcDcIxEMlM/+gc0ZcXxfVGFfgwuMsS4ldZAS6KYF/X6BJGRNmXE/KCMLm7T8J/tp818M0uSh8n8AQGvDKdSAgt7E2HpUB3RYY0uMlkDbsiOeG1e1LC+JStScj5qCIw9rCuBionYKbCRBoYcR7Aev2A+qNfkR+GLdL4m0GPB7fUTffZ6PXVRIhnJteIwIrgw9XZ+K59QHUmlJ3Ifvcz6IpV1MAB1ji5WxG3+wuFqqfanhbHuc6HjrUgMq/y+vGLqovT1S9CiNcGDsCL968BIvJDgrG+2ic2wShCDHNkIvFCko/GY00obGPTeSiTJRylxNRe9wAepYHsgk3MMWmC3MTWpVYU320mxfJIphnKMM0F47e3205OX67vY7Fdlrh/hWstSon54i/krE350MtdapaE3l82M5QGuVcmmWun8cAKjJBLZ6vVi2MqolWuRVs8TkZhb3vnINAy3ZeZeYlsrNDLApXcBxJnlvjO4HQLjjl8VmZ8Zc0bREuwEm/fFTaOc+6CA5T2xtSfS5uNsQbxbtWvvtKBApj8pHhqxjEzHnzvmmCNkgj21baHGemuJwdkhkLjODuW3ctPw9po/aVfU/HVCbWHrBmMi8d0ZvJyWadSpYD+EvWMkNXzYT4UMjXFZbPOff17LtMtMs3s9UXwNMtNLVfuNjOaLw0NWQ52vr8dqBBKmB4AksplvNXdcB03chI8N7+WeK+tuxD4ifaFwGRYl/pWMUkBbh8xSTG5U9szFUmZ8647/JzPBttNcqFgYI+8rqIs+GIEPqWcH6Aay2gtqv2DKDiuVlHZmtknRtCHnA7Ty3yUnPLZdumY8Unro8X49/8D24YjbVY+nQLic5Rb7fsrd0R0eHoakVdDW9diRE3ayD++qxMpx/JEv5yCsnxgbi67XI53nmXKQL4G0jEshDXPg32aAt99+b/LK+oovxNUJOivkpiOJJ/hjmyHuDo89ZgiWbeM+iRgzlWbl+pLHtsb7hOCkP5dAFWi+tnRTKmJUDgSH/GR9qG2tSQcHpMNw0aTnu0YlImUPoSoH83Z0HBz7Pgo9mH4XOtxm2jAeMcLKY6zIUAhYNJ8AtGD+DL6PmDaBvzxIZBv1X5c1AP66dg8Ntx5tzF6yt4DdO/O/PM4pT3vBpsIfXSBLfjyA4D+C6UjAJntTafqaW40IOIy8aHY1vUxgWMzVl49w+trls9yovZJbPFL1WBScaTtUPqk41N3ou1T09f08hdz+xGo4vLdrKaNNLJhrvEKzCxF8qU+FENMDU0n55smQ82PrChxQWSWVcYHFvqG4Olr4h+/Hd6u0vfZqY/DKn3mt1jIppS+DuGo/jVluJ9wfTmCHzSVJTR8t/DWpAKXsP1VVrIpfdHxq9pkPAaSRxkImTXAMqD2Q1PBpphZB/PiuiCG+x7GfBEJZsh4SH2oAFwueylvB/5b+gJJBDAJegepFrXrBpu89dpyQiVtkUdzpaNrvYjeUm8iSqgIoSocS1iezeojNkCcZIdQZ1DYPpuIaNKVdIiw1I0cQyXrbPC3qZtp8jBmjo+VpF1/yyuCeJohHaybvS3/iEonWo3pOnTeQEgBeI5iGQWWPIc+Aabwy41AcRTgC/E63xaw/yYj1ptP10Txm8i4ix4QibuuXvGIGhq3uiVIgprthLKeaPAsmalvS+UNFJ9b6F40kXIpl6qcFP+qPMZkAfUlob6Lh4ZmV+fUccWpQ1neV1vdAJsCAjxN0lx2w6Rse1YBfsdU4pmCTN78EeDNOQtAoLJyyKcJgUyeJw6YqpDxWdzlfM+Q6FVCOdbv+PjpPralmKv2e+z76H9GFXQ6NqyL6cLHNoGLO/YQ4nvbZfrkjuH24pTafND4QREqWaagdAje7oPjfrYeWzbUEh7gfqVo//BvCNXzaj24MpaWZH6opm66WhikXfPTqI4j4x03GO4b6WqG2LFuwg8tf9ABZLJAYq8qFbDMm1wxMrA/sYpmfYGul3pSQ+tlUzVfHB/ubCbGeFTeRarmqWtbqIInGMOpGxUyBeuEu8k1Ehu4v869NdPYcgL0LrliW1y9Dav/asqegKLiA2Vuw4qlyfSBFG6nqDShfjeSKm9trFXf/EzkpL/OQyiwbJooKYrJnFPvFFq5/o/uvvMHj/Kbvjuq9i7tfyGixQDiDbb0is8bSgD4+rok5pxuGESE+kMMep5lUzypDWTDvZWlbi1bj9CaGC2z8uY2eC5RTEGth9L7wyfLMls/hNZZ/qCQUpD8+fCQ88jd+ZWq/Au528+Wpje9AcgieNE0cYFSXtK7r1VIW6nt50EaHHpafJTJut8tGTepVaERPg9Kt625J0cZjo3BgEaPdcTh5gPGW+0RzfZa4+x3N+78R8qKpKCSMyk45FJbeiu+R0TujpdCUqmQVTIWhj2XeV0s2nu8uS8k7/fzDV+k12o4La0A2xxx+GQR8TnCznoQadZ6IX/IZGvnsdUfsIgEwLxB/TtFcR8mL1IdYk="
 
 stages:
   - lint
   - build
   - test
-
+  - package
+  - deploy
+  
 cache:
   paths:
     - .m2/repository/
@@ -23,3 +30,28 @@ test:
   stage: test
   script:
     - ./mvnw $MAVEN_CLI_OPTS test --no-transfer-progress -T2
+
+package:
+  image: maven:latest
+  stage: package
+  before_script: &gpg-setup
+    - apt-get update
+    - apt-get -y install gpg
+    - gpg --version
+    - echo -n $ENCRYPTED_GPG_SECRET_KEY | base64 --decode | openssl aes-256-cbc -pbkdf2 -d -pass pass:$GPG_ENCRYPTION_KEY | gpg --import --batch --yes
+    - gpg --list-secret-keys
+  script:
+    - ./mvnw $MAVEN_CLI_OPTS package -DskipTests
+  artifacts:
+    paths:
+      - target/*.jar
+  when: manual
+
+deploy:
+  image: maven:latest
+  stage: deploy
+  before_script: *gpg-setup
+  script:
+    - ./mvnw $MAVEN_CLI_OPTS clean deploy -DskipTests
+  needs:
+    - package
diff --git a/.m2/release.xml b/.m2/release.xml
new file mode 100644
index 0000000000000000000000000000000000000000..080c02b0bd5b036667c9c884e2876b440ebd5262
--- /dev/null
+++ b/.m2/release.xml
@@ -0,0 +1,16 @@
+<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd"
+          xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <servers>
+        <server>
+            <id>central</id>
+            <username>${env.MAVEN_REPO_USER}</username>
+            <password>${env.MAVEN_REPO_PWD}</password>
+        </server>
+        <server>
+            <id>ossrh</id>
+            <username>${env.MAVEN_REPO_USER}</username>
+            <password>${env.MAVEN_REPO_PWD}</password>
+        </server>
+    </servers>
+</settings>
+
diff --git a/api/pom.xml b/api/pom.xml
index 254edec8f51855f947de0f000f76ce02f2c210c5..60bee28c928f4521f4dc7f9a1c843c93dab94564 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,13 +4,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>sdk-java</artifactId>
-        <groupId>de.fitko.fitconnect.sdk</groupId>
+        <groupId>dev.fitko.fitconnect.sdk</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>api</artifactId>
     <packaging>jar</packaging>
+    <name>FIT-Connect Java SDK - API Lib</name>
 
     <dependencies>
         <dependency>
@@ -35,4 +36,13 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file
diff --git a/api/src/main/java/de/fitko/fitconnect/api/config/ApplicationConfig.java b/api/src/main/java/dev/fitko/fitconnect/api/config/ApplicationConfig.java
similarity index 95%
rename from api/src/main/java/de/fitko/fitconnect/api/config/ApplicationConfig.java
rename to api/src/main/java/dev/fitko/fitconnect/api/config/ApplicationConfig.java
index e2ed195d3ece36cffe271de928e1c7fb3aac47be..35f4896e117fe300b765d1a794c3251ec1e9ff6a 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/config/ApplicationConfig.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/config/ApplicationConfig.java
@@ -1,6 +1,6 @@
-package de.fitko.fitconnect.api.config;
+package dev.fitko.fitconnect.api.config;
 
-import de.fitko.fitconnect.api.exceptions.InitializationException;
+import dev.fitko.fitconnect.api.exceptions.InitializationException;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/config/Environment.java b/api/src/main/java/dev/fitko/fitconnect/api/config/Environment.java
similarity index 86%
rename from api/src/main/java/de/fitko/fitconnect/api/config/Environment.java
rename to api/src/main/java/dev/fitko/fitconnect/api/config/Environment.java
index d92f607d8bf4d713b3181a9eabff539572d7ec0e..8e63012d0ba7c19fcbf36bedbbc72f6603d2e2db 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/config/Environment.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/config/Environment.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.config;
+package dev.fitko.fitconnect.api.config;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/config/EnvironmentName.java b/api/src/main/java/dev/fitko/fitconnect/api/config/EnvironmentName.java
similarity index 77%
rename from api/src/main/java/de/fitko/fitconnect/api/config/EnvironmentName.java
rename to api/src/main/java/dev/fitko/fitconnect/api/config/EnvironmentName.java
index a793ee2b59d90aeafcb4a3b9ef4648171ee34288..5588013d4765fcab482a60f0bba146516fa366ca 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/config/EnvironmentName.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/config/EnvironmentName.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.config;
+package dev.fitko.fitconnect.api.config;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/config/ResourcePaths.java b/api/src/main/java/dev/fitko/fitconnect/api/config/ResourcePaths.java
similarity index 91%
rename from api/src/main/java/de/fitko/fitconnect/api/config/ResourcePaths.java
rename to api/src/main/java/dev/fitko/fitconnect/api/config/ResourcePaths.java
index 0d71a7e991803d7db2a10fff041487eb13c99ff2..5fa64a5b311e7658e821b2784af09cfe9ab19ef1 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/config/ResourcePaths.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/config/ResourcePaths.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.config;
+package dev.fitko.fitconnect.api.config;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/config/SenderConfig.java b/api/src/main/java/dev/fitko/fitconnect/api/config/SenderConfig.java
similarity index 84%
rename from api/src/main/java/de/fitko/fitconnect/api/config/SenderConfig.java
rename to api/src/main/java/dev/fitko/fitconnect/api/config/SenderConfig.java
index 545f1e0ea61368d19e8d27440f1c8176782acb7b..b84dae690aa3e8b30d74373ce520dbe3509aded6 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/config/SenderConfig.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/config/SenderConfig.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.config;
+package dev.fitko.fitconnect.api.config;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/config/SubscriberConfig.java b/api/src/main/java/dev/fitko/fitconnect/api/config/SubscriberConfig.java
similarity index 89%
rename from api/src/main/java/de/fitko/fitconnect/api/config/SubscriberConfig.java
rename to api/src/main/java/dev/fitko/fitconnect/api/config/SubscriberConfig.java
index dd36cca40bd823e72064e0d4f7bd3700a01b0667..216944be65ac49e3790809d73ec1d1c791744fae 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/config/SubscriberConfig.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/config/SubscriberConfig.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.config;
+package dev.fitko.fitconnect.api.config;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/auth/OAuthToken.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/auth/OAuthToken.java
similarity index 91%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/auth/OAuthToken.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/auth/OAuthToken.java
index 0bed77819750d986083216ca0931ebb54c599946..7f514d344d899a50f3df5b52ed7f68ea97c28621 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/auth/OAuthToken.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/auth/OAuthToken.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.auth;
+package dev.fitko.fitconnect.api.domain.auth;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/ContactInformation.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/ContactInformation.java
similarity index 87%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/ContactInformation.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/ContactInformation.java
index b1ecb919e996f1c45c8149cdf74a20426be643a3..61413a0c745b5da28cea7ae3c605c31ea026c733 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/ContactInformation.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/ContactInformation.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.destination;
+package dev.fitko.fitconnect.api.domain.model.destination;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/Destination.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/Destination.java
similarity index 87%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/Destination.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/Destination.java
index 2d405d47137c585b7a29a02e1a503f1abd1a4170..f19c30d6106c82d8e3cd4f3917a424a63dfd0041 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/Destination.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/Destination.java
@@ -1,8 +1,8 @@
-package de.fitko.fitconnect.api.domain.model.destination;
+package dev.fitko.fitconnect.api.domain.model.destination;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import de.fitko.fitconnect.api.domain.model.submission.Callback;
+import dev.fitko.fitconnect.api.domain.model.submission.Callback;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/DestinationService.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/DestinationService.java
similarity index 78%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/DestinationService.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/DestinationService.java
index 93573f1a876fc4467a52942d3923e0be2f798a54..868bb6fb94c24027f8848932d0d866cc29114db4 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/DestinationService.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/DestinationService.java
@@ -1,7 +1,7 @@
-package de.fitko.fitconnect.api.domain.model.destination;
+package dev.fitko.fitconnect.api.domain.model.destination;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import de.fitko.fitconnect.api.domain.model.metadata.data.SubmissionSchema;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.SubmissionSchema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/PublicDestination.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/PublicDestination.java
similarity index 92%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/PublicDestination.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/PublicDestination.java
index ff1fcff5e287f2c860846891dbf4b1486085787b..a5e6d1883eb34d8088335cb1de4fa48e22a1f7ef 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/PublicDestination.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/PublicDestination.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.destination;
+package dev.fitko.fitconnect.api.domain.model.destination;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/ReplyChannel.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/ReplyChannel.java
similarity index 86%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/ReplyChannel.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/ReplyChannel.java
index 02a121d0f3d8dead6091d95dcff110300acd6e2f..fd3a8a0565ec0a368883c09b8569f464681b1a04 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/ReplyChannel.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/ReplyChannel.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.destination;
+package dev.fitko.fitconnect.api.domain.model.destination;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/ReplyChannelEMail.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/ReplyChannelEMail.java
similarity index 84%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/ReplyChannelEMail.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/ReplyChannelEMail.java
index 1b5b1b81f4d363fa1cef945b49ab742eac33fe56..ed32bc9179829fd836574367d471c55b3681b335 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/ReplyChannelEMail.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/ReplyChannelEMail.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.destination;
+package dev.fitko.fitconnect.api.domain.model.destination;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/StatusEnum.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/StatusEnum.java
similarity index 94%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/StatusEnum.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/StatusEnum.java
index 5f5638798f584d21bdfa405fe0980ec69f8d9a13..6867c932415b39a5723fbbc655204868f95544ba 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/destination/StatusEnum.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/destination/StatusEnum.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.destination;
+package dev.fitko.fitconnect.api.domain.model.destination;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/event/EventLog.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/EventLog.java
similarity index 89%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/event/EventLog.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/EventLog.java
index 4baff786651862269bfb2b27887368c4d171f9e0..c18e3daa0fa0046ff153db238ea3b70c80766171 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/event/EventLog.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/EventLog.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.event;
+package dev.fitko.fitconnect.api.domain.model.event;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/jwk/AlgEnum.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/jwk/AlgEnum.java
similarity index 95%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/jwk/AlgEnum.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/jwk/AlgEnum.java
index 630b85ec781fa3e4ed396a1673ebfa1bb4885bd4..ed3323cd88f7da699892edae97c55435c38764e9 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/jwk/AlgEnum.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/jwk/AlgEnum.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.jwk;
+package dev.fitko.fitconnect.api.domain.model.jwk;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/jwk/EEnum.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/jwk/EEnum.java
similarity index 94%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/jwk/EEnum.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/jwk/EEnum.java
index 4d6273e4bc94b8c37a0637823e5b586579ae2a0d..731ec62ddf0280d3f81bd508fba7890d67d92cf9 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/jwk/EEnum.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/jwk/EEnum.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.jwk;
+package dev.fitko.fitconnect.api.domain.model.jwk;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/jwk/JWK.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/jwk/JWK.java
similarity index 92%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/jwk/JWK.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/jwk/JWK.java
index 9cad8a42eac1d3638d9b46d963cea9c5ba199f1f..424be0c9083719310b42c89e427409ebfe58208f 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/jwk/JWK.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/jwk/JWK.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.jwk;
+package dev.fitko.fitconnect.api.domain.model.jwk;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/jwk/KeyOpsEnum.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/jwk/KeyOpsEnum.java
similarity index 95%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/jwk/KeyOpsEnum.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/jwk/KeyOpsEnum.java
index e8e18709d3c1a9461ed25fd6e5d3185325367dc7..6483138db3f1673360ebaeea62b5b45cc731a6c4 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/jwk/KeyOpsEnum.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/jwk/KeyOpsEnum.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.jwk;
+package dev.fitko.fitconnect.api.domain.model.jwk;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/jwk/KtyEnum.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/jwk/KtyEnum.java
similarity index 94%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/jwk/KtyEnum.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/jwk/KtyEnum.java
index 10c7b24c19a03c3438a6ea4fb143363c62e067d0..fb069acdad9c1d9af25590ad92cbdc4b1d00b9d3 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/jwk/KtyEnum.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/jwk/KtyEnum.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.jwk;
+package dev.fitko.fitconnect.api.domain.model.jwk;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/AdditionalReferenceInfo.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/AdditionalReferenceInfo.java
similarity index 90%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/AdditionalReferenceInfo.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/AdditionalReferenceInfo.java
index d28cb6ba4e2acbeeb270dcc90787656dcf338d5d..2f5296ed24fbd5e4d77714dc003e5e08f2160cf5 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/AdditionalReferenceInfo.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/AdditionalReferenceInfo.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.metadata;
+package dev.fitko.fitconnect.api.domain.model.metadata;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/AuthenticationInformation.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/AuthenticationInformation.java
similarity index 86%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/AuthenticationInformation.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/AuthenticationInformation.java
index 1bd3de5dbb84bd84cbd6fa3786def90a068e1fb0..0ce795d7c6a22a67b4912c6a2b0d8a75f039e15a 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/AuthenticationInformation.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/AuthenticationInformation.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.metadata;
+package dev.fitko.fitconnect.api.domain.model.metadata;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/ContentStructure.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/ContentStructure.java
similarity index 73%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/ContentStructure.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/ContentStructure.java
index 9931774f8418db383429f8897fa12a63aa78067a..053e789b3613b176caba7b38c47d1cb10e2c1186 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/ContentStructure.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/ContentStructure.java
@@ -1,10 +1,10 @@
-package de.fitko.fitconnect.api.domain.model.metadata;
+package dev.fitko.fitconnect.api.domain.model.metadata;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
-import de.fitko.fitconnect.api.domain.model.metadata.data.Data;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.List;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/EidasAdesProfile.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/EidasAdesProfile.java
similarity index 97%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/EidasAdesProfile.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/EidasAdesProfile.java
index c8e87c22c5bd5c6c9497c0e24dc5ed1abd8dfc0d..f9192ffa3762333c8eb81ec7d6df8c9813729fd1 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/EidasAdesProfile.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/EidasAdesProfile.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.metadata;
+package dev.fitko.fitconnect.api.domain.model.metadata;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/Metadata.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/Metadata.java
similarity index 93%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/Metadata.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/Metadata.java
index 3026fffb2e8c02ebcc4faec2c7c9b4ba09ab5a73..3761f6c6cc31242cb280936045a82a59bb0ba0c0 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/Metadata.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/Metadata.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.metadata;
+package dev.fitko.fitconnect.api.domain.model.metadata;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/PublicServiceType.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/PublicServiceType.java
similarity index 90%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/PublicServiceType.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/PublicServiceType.java
index 407f84dcf124e8f4f897eb4b28b154a3d17b2ccb..831ea5ebd30231e69dfe82a656ee1b01cce6c2cb 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/PublicServiceType.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/PublicServiceType.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.metadata;
+package dev.fitko.fitconnect.api.domain.model.metadata;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/SignatureFormat.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/SignatureFormat.java
similarity index 94%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/SignatureFormat.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/SignatureFormat.java
index 11e2efdc859235c86d4d0aebd6e843cab9137e1a..1973e845c5ab960a170fced1b6d0f4ff14a31075 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/SignatureFormat.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/SignatureFormat.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.metadata;
+package dev.fitko.fitconnect.api.domain.model.metadata;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/Attachment.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/Attachment.java
similarity index 78%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/Attachment.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/Attachment.java
index 2c953c9c8ae89e8d3193e784220027c9c1e8c029..a61c03e9fd768826a49f3a76ee67970154407802 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/Attachment.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/Attachment.java
@@ -1,10 +1,10 @@
-package de.fitko.fitconnect.api.domain.model.metadata.attachment;
+package dev.fitko.fitconnect.api.domain.model.metadata.attachment;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.signature.Hash__1;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.signature.Signature__1;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.signature.Hash__1;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.signature.Signature__1;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/AttachmentWithData.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/AttachmentWithData.java
similarity index 81%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/AttachmentWithData.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/AttachmentWithData.java
index 2a652889b94340b49ee07f106829d8582a1f18df..f76c54477d72e08e2285013559a38840e176e9a9 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/AttachmentWithData.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/AttachmentWithData.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.metadata.attachment;
+package dev.fitko.fitconnect.api.domain.model.metadata.attachment;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/Purpose.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/Purpose.java
similarity index 92%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/Purpose.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/Purpose.java
index 1df21ac81fb2b11aebb66004ab9286f00e20eb8c..5e12c15d01b2218be1dc1f99ac9bdacd9e6eb25e 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/Purpose.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/Purpose.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.metadata.attachment;
+package dev.fitko.fitconnect.api.domain.model.metadata.attachment;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/signature/AttachmentSignatureType.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/signature/AttachmentSignatureType.java
similarity index 91%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/signature/AttachmentSignatureType.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/signature/AttachmentSignatureType.java
index 12366b0449162ca08957f5342255826fe8d87df3..003d0356d56354e5812ac434606c8323a4b5334b 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/signature/AttachmentSignatureType.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/signature/AttachmentSignatureType.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.metadata.attachment.signature;
+package dev.fitko.fitconnect.api.domain.model.metadata.attachment.signature;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/signature/Hash__1.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/signature/Hash__1.java
similarity index 87%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/signature/Hash__1.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/signature/Hash__1.java
index e85e57048e02d579707b5e8766cc9fa32b8ed41d..c707767c161315f534117ec7b1adc0625ba7c66c 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/signature/Hash__1.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/signature/Hash__1.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.metadata.attachment.signature;
+package dev.fitko.fitconnect.api.domain.model.metadata.attachment.signature;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/signature/Signature__1.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/signature/Signature__1.java
similarity index 76%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/signature/Signature__1.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/signature/Signature__1.java
index b6958a2c1fbd2c23d3ab88d7709e06e5185ef36c..5d7068edb90db185148346d887bb36a640b37760 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/attachment/signature/Signature__1.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/signature/Signature__1.java
@@ -1,10 +1,10 @@
-package de.fitko.fitconnect.api.domain.model.metadata.attachment.signature;
+package dev.fitko.fitconnect.api.domain.model.metadata.attachment.signature;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import de.fitko.fitconnect.api.domain.model.metadata.EidasAdesProfile;
-import de.fitko.fitconnect.api.domain.model.metadata.SignatureFormat;
+import dev.fitko.fitconnect.api.domain.model.metadata.EidasAdesProfile;
+import dev.fitko.fitconnect.api.domain.model.metadata.SignatureFormat;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/Data.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/Data.java
similarity index 90%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/Data.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/Data.java
index 5cf3349f6555f78c88e3d9256fcd49616bad9303..e685033a49ecd034d25bcda18a70c6f0315c1973 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/Data.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/Data.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.metadata.data;
+package dev.fitko.fitconnect.api.domain.model.metadata.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/DataSignatureType.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/DataSignatureType.java
similarity index 92%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/DataSignatureType.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/DataSignatureType.java
index 56a5a9b32ba9405ef58eb26384d95c15cea40982..a41c74711971767517815666fd0550b9cec8a971 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/DataSignatureType.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/DataSignatureType.java
@@ -1,9 +1,8 @@
-package de.fitko.fitconnect.api.domain.model.metadata.data;
+package dev.fitko.fitconnect.api.domain.model.metadata.data;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/Hash.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/Hash.java
similarity index 89%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/Hash.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/Hash.java
index 2bc695416b21ce227701c88333df7d42172ec71b..5c65bf35b0dd9af1b737b69ae9b0d3e8ed0bcc05 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/Hash.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/Hash.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.metadata.data;
+package dev.fitko.fitconnect.api.domain.model.metadata.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/MimeType.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/MimeType.java
similarity index 94%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/MimeType.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/MimeType.java
index 2011bc56e3c365372fca365fe878f4ef79ac1ade..23be217e54e51ccde5f0d8362172dad9b775b5db 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/MimeType.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/MimeType.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.metadata.data;
+package dev.fitko.fitconnect.api.domain.model.metadata.data;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/Signature.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/Signature.java
similarity index 76%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/Signature.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/Signature.java
index 316d85bf0a75d107622cdeeae98dfbccfa510db5..ed51af1507934e97f025b38a162cf62ff2f5a83e 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/Signature.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/Signature.java
@@ -1,10 +1,10 @@
-package de.fitko.fitconnect.api.domain.model.metadata.data;
+package dev.fitko.fitconnect.api.domain.model.metadata.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import de.fitko.fitconnect.api.domain.model.metadata.EidasAdesProfile;
-import de.fitko.fitconnect.api.domain.model.metadata.SignatureFormat;
+import dev.fitko.fitconnect.api.domain.model.metadata.EidasAdesProfile;
+import dev.fitko.fitconnect.api.domain.model.metadata.SignatureFormat;
 import lombok.Data;
 
 import java.util.Map;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/SubmissionSchema.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/SubmissionSchema.java
similarity index 90%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/SubmissionSchema.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/SubmissionSchema.java
index 05f8597545199bb3dc77bec0d71acfe5f727e22b..bc2c278dd8ef9fa361a0313426bbda362570e81f 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/metadata/data/SubmissionSchema.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/data/SubmissionSchema.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.metadata.data;
+package dev.fitko.fitconnect.api.domain.model.metadata.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/Callback.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/Callback.java
similarity index 80%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/Callback.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/Callback.java
index 392aa49d5bd74f77108caf788676f9e442abec6d..c674b863db7a436d90394220be7cfe425ff5a0ed 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/Callback.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/Callback.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.submission;
+package dev.fitko.fitconnect.api.domain.model.submission;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/CreateSubmission.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/CreateSubmission.java
similarity index 90%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/CreateSubmission.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/CreateSubmission.java
index e40cbeade7768af764a15b6d70fe0078c68ff346..68e0a8c0c598a7bac40d14412e2305689478ac19 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/CreateSubmission.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/CreateSubmission.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.submission;
+package dev.fitko.fitconnect.api.domain.model.submission;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/ServiceType.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/ServiceType.java
similarity index 85%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/ServiceType.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/ServiceType.java
index 46c21ec75c1b7a98dbfb8971786962b521a19030..f4fd4bc013b8d842e5ff4d3ad1d7a64d2fc81aab 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/ServiceType.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/ServiceType.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.submission;
+package dev.fitko.fitconnect.api.domain.model.submission;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/Submission.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/Submission.java
similarity index 92%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/Submission.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/Submission.java
index 39a47f9aacf4404b2a5f10d9c5518d0b0ce66c4a..1ebe7362339aadb2e21c872de8a8bcc24989111e 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/Submission.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/Submission.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.submission;
+package dev.fitko.fitconnect.api.domain.model.submission;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/SubmissionForPickup.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/SubmissionForPickup.java
similarity index 86%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/SubmissionForPickup.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/SubmissionForPickup.java
index 6f6448946355a7d972d1f1c62ea2ac50b9ce89c3..5268c39a6dbac32015fee0f12afe485a998731a6 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/SubmissionForPickup.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/SubmissionForPickup.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.submission;
+package dev.fitko.fitconnect.api.domain.model.submission;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/SubmissionsForPickup.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/SubmissionsForPickup.java
similarity index 89%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/SubmissionsForPickup.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/SubmissionsForPickup.java
index 373ae0b0b241d310fe27ca6e22998a382e080b28..3cf1830098630263f034fd253a7c10bfec02bf36 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/SubmissionsForPickup.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/SubmissionsForPickup.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.submission;
+package dev.fitko.fitconnect.api.domain.model.submission;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/SubmitSubmission.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/SubmitSubmission.java
similarity index 88%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/SubmitSubmission.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/SubmitSubmission.java
index 18758d9377ab36b63b380b1bfbaa9e8e5584e0d4..17fc9a87debf3dbc83376ddb1d71417e234bcda6 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/submission/SubmitSubmission.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/model/submission/SubmitSubmission.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.model.submission;
+package dev.fitko.fitconnect.api.domain.model.submission;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/validation/ValidationResult.java b/api/src/main/java/dev/fitko/fitconnect/api/domain/validation/ValidationResult.java
similarity index 94%
rename from api/src/main/java/de/fitko/fitconnect/api/domain/validation/ValidationResult.java
rename to api/src/main/java/dev/fitko/fitconnect/api/domain/validation/ValidationResult.java
index 95b211e49ef357c3ece86128e12af2088c5e9128..348a6199e1e5ce760e0ed19e841995b3240cde88 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/validation/ValidationResult.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/domain/validation/ValidationResult.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.domain.validation;
+package dev.fitko.fitconnect.api.domain.validation;
 
 /**
  * Wrapper for validations including an exception
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/AttachmentCreationException.java b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/AttachmentCreationException.java
similarity index 87%
rename from api/src/main/java/de/fitko/fitconnect/api/exceptions/AttachmentCreationException.java
rename to api/src/main/java/dev/fitko/fitconnect/api/exceptions/AttachmentCreationException.java
index 525f15b2215e6eb7d6470d443f0a5cce7f16df60..c510597c7acdfff01460919a315ad29042c3db9c 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/AttachmentCreationException.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/AttachmentCreationException.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.exceptions;
+package dev.fitko.fitconnect.api.exceptions;
 
 public class AttachmentCreationException extends RuntimeException {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/AttachmentUploadException.java b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/AttachmentUploadException.java
similarity index 81%
rename from api/src/main/java/de/fitko/fitconnect/api/exceptions/AttachmentUploadException.java
rename to api/src/main/java/dev/fitko/fitconnect/api/exceptions/AttachmentUploadException.java
index f83dee7797b52217b6cea053de53d761e85fffd9..cc12d3ac7a33ea2067f12b622020c1e960ec5d47 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/AttachmentUploadException.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/AttachmentUploadException.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.exceptions;
+package dev.fitko.fitconnect.api.exceptions;
 
 public class AttachmentUploadException extends RuntimeException {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/AuthenticationException.java b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/AuthenticationException.java
similarity index 81%
rename from api/src/main/java/de/fitko/fitconnect/api/exceptions/AuthenticationException.java
rename to api/src/main/java/dev/fitko/fitconnect/api/exceptions/AuthenticationException.java
index 560737265afc09302ab155f1746544604ca45ecc..0091336dd9c96d676741cc0d990e1e953ccb3f7f 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/AuthenticationException.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/AuthenticationException.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.exceptions;
+package dev.fitko.fitconnect.api.exceptions;
 
 public class AuthenticationException extends RuntimeException {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/DataIntegrityException.java b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/DataIntegrityException.java
similarity index 86%
rename from api/src/main/java/de/fitko/fitconnect/api/exceptions/DataIntegrityException.java
rename to api/src/main/java/dev/fitko/fitconnect/api/exceptions/DataIntegrityException.java
index 702ee06e0e181663620eb39d20ce04835e94e7b3..bbd29906d8ba74272968f4d30289e14dc3b7af80 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/DataIntegrityException.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/DataIntegrityException.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.exceptions;
+package dev.fitko.fitconnect.api.exceptions;
 
 public class DataIntegrityException extends Exception {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/DecryptionException.java b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/DecryptionException.java
similarity index 86%
rename from api/src/main/java/de/fitko/fitconnect/api/exceptions/DecryptionException.java
rename to api/src/main/java/dev/fitko/fitconnect/api/exceptions/DecryptionException.java
index dcaadebe61442569ecec9d827b6c71b1611e7a28..37174195c1f879481304f9104d2c1a991933dcd7 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/DecryptionException.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/DecryptionException.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.exceptions;
+package dev.fitko.fitconnect.api.exceptions;
 
 public class DecryptionException extends RuntimeException {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/EncryptionException.java b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/EncryptionException.java
similarity index 86%
rename from api/src/main/java/de/fitko/fitconnect/api/exceptions/EncryptionException.java
rename to api/src/main/java/dev/fitko/fitconnect/api/exceptions/EncryptionException.java
index 664a3ba0a0b95cb90b53d5a60ea1ba50b00be512..a9a780966eb91a7a5b4c01d87c463c64bd68b3da 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/EncryptionException.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/EncryptionException.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.exceptions;
+package dev.fitko.fitconnect.api.exceptions;
 
 public class EncryptionException extends RuntimeException {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/EventCreationException.java b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/EventCreationException.java
similarity index 86%
rename from api/src/main/java/de/fitko/fitconnect/api/exceptions/EventCreationException.java
rename to api/src/main/java/dev/fitko/fitconnect/api/exceptions/EventCreationException.java
index 67d884ea63fdad07094645b46a9bcd515310ca39..41e4c0d94b3889200348a301868e0426bff5a391 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/EventCreationException.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/EventCreationException.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.exceptions;
+package dev.fitko.fitconnect.api.exceptions;
 
 public class EventCreationException extends RuntimeException {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/InitializationException.java b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/InitializationException.java
similarity index 86%
rename from api/src/main/java/de/fitko/fitconnect/api/exceptions/InitializationException.java
rename to api/src/main/java/dev/fitko/fitconnect/api/exceptions/InitializationException.java
index cdb9be9134d90049d488b0bb4334c71d16f09699..3c723047701e37ff8c1b0991eedaaf12a9461e08 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/InitializationException.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/InitializationException.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.exceptions;
+package dev.fitko.fitconnect.api.exceptions;
 
 public class InitializationException extends RuntimeException {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/InvalidSigningKeyException.java b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/InvalidSigningKeyException.java
similarity index 87%
rename from api/src/main/java/de/fitko/fitconnect/api/exceptions/InvalidSigningKeyException.java
rename to api/src/main/java/dev/fitko/fitconnect/api/exceptions/InvalidSigningKeyException.java
index b6b4e0556da62ac7ece96f9408add4296e440fd9..2bfe501ea2c88eea6750de1dc1b0796116b2315d 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/InvalidSigningKeyException.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/InvalidSigningKeyException.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.exceptions;
+package dev.fitko.fitconnect.api.exceptions;
 
 public class InvalidSigningKeyException extends RuntimeException {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/KeyNotRetrievedException.java b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/KeyNotRetrievedException.java
similarity index 86%
rename from api/src/main/java/de/fitko/fitconnect/api/exceptions/KeyNotRetrievedException.java
rename to api/src/main/java/dev/fitko/fitconnect/api/exceptions/KeyNotRetrievedException.java
index 1bb463b2a40d0cde08c6b552c9223de36ad220d2..3858e304602a571b20eaef89dd61a0e6358c1b32 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/KeyNotRetrievedException.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/KeyNotRetrievedException.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.exceptions;
+package dev.fitko.fitconnect.api.exceptions;
 
 public class KeyNotRetrievedException extends RuntimeException {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/MetadataNotCreatedException.java b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/MetadataNotCreatedException.java
similarity index 82%
rename from api/src/main/java/de/fitko/fitconnect/api/exceptions/MetadataNotCreatedException.java
rename to api/src/main/java/dev/fitko/fitconnect/api/exceptions/MetadataNotCreatedException.java
index a045c1dac26dce205414d683ac886f9da8da68b4..6a4eb61a666e3d794c76c82c82d0280cb267444a 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/MetadataNotCreatedException.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/MetadataNotCreatedException.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.exceptions;
+package dev.fitko.fitconnect.api.exceptions;
 
 public class MetadataNotCreatedException extends RuntimeException {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/RestApiException.java b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/RestApiException.java
similarity index 85%
rename from api/src/main/java/de/fitko/fitconnect/api/exceptions/RestApiException.java
rename to api/src/main/java/dev/fitko/fitconnect/api/exceptions/RestApiException.java
index 56355f0986dbe53bbec9bca0e4ca6293d641ae4b..6fdfc7cd3567d182f658a81c1d9add446743ca1a 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/RestApiException.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/RestApiException.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.exceptions;
+package dev.fitko.fitconnect.api.exceptions;
 
 public class RestApiException extends RuntimeException {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/SchemaNotFoundException.java b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/SchemaNotFoundException.java
similarity index 86%
rename from api/src/main/java/de/fitko/fitconnect/api/exceptions/SchemaNotFoundException.java
rename to api/src/main/java/dev/fitko/fitconnect/api/exceptions/SchemaNotFoundException.java
index 2f0afe6956c6153ed23ea7007e4ef6cb2d320902..f7c4b982c102ad6f692cd8c9c93c5d1c9b168c1c 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/SchemaNotFoundException.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/SchemaNotFoundException.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.exceptions;
+package dev.fitko.fitconnect.api.exceptions;
 
 public class SchemaNotFoundException extends RuntimeException {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/SubmissionNotCreatedException.java b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/SubmissionNotCreatedException.java
similarity index 87%
rename from api/src/main/java/de/fitko/fitconnect/api/exceptions/SubmissionNotCreatedException.java
rename to api/src/main/java/dev/fitko/fitconnect/api/exceptions/SubmissionNotCreatedException.java
index 127a104183d1aee4e9af7b6477880a62b1742c8e..2a41fa6835b6f7ffa5057599b9d7ae1f86b52446 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/SubmissionNotCreatedException.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/SubmissionNotCreatedException.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.exceptions;
+package dev.fitko.fitconnect.api.exceptions;
 
 public class SubmissionNotCreatedException extends RuntimeException {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/ValidationException.java b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/ValidationException.java
similarity index 86%
rename from api/src/main/java/de/fitko/fitconnect/api/exceptions/ValidationException.java
rename to api/src/main/java/dev/fitko/fitconnect/api/exceptions/ValidationException.java
index 76c364c3b38e29ba5292eabb5b29002f98d2c787..3113bb7807e78e3b93d7548ac8bf06fbda2632b6 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/ValidationException.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/exceptions/ValidationException.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.exceptions;
+package dev.fitko.fitconnect.api.exceptions;
 
 public class ValidationException extends RuntimeException {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/services/Sender.java b/api/src/main/java/dev/fitko/fitconnect/api/services/Sender.java
similarity index 84%
rename from api/src/main/java/de/fitko/fitconnect/api/services/Sender.java
rename to api/src/main/java/dev/fitko/fitconnect/api/services/Sender.java
index 0948117b8b72d4dc344aa219a2c653ce99ceeb79..eb59f42108d64d390a069c786dd2a91aa50c2fdd 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/services/Sender.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/services/Sender.java
@@ -1,15 +1,19 @@
-package de.fitko.fitconnect.api.services;
+package dev.fitko.fitconnect.api.services;
 
 import com.nimbusds.jose.jwk.RSAKey;
-import de.fitko.fitconnect.api.domain.model.destination.Destination;
-import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
-import de.fitko.fitconnect.api.domain.model.metadata.data.Data;
-import de.fitko.fitconnect.api.domain.model.submission.CreateSubmission;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
-import de.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
-import de.fitko.fitconnect.api.domain.validation.ValidationResult;
-import de.fitko.fitconnect.api.exceptions.*;
+import dev.fitko.fitconnect.api.domain.model.destination.Destination;
+import dev.fitko.fitconnect.api.domain.model.metadata.Metadata;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.Data;
+import dev.fitko.fitconnect.api.domain.model.submission.CreateSubmission;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
+import dev.fitko.fitconnect.api.domain.validation.ValidationResult;
+import dev.fitko.fitconnect.api.exceptions.*;
+import dev.fitko.fitconnect.api.exceptions.AttachmentUploadException;
+import dev.fitko.fitconnect.api.exceptions.EncryptionException;
+import dev.fitko.fitconnect.api.exceptions.KeyNotRetrievedException;
+import dev.fitko.fitconnect.api.exceptions.SubmissionNotCreatedException;
 
 import java.util.UUID;
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/services/Subscriber.java b/api/src/main/java/dev/fitko/fitconnect/api/services/Subscriber.java
similarity index 87%
rename from api/src/main/java/de/fitko/fitconnect/api/services/Subscriber.java
rename to api/src/main/java/dev/fitko/fitconnect/api/services/Subscriber.java
index f6f900c5303485f76bc26eb0399d1e493e33fd96..694df79aa46d228b16ccda1583f0be2cccee8c78 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/services/Subscriber.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/services/Subscriber.java
@@ -1,12 +1,12 @@
-package de.fitko.fitconnect.api.services;
+package dev.fitko.fitconnect.api.services;
 
 import com.nimbusds.jose.jwk.RSAKey;
-import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
-import de.fitko.fitconnect.api.domain.model.metadata.data.Data;
-import de.fitko.fitconnect.api.domain.model.submission.Submission;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
-import de.fitko.fitconnect.api.domain.validation.ValidationResult;
+import dev.fitko.fitconnect.api.domain.model.metadata.Metadata;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.Data;
+import dev.fitko.fitconnect.api.domain.model.submission.Submission;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.domain.validation.ValidationResult;
 
 import java.util.Set;
 import java.util.UUID;
@@ -58,7 +58,7 @@ public interface Subscriber {
      * Validates the structure and signature of a Security-Event-Token (SET).
      *
      * @param caseId unique identifier of a {@link Submission}s case
-     * @returna {@link ValidationResult}, contains an error if the SET is invalid
+     * @return {@link ValidationResult}, contains an error if the SET is invalid
      */
     ValidationResult validateEventLog(UUID caseId);
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/services/auth/OAuthService.java b/api/src/main/java/dev/fitko/fitconnect/api/services/auth/OAuthService.java
similarity index 72%
rename from api/src/main/java/de/fitko/fitconnect/api/services/auth/OAuthService.java
rename to api/src/main/java/dev/fitko/fitconnect/api/services/auth/OAuthService.java
index 7e0496ea87cdbb43c1d6200e4d55bc1467ae5385..c553dd0f55945bf01fa2ca8380c5c862ae1f99b5 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/services/auth/OAuthService.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/services/auth/OAuthService.java
@@ -1,9 +1,9 @@
-package de.fitko.fitconnect.api.services.auth;
+package dev.fitko.fitconnect.api.services.auth;
 
-import de.fitko.fitconnect.api.domain.auth.OAuthToken;
-import de.fitko.fitconnect.api.domain.model.submission.Submission;
-import de.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
-import de.fitko.fitconnect.api.exceptions.RestApiException;
+import dev.fitko.fitconnect.api.domain.auth.OAuthToken;
+import dev.fitko.fitconnect.api.domain.model.submission.Submission;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
+import dev.fitko.fitconnect.api.exceptions.RestApiException;
 
 /**
  * A service that provides an interface to authenticate against the FIT-Connect API in order
diff --git a/api/src/main/java/de/fitko/fitconnect/api/services/crypto/CryptoService.java b/api/src/main/java/dev/fitko/fitconnect/api/services/crypto/CryptoService.java
similarity index 85%
rename from api/src/main/java/de/fitko/fitconnect/api/services/crypto/CryptoService.java
rename to api/src/main/java/dev/fitko/fitconnect/api/services/crypto/CryptoService.java
index 220098a0d4b02d966662c3fc2a4a111e37d10af4..a5f42fdb80f60f8b011fb7140559965db84c1678 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/services/crypto/CryptoService.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/services/crypto/CryptoService.java
@@ -1,11 +1,11 @@
-package de.fitko.fitconnect.api.services.crypto;
+package dev.fitko.fitconnect.api.services.crypto;
 
 import com.nimbusds.jose.jwk.RSAKey;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
-import de.fitko.fitconnect.api.domain.model.metadata.data.Data;
-import de.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
-import de.fitko.fitconnect.api.exceptions.DecryptionException;
-import de.fitko.fitconnect.api.exceptions.EncryptionException;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.Data;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
+import dev.fitko.fitconnect.api.exceptions.DecryptionException;
+import dev.fitko.fitconnect.api.exceptions.EncryptionException;
 
 /**
  * A service that allows to encrypt and decrypt {@link Data} and {@link Attachment}s of a {@link SubmitSubmission}
diff --git a/api/src/main/java/de/fitko/fitconnect/api/services/crypto/MessageDigestService.java b/api/src/main/java/dev/fitko/fitconnect/api/services/crypto/MessageDigestService.java
similarity index 95%
rename from api/src/main/java/de/fitko/fitconnect/api/services/crypto/MessageDigestService.java
rename to api/src/main/java/dev/fitko/fitconnect/api/services/crypto/MessageDigestService.java
index 55185e683360dd65fe884a828b6c74b1eae66575..0eec6f9a73fc135c0be8f5343e076616887b7f5c 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/services/crypto/MessageDigestService.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/services/crypto/MessageDigestService.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.api.services.crypto;
+package dev.fitko.fitconnect.api.services.crypto;
 
 /**
  * Provides the creation and verification of hashes.
diff --git a/api/src/main/java/de/fitko/fitconnect/api/services/destination/DestinationService.java b/api/src/main/java/dev/fitko/fitconnect/api/services/destination/DestinationService.java
similarity index 74%
rename from api/src/main/java/de/fitko/fitconnect/api/services/destination/DestinationService.java
rename to api/src/main/java/dev/fitko/fitconnect/api/services/destination/DestinationService.java
index 8e5347aa9fb691decc134653557e7c3d577f8bb4..660c9f7fe8fbf60813e42b6310c9a54105fd315d 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/services/destination/DestinationService.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/services/destination/DestinationService.java
@@ -1,9 +1,9 @@
-package de.fitko.fitconnect.api.services.destination;
+package dev.fitko.fitconnect.api.services.destination;
 
-import de.fitko.fitconnect.api.domain.model.destination.Destination;
-import de.fitko.fitconnect.api.domain.model.jwk.JWK;
-import de.fitko.fitconnect.api.domain.model.submission.Submission;
-import de.fitko.fitconnect.api.exceptions.RestApiException;
+import dev.fitko.fitconnect.api.domain.model.destination.Destination;
+import dev.fitko.fitconnect.api.domain.model.jwk.JWK;
+import dev.fitko.fitconnect.api.domain.model.submission.Submission;
+import dev.fitko.fitconnect.api.exceptions.RestApiException;
 
 import java.util.UUID;
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/services/events/EventLogService.java b/api/src/main/java/dev/fitko/fitconnect/api/services/events/EventLogService.java
similarity index 82%
rename from api/src/main/java/de/fitko/fitconnect/api/services/events/EventLogService.java
rename to api/src/main/java/dev/fitko/fitconnect/api/services/events/EventLogService.java
index f6a4ba6bd3ab59738ffce766800e270370ea57bb..de845149c49650ea18dbda69132db29b0247c850 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/services/events/EventLogService.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/services/events/EventLogService.java
@@ -1,7 +1,7 @@
-package de.fitko.fitconnect.api.services.events;
+package dev.fitko.fitconnect.api.services.events;
 
-import de.fitko.fitconnect.api.domain.model.event.EventLog;
-import de.fitko.fitconnect.api.domain.model.submission.Submission;
+import dev.fitko.fitconnect.api.domain.model.event.EventLog;
+import dev.fitko.fitconnect.api.domain.model.submission.Submission;
 
 import java.util.UUID;
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/services/events/SecurityEventService.java b/api/src/main/java/dev/fitko/fitconnect/api/services/events/SecurityEventService.java
similarity index 86%
rename from api/src/main/java/de/fitko/fitconnect/api/services/events/SecurityEventService.java
rename to api/src/main/java/dev/fitko/fitconnect/api/services/events/SecurityEventService.java
index afd9cc9b73a5bd8e668946f6c8afb66557aa366f..0ec06b6b166ca5f4184bff45e78049a95e5bb507 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/services/events/SecurityEventService.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/services/events/SecurityEventService.java
@@ -1,7 +1,7 @@
-package de.fitko.fitconnect.api.services.events;
+package dev.fitko.fitconnect.api.services.events;
 
-import de.fitko.fitconnect.api.domain.model.event.EventLog;
-import de.fitko.fitconnect.api.domain.model.submission.Submission;
+import dev.fitko.fitconnect.api.domain.model.event.EventLog;
+import dev.fitko.fitconnect.api.domain.model.submission.Submission;
 
 import java.util.UUID;
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/services/submission/SubmissionService.java b/api/src/main/java/dev/fitko/fitconnect/api/services/submission/SubmissionService.java
similarity index 75%
rename from api/src/main/java/de/fitko/fitconnect/api/services/submission/SubmissionService.java
rename to api/src/main/java/dev/fitko/fitconnect/api/services/submission/SubmissionService.java
index 5dae7ed383cfd23278e995e0c14e813bbcae8fcf..f0bc1d82dc93e83379d13c71bbc8032e840649f2 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/services/submission/SubmissionService.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/services/submission/SubmissionService.java
@@ -1,10 +1,16 @@
-package de.fitko.fitconnect.api.services.submission;
+package dev.fitko.fitconnect.api.services.submission;
 
-import de.fitko.fitconnect.api.domain.model.destination.Destination;
-import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
-import de.fitko.fitconnect.api.domain.model.metadata.data.Data;
-import de.fitko.fitconnect.api.domain.model.submission.*;
+import dev.fitko.fitconnect.api.domain.model.destination.Destination;
+import dev.fitko.fitconnect.api.domain.model.metadata.Metadata;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.Data;
+import dev.fitko.fitconnect.api.domain.model.submission.*;
+import dev.fitko.fitconnect.api.domain.model.submission.CreateSubmission;
+import dev.fitko.fitconnect.api.domain.model.submission.ServiceType;
+import dev.fitko.fitconnect.api.domain.model.submission.Submission;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionsForPickup;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
 
 import java.util.UUID;
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/services/validation/ValidationService.java b/api/src/main/java/dev/fitko/fitconnect/api/services/validation/ValidationService.java
similarity index 90%
rename from api/src/main/java/de/fitko/fitconnect/api/services/validation/ValidationService.java
rename to api/src/main/java/dev/fitko/fitconnect/api/services/validation/ValidationService.java
index 969a5ea46389484500e30c41c280b407f96cca83..01c3e36cf9d75298238a6a46c84624b0cd669f07 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/services/validation/ValidationService.java
+++ b/api/src/main/java/dev/fitko/fitconnect/api/services/validation/ValidationService.java
@@ -1,8 +1,8 @@
-package de.fitko.fitconnect.api.services.validation;
+package dev.fitko.fitconnect.api.services.validation;
 
 import com.nimbusds.jose.jwk.RSAKey;
-import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.validation.ValidationResult;
+import dev.fitko.fitconnect.api.domain.model.metadata.Metadata;
+import dev.fitko.fitconnect.api.domain.validation.ValidationResult;
 
 /**
  * Validator for publicKeys and metadata.
diff --git a/client/pom.xml b/client/pom.xml
index dd8b828237ae46bdc8a6567c2e2d0e132b266ec6..82ddb60c6278c08ca5c3eda0c68a3afbfc408217 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -4,21 +4,22 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>sdk-java</artifactId>
-        <groupId>de.fitko.fitconnect.sdk</groupId>
+        <groupId>dev.fitko.fitconnect.sdk</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>client</artifactId>
     <packaging>jar</packaging>
+    <name>FIT-Connect Java SDK - Client Lib</name>
 
     <dependencies>
         <dependency>
-            <groupId>de.fitko.fitconnect.sdk</groupId>
+            <groupId>dev.fitko.fitconnect.sdk</groupId>
             <artifactId>api</artifactId>
         </dependency>
         <dependency>
-            <groupId>de.fitko.fitconnect.sdk</groupId>
+            <groupId>dev.fitko.fitconnect.sdk</groupId>
             <artifactId>core</artifactId>
         </dependency>
         <dependency>
@@ -67,45 +68,31 @@
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
             <plugin>
-                <!-- Build an executable JAR -->
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.4.2</version>
                 <configuration>
                     <archive>
                         <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>de.fitko.fitconnect.client.cmd.CommandLineRunner</mainClass>
+                            <mainClass>dev.fitko.fitconnect.client.cmd.CommandLineRunner</mainClass>
                         </manifest>
                     </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <configuration>
-                    <filters>
-                        <filter>
-                            <artifact>*:*</artifact>
-                            <excludes>
-                                <exclude>META-INF/*.SF</exclude>
-                                <exclude>META-INF/*.DSA</exclude>
-                                <exclude>META-INF/*.RSA</exclude>
-                            </excludes>
-                        </filter>
-                    </filters>
-                    <!-- Additional configuration. -->
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
                 <executions>
                     <execution>
+                        <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>shade</goal>
+                            <goal>single</goal>
                         </goals>
-                        <configuration>
-                            <minimizeJar>true</minimizeJar>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/client/src/main/java/de/fitko/fitconnect/client/SenderClient.java b/client/src/main/java/dev/fitko/fitconnect/client/SenderClient.java
similarity index 92%
rename from client/src/main/java/de/fitko/fitconnect/client/SenderClient.java
rename to client/src/main/java/dev/fitko/fitconnect/client/SenderClient.java
index 872f0f081757596d09bda503978e4417a46e1463..93c854144e3c8cafc2d405645bb4aed3634a2ce7 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/SenderClient.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/SenderClient.java
@@ -1,23 +1,23 @@
-package de.fitko.fitconnect.client;
+package dev.fitko.fitconnect.client;
 
 import com.nimbusds.jose.jwk.RSAKey;
-import de.fitko.fitconnect.api.config.Environment;
-import de.fitko.fitconnect.api.domain.model.destination.Destination;
-import de.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
-import de.fitko.fitconnect.api.domain.model.submission.ServiceType;
-import de.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
-import de.fitko.fitconnect.api.domain.validation.ValidationResult;
-import de.fitko.fitconnect.api.exceptions.KeyNotRetrievedException;
-import de.fitko.fitconnect.api.exceptions.RestApiException;
-import de.fitko.fitconnect.api.services.Sender;
-import de.fitko.fitconnect.client.model.AttachmentPayload;
-import de.fitko.fitconnect.client.model.DataPayload;
-import de.fitko.fitconnect.client.model.ServiceTypePayload;
-import de.fitko.fitconnect.client.model.SubmissionPayload;
-import de.fitko.fitconnect.client.strategies.SendEncryptedSubmissionStrategy;
-import de.fitko.fitconnect.client.strategies.SendNewSubmissionStrategy;
-import de.fitko.fitconnect.client.strategies.SubmitStrategy;
-import de.fitko.fitconnect.client.util.SubmissionUtil;
+import dev.fitko.fitconnect.api.config.Environment;
+import dev.fitko.fitconnect.api.domain.model.destination.Destination;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
+import dev.fitko.fitconnect.api.domain.model.submission.ServiceType;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
+import dev.fitko.fitconnect.api.domain.validation.ValidationResult;
+import dev.fitko.fitconnect.api.exceptions.KeyNotRetrievedException;
+import dev.fitko.fitconnect.api.exceptions.RestApiException;
+import dev.fitko.fitconnect.api.services.Sender;
+import dev.fitko.fitconnect.client.model.AttachmentPayload;
+import dev.fitko.fitconnect.client.model.DataPayload;
+import dev.fitko.fitconnect.client.model.ServiceTypePayload;
+import dev.fitko.fitconnect.client.model.SubmissionPayload;
+import dev.fitko.fitconnect.client.strategies.SendEncryptedSubmissionStrategy;
+import dev.fitko.fitconnect.client.strategies.SendNewSubmissionStrategy;
+import dev.fitko.fitconnect.client.strategies.SubmitStrategy;
+import dev.fitko.fitconnect.client.util.SubmissionUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/client/src/main/java/de/fitko/fitconnect/client/SubscriberClient.java b/client/src/main/java/dev/fitko/fitconnect/client/SubscriberClient.java
similarity index 91%
rename from client/src/main/java/de/fitko/fitconnect/client/SubscriberClient.java
rename to client/src/main/java/dev/fitko/fitconnect/client/SubscriberClient.java
index c6ebac7d7218211b04fa54b829e9c596a52c1305..5f24fd917ec3b7e5f85c4bf7e8f7a865b1a16f39 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/SubscriberClient.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/SubscriberClient.java
@@ -1,18 +1,22 @@
-package de.fitko.fitconnect.client;
+package dev.fitko.fitconnect.client;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.nimbusds.jose.jwk.RSAKey;
-import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.AttachmentWithData;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.signature.Hash__1;
-import de.fitko.fitconnect.api.domain.model.metadata.data.Data;
-import de.fitko.fitconnect.api.domain.model.submission.Submission;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
-import de.fitko.fitconnect.api.domain.validation.ValidationResult;
-import de.fitko.fitconnect.api.exceptions.*;
-import de.fitko.fitconnect.api.services.Subscriber;
-import de.fitko.fitconnect.client.model.ReceivedSubmission;
+import dev.fitko.fitconnect.api.domain.model.metadata.Metadata;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.AttachmentWithData;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.signature.Hash__1;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.Data;
+import dev.fitko.fitconnect.api.domain.model.submission.Submission;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.domain.validation.ValidationResult;
+import dev.fitko.fitconnect.api.exceptions.DataIntegrityException;
+import dev.fitko.fitconnect.api.exceptions.DecryptionException;
+import dev.fitko.fitconnect.api.exceptions.EventCreationException;
+import dev.fitko.fitconnect.api.exceptions.InvalidSigningKeyException;
+import dev.fitko.fitconnect.api.exceptions.RestApiException;
+import dev.fitko.fitconnect.api.services.Subscriber;
+import dev.fitko.fitconnect.client.model.ReceivedSubmission;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -154,7 +158,7 @@ public final class SubscriberClient {
                 LOGGER.error("API request failed", e);
             } catch (final EventCreationException e) {
                 LOGGER.error("Creating SET event failed", e);
-            } catch (final InvalidSigningKeyException  e) {
+            } catch (final InvalidSigningKeyException e) {
                 LOGGER.error("Signing the SET event failed", e);
             } catch (final IOException  e) {
                 LOGGER.error("Reading metadata failed", e);
diff --git a/client/src/main/java/de/fitko/fitconnect/client/cmd/CommandLineClient.java b/client/src/main/java/dev/fitko/fitconnect/client/cmd/CommandLineClient.java
similarity index 88%
rename from client/src/main/java/de/fitko/fitconnect/client/cmd/CommandLineClient.java
rename to client/src/main/java/dev/fitko/fitconnect/client/cmd/CommandLineClient.java
index 4b50b75e35a6f2636096fb4194c2757c8b6067a4..46a7dca54846d1157708440d3a13b1b2f82a9e2a 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/cmd/CommandLineClient.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/cmd/CommandLineClient.java
@@ -1,15 +1,15 @@
-package de.fitko.fitconnect.client.cmd;
+package dev.fitko.fitconnect.client.cmd;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.ParameterException;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.AttachmentWithData;
-import de.fitko.fitconnect.client.model.ReceivedSubmission;
-import de.fitko.fitconnect.client.SenderClient;
-import de.fitko.fitconnect.client.SubscriberClient;
-import de.fitko.fitconnect.client.cmd.commands.ListAllSubmissionsCommand;
-import de.fitko.fitconnect.client.cmd.commands.ListOneSubmissionCommand;
-import de.fitko.fitconnect.client.cmd.commands.SendSubmissionCommand;
-import de.fitko.fitconnect.client.cmd.util.AttachmentDataType;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.AttachmentWithData;
+import dev.fitko.fitconnect.client.SenderClient;
+import dev.fitko.fitconnect.client.SubscriberClient;
+import dev.fitko.fitconnect.client.cmd.commands.ListAllSubmissionsCommand;
+import dev.fitko.fitconnect.client.cmd.commands.ListOneSubmissionCommand;
+import dev.fitko.fitconnect.client.cmd.commands.SendSubmissionCommand;
+import dev.fitko.fitconnect.client.cmd.util.AttachmentDataType;
+import dev.fitko.fitconnect.client.model.ReceivedSubmission;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,9 +21,6 @@ import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static de.fitko.fitconnect.client.cmd.util.AttachmentDataType.JSON;
-import static de.fitko.fitconnect.client.cmd.util.AttachmentDataType.XML;
-
 public class CommandLineClient {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CommandLineClient.class);
@@ -111,26 +108,26 @@ public class CommandLineClient {
     private void sendSubmission(final SendSubmissionCommand sendSubmissionCommand) {
         LOGGER.info("Sending new submission to destination {}", sendSubmissionCommand.destinationId);
         final List<File> files = sendSubmissionCommand.attachments.stream().map(File::new).collect(Collectors.toList());
-        if (sendSubmissionCommand.dataType == JSON) {
+        if (sendSubmissionCommand.dataType == AttachmentDataType.JSON) {
             sendWithJsonData(sendSubmissionCommand, files);
-        } else if (sendSubmissionCommand.dataType == XML) {
+        } else if (sendSubmissionCommand.dataType == AttachmentDataType.XML) {
             sendWithXmlData(sendSubmissionCommand, files);
         }
     }
 
-    private void sendWithXmlData(final SendSubmissionCommand sendSubmissionCommand, final List<File> files) {
+    private void sendWithJsonData(final SendSubmissionCommand sendSubmissionCommand, final List<File> files) {
         senderClient.newSubmission()
                 .withAttachments(files)
-                .withXmlData(sendSubmissionCommand.data)
+                .withJsonData(sendSubmissionCommand.data)
                 .withDestination(sendSubmissionCommand.destinationId)
                 .withServiceType(sendSubmissionCommand.serviceName, sendSubmissionCommand.leikaKey)
                 .submit();
     }
 
-    private void sendWithJsonData(final SendSubmissionCommand sendSubmissionCommand, final List<File> files) {
+    private void sendWithXmlData(final SendSubmissionCommand sendSubmissionCommand, final List<File> files) {
         senderClient.newSubmission()
                 .withAttachments(files)
-                .withJsonData(sendSubmissionCommand.data)
+                .withXmlData(sendSubmissionCommand.data)
                 .withDestination(sendSubmissionCommand.destinationId)
                 .withServiceType(sendSubmissionCommand.serviceName, sendSubmissionCommand.leikaKey)
                 .submit();
diff --git a/client/src/main/java/de/fitko/fitconnect/client/cmd/CommandLineRunner.java b/client/src/main/java/dev/fitko/fitconnect/client/cmd/CommandLineRunner.java
similarity index 80%
rename from client/src/main/java/de/fitko/fitconnect/client/cmd/CommandLineRunner.java
rename to client/src/main/java/dev/fitko/fitconnect/client/cmd/CommandLineRunner.java
index 39d71f52f8cc8afa38f08fe640014feb029e8d5e..5b9c88fa82fda7739ad23113a469211032ebcd6e 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/cmd/CommandLineRunner.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/cmd/CommandLineRunner.java
@@ -1,6 +1,6 @@
-package de.fitko.fitconnect.client.cmd;
+package dev.fitko.fitconnect.client.cmd;
 
-import de.fitko.fitconnect.client.factory.ClientFactory;
+import dev.fitko.fitconnect.client.factory.ClientFactory;
 
 import java.io.IOException;
 
diff --git a/client/src/main/java/de/fitko/fitconnect/client/cmd/commands/ListAllSubmissionsCommand.java b/client/src/main/java/dev/fitko/fitconnect/client/cmd/commands/ListAllSubmissionsCommand.java
similarity index 68%
rename from client/src/main/java/de/fitko/fitconnect/client/cmd/commands/ListAllSubmissionsCommand.java
rename to client/src/main/java/dev/fitko/fitconnect/client/cmd/commands/ListAllSubmissionsCommand.java
index fa117256d70385459d731e6d0d00a0b44a3d2c5e..0e62f258ef6586e46ccbda9053663f568d17016d 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/cmd/commands/ListAllSubmissionsCommand.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/cmd/commands/ListAllSubmissionsCommand.java
@@ -1,13 +1,13 @@
-package de.fitko.fitconnect.client.cmd.commands;
+package dev.fitko.fitconnect.client.cmd.commands;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
-import de.fitko.fitconnect.client.cmd.util.UUIDConverter;
-import de.fitko.fitconnect.client.cmd.util.UUIDValidator;
+import dev.fitko.fitconnect.client.cmd.util.UUIDConverter;
+import dev.fitko.fitconnect.client.cmd.util.UUIDValidator;
 
 import java.util.UUID;
 
-import static de.fitko.fitconnect.client.cmd.commands.ListAllSubmissionsCommand.LIST_CMD_NAME;
+import static dev.fitko.fitconnect.client.cmd.commands.ListAllSubmissionsCommand.LIST_CMD_NAME;
 
 @Parameters(
         commandNames = {LIST_CMD_NAME},
diff --git a/client/src/main/java/de/fitko/fitconnect/client/cmd/commands/ListOneSubmissionCommand.java b/client/src/main/java/dev/fitko/fitconnect/client/cmd/commands/ListOneSubmissionCommand.java
similarity index 73%
rename from client/src/main/java/de/fitko/fitconnect/client/cmd/commands/ListOneSubmissionCommand.java
rename to client/src/main/java/dev/fitko/fitconnect/client/cmd/commands/ListOneSubmissionCommand.java
index cb24f2618e7b4efbcf6d66dfc117eab0ed226967..ee3eb906e1d04d760f1e681556988b9de2c877c9 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/cmd/commands/ListOneSubmissionCommand.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/cmd/commands/ListOneSubmissionCommand.java
@@ -1,13 +1,13 @@
-package de.fitko.fitconnect.client.cmd.commands;
+package dev.fitko.fitconnect.client.cmd.commands;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
-import de.fitko.fitconnect.client.cmd.util.UUIDConverter;
-import de.fitko.fitconnect.client.cmd.util.UUIDValidator;
+import dev.fitko.fitconnect.client.cmd.util.UUIDConverter;
+import dev.fitko.fitconnect.client.cmd.util.UUIDValidator;
 
 import java.util.UUID;
 
-import static de.fitko.fitconnect.client.cmd.commands.ListOneSubmissionCommand.GET_CMD_NAME;
+import static dev.fitko.fitconnect.client.cmd.commands.ListOneSubmissionCommand.GET_CMD_NAME;
 
 
 @Parameters(
diff --git a/client/src/main/java/de/fitko/fitconnect/client/cmd/commands/SendSubmissionCommand.java b/client/src/main/java/dev/fitko/fitconnect/client/cmd/commands/SendSubmissionCommand.java
similarity index 81%
rename from client/src/main/java/de/fitko/fitconnect/client/cmd/commands/SendSubmissionCommand.java
rename to client/src/main/java/dev/fitko/fitconnect/client/cmd/commands/SendSubmissionCommand.java
index 3baa75b8e2a0c6b5c574d5cf1a12077d66d3c496..7b0b69ba40d175141f3da53326e2d8d1b94b91b5 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/cmd/commands/SendSubmissionCommand.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/cmd/commands/SendSubmissionCommand.java
@@ -1,16 +1,16 @@
-package de.fitko.fitconnect.client.cmd.commands;
+package dev.fitko.fitconnect.client.cmd.commands;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
-import de.fitko.fitconnect.client.cmd.util.AttachmentDataType;
-import de.fitko.fitconnect.client.cmd.util.UUIDConverter;
-import de.fitko.fitconnect.client.cmd.util.UUIDValidator;
+import dev.fitko.fitconnect.client.cmd.util.AttachmentDataType;
+import dev.fitko.fitconnect.client.cmd.util.UUIDConverter;
+import dev.fitko.fitconnect.client.cmd.util.UUIDValidator;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
-import static de.fitko.fitconnect.client.cmd.commands.SendSubmissionCommand.SEND_CMD_NAME;
+import static dev.fitko.fitconnect.client.cmd.commands.SendSubmissionCommand.SEND_CMD_NAME;
 
 @Parameters(
         commandNames = {SEND_CMD_NAME},
diff --git a/client/src/main/java/de/fitko/fitconnect/client/cmd/util/AttachmentDataType.java b/client/src/main/java/dev/fitko/fitconnect/client/cmd/util/AttachmentDataType.java
similarity index 81%
rename from client/src/main/java/de/fitko/fitconnect/client/cmd/util/AttachmentDataType.java
rename to client/src/main/java/dev/fitko/fitconnect/client/cmd/util/AttachmentDataType.java
index 6bb7bba30ffd2cd30f0b246282567545cf29588e..260287afd94b33773516188a0a0a3188a2c637aa 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/cmd/util/AttachmentDataType.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/cmd/util/AttachmentDataType.java
@@ -1,6 +1,6 @@
-package de.fitko.fitconnect.client.cmd.util;
+package dev.fitko.fitconnect.client.cmd.util;
 
-import de.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
 
 public enum AttachmentDataType {
 
diff --git a/client/src/main/java/de/fitko/fitconnect/client/cmd/util/UUIDConverter.java b/client/src/main/java/dev/fitko/fitconnect/client/cmd/util/UUIDConverter.java
similarity index 87%
rename from client/src/main/java/de/fitko/fitconnect/client/cmd/util/UUIDConverter.java
rename to client/src/main/java/dev/fitko/fitconnect/client/cmd/util/UUIDConverter.java
index 6805f2765fed40ca8e2c5def8e1d35fb8b1b50e9..ea400a2e30a118ea4e87df0f8b9c4bdb69cf3d94 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/cmd/util/UUIDConverter.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/cmd/util/UUIDConverter.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.client.cmd.util;
+package dev.fitko.fitconnect.client.cmd.util;
 
 import com.beust.jcommander.converters.BaseConverter;
 
diff --git a/client/src/main/java/de/fitko/fitconnect/client/cmd/util/UUIDValidator.java b/client/src/main/java/dev/fitko/fitconnect/client/cmd/util/UUIDValidator.java
similarity index 94%
rename from client/src/main/java/de/fitko/fitconnect/client/cmd/util/UUIDValidator.java
rename to client/src/main/java/dev/fitko/fitconnect/client/cmd/util/UUIDValidator.java
index f5843b3b036f0690c3c8585c946226d5906c298c..7d0071df2f8bb354afdcfc360240c9a63d59f3d8 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/cmd/util/UUIDValidator.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/cmd/util/UUIDValidator.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.client.cmd.util;
+package dev.fitko.fitconnect.client.cmd.util;
 
 import com.beust.jcommander.IParameterValidator;
 import com.beust.jcommander.ParameterException;
diff --git a/client/src/main/java/de/fitko/fitconnect/client/factory/ApplicationConfigLoader.java b/client/src/main/java/dev/fitko/fitconnect/client/factory/ApplicationConfigLoader.java
similarity index 91%
rename from client/src/main/java/de/fitko/fitconnect/client/factory/ApplicationConfigLoader.java
rename to client/src/main/java/dev/fitko/fitconnect/client/factory/ApplicationConfigLoader.java
index c3f4797781c5dd315224c5367e3b4e18f5912806..f51986e60fb2c96fab0b66b82b9d0e8bdb592133 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/factory/ApplicationConfigLoader.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/factory/ApplicationConfigLoader.java
@@ -1,6 +1,6 @@
-package de.fitko.fitconnect.client.factory;
+package dev.fitko.fitconnect.client.factory;
 
-import de.fitko.fitconnect.api.config.ApplicationConfig;
+import dev.fitko.fitconnect.api.config.ApplicationConfig;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
diff --git a/client/src/main/java/de/fitko/fitconnect/client/factory/ClientFactory.java b/client/src/main/java/dev/fitko/fitconnect/client/factory/ClientFactory.java
similarity index 85%
rename from client/src/main/java/de/fitko/fitconnect/client/factory/ClientFactory.java
rename to client/src/main/java/dev/fitko/fitconnect/client/factory/ClientFactory.java
index 291357f70871000d5e713a66a4acef2e6d4e9149..40e8d04390b7ef02d3a2e1ec7ca80225a6549705 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/factory/ClientFactory.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/factory/ClientFactory.java
@@ -1,30 +1,30 @@
-package de.fitko.fitconnect.client.factory;
-
-import de.fitko.fitconnect.api.config.ApplicationConfig;
-import de.fitko.fitconnect.api.config.SubscriberConfig;
-import de.fitko.fitconnect.api.services.Sender;
-import de.fitko.fitconnect.api.services.Subscriber;
-import de.fitko.fitconnect.api.services.auth.OAuthService;
-import de.fitko.fitconnect.api.services.crypto.CryptoService;
-import de.fitko.fitconnect.api.services.crypto.MessageDigestService;
-import de.fitko.fitconnect.api.services.destination.DestinationService;
-import de.fitko.fitconnect.api.services.events.EventLogService;
-import de.fitko.fitconnect.api.services.events.SecurityEventService;
-import de.fitko.fitconnect.api.services.submission.SubmissionService;
-import de.fitko.fitconnect.api.services.validation.ValidationService;
-import de.fitko.fitconnect.client.SenderClient;
-import de.fitko.fitconnect.client.SubscriberClient;
-import de.fitko.fitconnect.core.SubmissionSender;
-import de.fitko.fitconnect.core.SubmissionSubscriber;
-import de.fitko.fitconnect.core.auth.DefaultOAuthService;
-import de.fitko.fitconnect.core.crypto.HashService;
-import de.fitko.fitconnect.core.crypto.JWECryptoService;
-import de.fitko.fitconnect.core.destination.DestinationRestService;
-import de.fitko.fitconnect.core.events.EventLogApiService;
-import de.fitko.fitconnect.core.events.SecurityEventTokenService;
-import de.fitko.fitconnect.core.http.ProxyConfig;
-import de.fitko.fitconnect.core.submission.SubmissionApiService;
-import de.fitko.fitconnect.core.validation.DefaultValidationService;
+package dev.fitko.fitconnect.client.factory;
+
+import dev.fitko.fitconnect.api.config.ApplicationConfig;
+import dev.fitko.fitconnect.api.config.SubscriberConfig;
+import dev.fitko.fitconnect.api.services.Sender;
+import dev.fitko.fitconnect.api.services.Subscriber;
+import dev.fitko.fitconnect.api.services.auth.OAuthService;
+import dev.fitko.fitconnect.api.services.crypto.CryptoService;
+import dev.fitko.fitconnect.api.services.crypto.MessageDigestService;
+import dev.fitko.fitconnect.api.services.destination.DestinationService;
+import dev.fitko.fitconnect.api.services.events.EventLogService;
+import dev.fitko.fitconnect.api.services.events.SecurityEventService;
+import dev.fitko.fitconnect.api.services.submission.SubmissionService;
+import dev.fitko.fitconnect.api.services.validation.ValidationService;
+import dev.fitko.fitconnect.client.SenderClient;
+import dev.fitko.fitconnect.client.SubscriberClient;
+import dev.fitko.fitconnect.core.SubmissionSender;
+import dev.fitko.fitconnect.core.SubmissionSubscriber;
+import dev.fitko.fitconnect.core.auth.DefaultOAuthService;
+import dev.fitko.fitconnect.core.crypto.HashService;
+import dev.fitko.fitconnect.core.crypto.JWECryptoService;
+import dev.fitko.fitconnect.core.destination.DestinationRestService;
+import dev.fitko.fitconnect.core.events.EventLogApiService;
+import dev.fitko.fitconnect.core.events.SecurityEventTokenService;
+import dev.fitko.fitconnect.core.http.ProxyConfig;
+import dev.fitko.fitconnect.core.submission.SubmissionApiService;
+import dev.fitko.fitconnect.core.validation.DefaultValidationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.client.RestTemplate;
diff --git a/client/src/main/java/de/fitko/fitconnect/client/model/AttachmentPayload.java b/client/src/main/java/dev/fitko/fitconnect/client/model/AttachmentPayload.java
similarity index 88%
rename from client/src/main/java/de/fitko/fitconnect/client/model/AttachmentPayload.java
rename to client/src/main/java/dev/fitko/fitconnect/client/model/AttachmentPayload.java
index bbf3515001ebe9879d0e220032fb6ca427059b40..ef861a66066b1def86b76d7d800fd84d8f741dac 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/model/AttachmentPayload.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/model/AttachmentPayload.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.client.model;
+package dev.fitko.fitconnect.client.model;
 
 import lombok.Builder;
 import lombok.Getter;
diff --git a/client/src/main/java/de/fitko/fitconnect/client/model/DataPayload.java b/client/src/main/java/dev/fitko/fitconnect/client/model/DataPayload.java
similarity index 72%
rename from client/src/main/java/de/fitko/fitconnect/client/model/DataPayload.java
rename to client/src/main/java/dev/fitko/fitconnect/client/model/DataPayload.java
index cdd45adaac3cc045e89cd2ee02b1400da9208572..661c9c672629ea518cc85aa840ed0dfa4e06491b 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/model/DataPayload.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/model/DataPayload.java
@@ -1,6 +1,6 @@
-package de.fitko.fitconnect.client.model;
+package dev.fitko.fitconnect.client.model;
 
-import de.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.With;
diff --git a/client/src/main/java/de/fitko/fitconnect/client/model/ReceivedSubmission.java b/client/src/main/java/dev/fitko/fitconnect/client/model/ReceivedSubmission.java
similarity index 57%
rename from client/src/main/java/de/fitko/fitconnect/client/model/ReceivedSubmission.java
rename to client/src/main/java/dev/fitko/fitconnect/client/model/ReceivedSubmission.java
index dd3dc5b15d0b805a2a9d5d3d55594068437bfd37..6d775801226f0727c8d77ecece91bf94035bd1ad 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/model/ReceivedSubmission.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/model/ReceivedSubmission.java
@@ -1,7 +1,7 @@
-package de.fitko.fitconnect.client.model;
+package dev.fitko.fitconnect.client.model;
 
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.AttachmentWithData;
-import de.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.AttachmentWithData;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.ToString;
diff --git a/client/src/main/java/de/fitko/fitconnect/client/model/ServiceTypePayload.java b/client/src/main/java/dev/fitko/fitconnect/client/model/ServiceTypePayload.java
similarity index 80%
rename from client/src/main/java/de/fitko/fitconnect/client/model/ServiceTypePayload.java
rename to client/src/main/java/dev/fitko/fitconnect/client/model/ServiceTypePayload.java
index 26f505e2ef1da0700d293ad6c6e6d8b9f9afefe4..5897b48b8b5171c5a4bf9ebe3113d84476938ab1 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/model/ServiceTypePayload.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/model/ServiceTypePayload.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.client.model;
+package dev.fitko.fitconnect.client.model;
 
 import lombok.Builder;
 import lombok.Data;
diff --git a/client/src/main/java/de/fitko/fitconnect/client/model/SubmissionPayload.java b/client/src/main/java/dev/fitko/fitconnect/client/model/SubmissionPayload.java
similarity index 93%
rename from client/src/main/java/de/fitko/fitconnect/client/model/SubmissionPayload.java
rename to client/src/main/java/dev/fitko/fitconnect/client/model/SubmissionPayload.java
index b5f57a10c4cbfa4579e028f682b88bd90cc2941e..aac80eb0aa344e8a506307af12325f39b17b189c 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/model/SubmissionPayload.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/model/SubmissionPayload.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.client.model;
+package dev.fitko.fitconnect.client.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/client/src/main/java/de/fitko/fitconnect/client/strategies/SendEncryptedSubmissionStrategy.java b/client/src/main/java/dev/fitko/fitconnect/client/strategies/SendEncryptedSubmissionStrategy.java
similarity index 81%
rename from client/src/main/java/de/fitko/fitconnect/client/strategies/SendEncryptedSubmissionStrategy.java
rename to client/src/main/java/dev/fitko/fitconnect/client/strategies/SendEncryptedSubmissionStrategy.java
index 5c08300d237b43f42613b16f0e607f9f3493cdf0..6374f4fd7ae4d95f6fd415716d3dd6095178f20b 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/strategies/SendEncryptedSubmissionStrategy.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/strategies/SendEncryptedSubmissionStrategy.java
@@ -1,13 +1,13 @@
-package de.fitko.fitconnect.client.strategies;
+package dev.fitko.fitconnect.client.strategies;
 
-import de.fitko.fitconnect.api.domain.model.submission.CreateSubmission;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
-import de.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
-import de.fitko.fitconnect.api.exceptions.RestApiException;
-import de.fitko.fitconnect.api.exceptions.SubmissionNotCreatedException;
-import de.fitko.fitconnect.api.services.Sender;
-import de.fitko.fitconnect.client.model.AttachmentPayload;
-import de.fitko.fitconnect.client.model.SubmissionPayload;
+import dev.fitko.fitconnect.api.domain.model.submission.CreateSubmission;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
+import dev.fitko.fitconnect.api.exceptions.RestApiException;
+import dev.fitko.fitconnect.api.exceptions.SubmissionNotCreatedException;
+import dev.fitko.fitconnect.api.services.Sender;
+import dev.fitko.fitconnect.client.model.AttachmentPayload;
+import dev.fitko.fitconnect.client.model.SubmissionPayload;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -15,8 +15,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
-import static de.fitko.fitconnect.client.util.SubmissionUtil.buildSubmissionToAnnounce;
-import static de.fitko.fitconnect.client.util.SubmissionUtil.buildSubmitSubmission;
+import static dev.fitko.fitconnect.client.util.SubmissionUtil.buildSubmissionToAnnounce;
+import static dev.fitko.fitconnect.client.util.SubmissionUtil.buildSubmitSubmission;
 
 public class SendEncryptedSubmissionStrategy implements SubmitStrategy {
 
diff --git a/client/src/main/java/de/fitko/fitconnect/client/strategies/SendNewSubmissionStrategy.java b/client/src/main/java/dev/fitko/fitconnect/client/strategies/SendNewSubmissionStrategy.java
similarity index 85%
rename from client/src/main/java/de/fitko/fitconnect/client/strategies/SendNewSubmissionStrategy.java
rename to client/src/main/java/dev/fitko/fitconnect/client/strategies/SendNewSubmissionStrategy.java
index b4856f1f045e5085a58bbf410cbc4aa63cc8557b..181f392ca0f10b268789d11958813d97837ee211 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/strategies/SendNewSubmissionStrategy.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/strategies/SendNewSubmissionStrategy.java
@@ -1,27 +1,32 @@
-package de.fitko.fitconnect.client.strategies;
+package dev.fitko.fitconnect.client.strategies;
 
 import com.nimbusds.jose.jwk.RSAKey;
-import de.fitko.fitconnect.api.config.Environment;
-import de.fitko.fitconnect.api.domain.model.destination.Destination;
-import de.fitko.fitconnect.api.domain.model.destination.DestinationService;
-import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.model.metadata.PublicServiceType;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
-import de.fitko.fitconnect.api.domain.model.metadata.data.Data;
-import de.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
-import de.fitko.fitconnect.api.domain.model.metadata.data.SubmissionSchema;
-import de.fitko.fitconnect.api.domain.model.submission.CreateSubmission;
-import de.fitko.fitconnect.api.domain.model.submission.ServiceType;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
-import de.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
-import de.fitko.fitconnect.api.domain.validation.ValidationResult;
-import de.fitko.fitconnect.api.exceptions.*;
-import de.fitko.fitconnect.api.services.Sender;
-import de.fitko.fitconnect.client.model.AttachmentPayload;
-import de.fitko.fitconnect.client.model.DataPayload;
-import de.fitko.fitconnect.client.model.ServiceTypePayload;
-import de.fitko.fitconnect.client.model.SubmissionPayload;
-import de.fitko.fitconnect.client.util.SubmissionUtil;
+import dev.fitko.fitconnect.api.config.Environment;
+import dev.fitko.fitconnect.api.domain.model.destination.Destination;
+import dev.fitko.fitconnect.api.domain.model.destination.DestinationService;
+import dev.fitko.fitconnect.api.domain.model.metadata.Metadata;
+import dev.fitko.fitconnect.api.domain.model.metadata.PublicServiceType;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.Data;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.SubmissionSchema;
+import dev.fitko.fitconnect.api.domain.model.submission.CreateSubmission;
+import dev.fitko.fitconnect.api.domain.model.submission.ServiceType;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
+import dev.fitko.fitconnect.api.domain.validation.ValidationResult;
+import dev.fitko.fitconnect.api.exceptions.AttachmentCreationException;
+import dev.fitko.fitconnect.api.exceptions.EncryptionException;
+import dev.fitko.fitconnect.api.exceptions.KeyNotRetrievedException;
+import dev.fitko.fitconnect.api.exceptions.RestApiException;
+import dev.fitko.fitconnect.api.exceptions.SchemaNotFoundException;
+import dev.fitko.fitconnect.api.exceptions.SubmissionNotCreatedException;
+import dev.fitko.fitconnect.api.services.Sender;
+import dev.fitko.fitconnect.client.model.AttachmentPayload;
+import dev.fitko.fitconnect.client.model.DataPayload;
+import dev.fitko.fitconnect.client.model.ServiceTypePayload;
+import dev.fitko.fitconnect.client.model.SubmissionPayload;
+import dev.fitko.fitconnect.client.util.SubmissionUtil;
 import org.apache.tika.Tika;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/client/src/main/java/de/fitko/fitconnect/client/strategies/SubmitStrategy.java b/client/src/main/java/dev/fitko/fitconnect/client/strategies/SubmitStrategy.java
similarity index 82%
rename from client/src/main/java/de/fitko/fitconnect/client/strategies/SubmitStrategy.java
rename to client/src/main/java/dev/fitko/fitconnect/client/strategies/SubmitStrategy.java
index 92d9e3e5582057807a005c3f503eca550c04ad04..15d0880953fc2d3f1e05d4f05c96c89c252407f7 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/strategies/SubmitStrategy.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/strategies/SubmitStrategy.java
@@ -1,7 +1,7 @@
-package de.fitko.fitconnect.client.strategies;
+package dev.fitko.fitconnect.client.strategies;
 
-import de.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
-import de.fitko.fitconnect.client.model.SubmissionPayload;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
+import dev.fitko.fitconnect.client.model.SubmissionPayload;
 
 import java.util.Optional;
 
diff --git a/client/src/main/java/de/fitko/fitconnect/client/util/SubmissionUtil.java b/client/src/main/java/dev/fitko/fitconnect/client/util/SubmissionUtil.java
similarity index 79%
rename from client/src/main/java/de/fitko/fitconnect/client/util/SubmissionUtil.java
rename to client/src/main/java/dev/fitko/fitconnect/client/util/SubmissionUtil.java
index 748fdfc56d9fa5923840080fd99f3b81b23de552..3a74a8a71b7bc7f731cae776c66bd2e163213c93 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/util/SubmissionUtil.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/util/SubmissionUtil.java
@@ -1,24 +1,24 @@
-package de.fitko.fitconnect.client.util;
-
-import de.fitko.fitconnect.api.domain.model.metadata.ContentStructure;
-import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.model.metadata.PublicServiceType;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.Purpose;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.signature.AttachmentSignatureType;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.signature.Hash__1;
-import de.fitko.fitconnect.api.domain.model.metadata.data.Data;
-import de.fitko.fitconnect.api.domain.model.metadata.data.DataSignatureType;
-import de.fitko.fitconnect.api.domain.model.metadata.data.Hash;
-import de.fitko.fitconnect.api.domain.model.metadata.data.SubmissionSchema;
-import de.fitko.fitconnect.api.domain.model.submission.CreateSubmission;
-import de.fitko.fitconnect.api.domain.model.submission.ServiceType;
-import de.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
-import de.fitko.fitconnect.client.model.AttachmentPayload;
-import de.fitko.fitconnect.client.model.DataPayload;
-import de.fitko.fitconnect.client.model.ServiceTypePayload;
-import de.fitko.fitconnect.client.model.SubmissionPayload;
-import de.fitko.fitconnect.core.util.Strings;
+package dev.fitko.fitconnect.client.util;
+
+import dev.fitko.fitconnect.api.domain.model.metadata.ContentStructure;
+import dev.fitko.fitconnect.api.domain.model.metadata.Metadata;
+import dev.fitko.fitconnect.api.domain.model.metadata.PublicServiceType;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.Purpose;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.signature.AttachmentSignatureType;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.signature.Hash__1;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.Data;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.DataSignatureType;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.Hash;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.SubmissionSchema;
+import dev.fitko.fitconnect.api.domain.model.submission.CreateSubmission;
+import dev.fitko.fitconnect.api.domain.model.submission.ServiceType;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
+import dev.fitko.fitconnect.client.model.AttachmentPayload;
+import dev.fitko.fitconnect.client.model.DataPayload;
+import dev.fitko.fitconnect.client.model.ServiceTypePayload;
+import dev.fitko.fitconnect.client.model.SubmissionPayload;
+import dev.fitko.fitconnect.core.util.Strings;
 
 import java.io.File;
 import java.util.List;
diff --git a/client/src/test/java/de/fitko/fitconnect/client/ClientIntegrationTest.java b/client/src/test/java/dev/fitko/fitconnect/client/ClientIntegrationTest.java
similarity index 89%
rename from client/src/test/java/de/fitko/fitconnect/client/ClientIntegrationTest.java
rename to client/src/test/java/dev/fitko/fitconnect/client/ClientIntegrationTest.java
index 885b3e3e3ecd3c4a124a55d32c31ac77a6a0c70c..71c171cb8581d1895468223c487a96fd91b76c9b 100644
--- a/client/src/test/java/de/fitko/fitconnect/client/ClientIntegrationTest.java
+++ b/client/src/test/java/dev/fitko/fitconnect/client/ClientIntegrationTest.java
@@ -1,23 +1,28 @@
-package de.fitko.fitconnect.client;
+package dev.fitko.fitconnect.client;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.nimbusds.jose.jwk.RSAKey;
-import de.fitko.fitconnect.api.config.*;
-import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.model.metadata.PublicServiceType;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
-import de.fitko.fitconnect.api.domain.model.metadata.data.Data;
-import de.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
-import de.fitko.fitconnect.api.services.crypto.CryptoService;
-import de.fitko.fitconnect.client.factory.ClientFactory;
-import de.fitko.fitconnect.client.model.AttachmentPayload;
-import de.fitko.fitconnect.client.model.DataPayload;
-import de.fitko.fitconnect.client.model.ReceivedSubmission;
-import de.fitko.fitconnect.client.model.ServiceTypePayload;
-import de.fitko.fitconnect.client.util.SubmissionUtil;
-import de.fitko.fitconnect.core.crypto.HashService;
-import de.fitko.fitconnect.core.crypto.JWECryptoService;
+import dev.fitko.fitconnect.api.config.ApplicationConfig;
+import dev.fitko.fitconnect.api.config.Environment;
+import dev.fitko.fitconnect.api.config.EnvironmentName;
+import dev.fitko.fitconnect.api.config.ResourcePaths;
+import dev.fitko.fitconnect.api.config.SenderConfig;
+import dev.fitko.fitconnect.api.config.SubscriberConfig;
+import dev.fitko.fitconnect.api.domain.model.metadata.Metadata;
+import dev.fitko.fitconnect.api.domain.model.metadata.PublicServiceType;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.Data;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.services.crypto.CryptoService;
+import dev.fitko.fitconnect.client.factory.ClientFactory;
+import dev.fitko.fitconnect.client.model.AttachmentPayload;
+import dev.fitko.fitconnect.client.model.DataPayload;
+import dev.fitko.fitconnect.client.model.ReceivedSubmission;
+import dev.fitko.fitconnect.client.model.ServiceTypePayload;
+import dev.fitko.fitconnect.client.util.SubmissionUtil;
+import dev.fitko.fitconnect.core.crypto.HashService;
+import dev.fitko.fitconnect.core.crypto.JWECryptoService;
 import org.apache.tika.mime.MimeTypes;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
diff --git a/client/src/test/java/de/fitko/fitconnect/client/SenderClientTest.java b/client/src/test/java/dev/fitko/fitconnect/client/SenderClientTest.java
similarity index 94%
rename from client/src/test/java/de/fitko/fitconnect/client/SenderClientTest.java
rename to client/src/test/java/dev/fitko/fitconnect/client/SenderClientTest.java
index 2db080a571434e23c54dd345eb5c9dd6473800fa..946c76867395396c8095caf04be917374ff1b624 100644
--- a/client/src/test/java/de/fitko/fitconnect/client/SenderClientTest.java
+++ b/client/src/test/java/dev/fitko/fitconnect/client/SenderClientTest.java
@@ -1,20 +1,24 @@
-package de.fitko.fitconnect.client;
+package dev.fitko.fitconnect.client;
 
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.jwk.KeyUse;
 import com.nimbusds.jose.jwk.RSAKey;
 import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
-import de.fitko.fitconnect.api.config.Environment;
-import de.fitko.fitconnect.api.domain.model.destination.Destination;
-import de.fitko.fitconnect.api.domain.model.destination.DestinationService;
-import de.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
-import de.fitko.fitconnect.api.domain.model.metadata.data.SubmissionSchema;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
-import de.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
-import de.fitko.fitconnect.api.domain.validation.ValidationResult;
-import de.fitko.fitconnect.api.exceptions.*;
-import de.fitko.fitconnect.api.services.Sender;
-import de.fitko.fitconnect.client.testutil.LogCaptor;
+import dev.fitko.fitconnect.api.config.Environment;
+import dev.fitko.fitconnect.api.domain.model.destination.Destination;
+import dev.fitko.fitconnect.api.domain.model.destination.DestinationService;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.SubmissionSchema;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
+import dev.fitko.fitconnect.api.domain.validation.ValidationResult;
+import dev.fitko.fitconnect.api.exceptions.EncryptionException;
+import dev.fitko.fitconnect.api.exceptions.KeyNotRetrievedException;
+import dev.fitko.fitconnect.api.exceptions.RestApiException;
+import dev.fitko.fitconnect.api.exceptions.SubmissionNotCreatedException;
+import dev.fitko.fitconnect.api.exceptions.ValidationException;
+import dev.fitko.fitconnect.api.services.Sender;
+import dev.fitko.fitconnect.client.testutil.LogCaptor;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/client/src/test/java/de/fitko/fitconnect/client/SubscriberClientTest.java b/client/src/test/java/dev/fitko/fitconnect/client/SubscriberClientTest.java
similarity index 91%
rename from client/src/test/java/de/fitko/fitconnect/client/SubscriberClientTest.java
rename to client/src/test/java/dev/fitko/fitconnect/client/SubscriberClientTest.java
index 1be40888067031501ea05049497e4d96532725ee..206cbc35ffef88e1a7876fcabb31799e82fadcae 100644
--- a/client/src/test/java/de/fitko/fitconnect/client/SubscriberClientTest.java
+++ b/client/src/test/java/dev/fitko/fitconnect/client/SubscriberClientTest.java
@@ -1,22 +1,30 @@
-package de.fitko.fitconnect.client;
+package dev.fitko.fitconnect.client;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.nimbusds.jose.jwk.RSAKey;
-import de.fitko.fitconnect.api.domain.model.metadata.ContentStructure;
-import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.signature.Hash__1;
-import de.fitko.fitconnect.api.domain.model.metadata.data.*;
-import de.fitko.fitconnect.api.domain.model.submission.Submission;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
-import de.fitko.fitconnect.api.domain.validation.ValidationResult;
-import de.fitko.fitconnect.api.exceptions.*;
-import de.fitko.fitconnect.api.services.Subscriber;
-import de.fitko.fitconnect.api.services.crypto.CryptoService;
-import de.fitko.fitconnect.client.testutil.LogCaptor;
-import de.fitko.fitconnect.core.crypto.HashService;
-import de.fitko.fitconnect.core.crypto.JWECryptoService;
+import dev.fitko.fitconnect.api.domain.model.metadata.ContentStructure;
+import dev.fitko.fitconnect.api.domain.model.metadata.Metadata;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.signature.Hash__1;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.Data;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.DataSignatureType;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.Hash;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.SubmissionSchema;
+import dev.fitko.fitconnect.api.domain.model.submission.Submission;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.domain.validation.ValidationResult;
+import dev.fitko.fitconnect.api.exceptions.DecryptionException;
+import dev.fitko.fitconnect.api.exceptions.EventCreationException;
+import dev.fitko.fitconnect.api.exceptions.InvalidSigningKeyException;
+import dev.fitko.fitconnect.api.exceptions.RestApiException;
+import dev.fitko.fitconnect.api.exceptions.ValidationException;
+import dev.fitko.fitconnect.api.services.Subscriber;
+import dev.fitko.fitconnect.api.services.crypto.CryptoService;
+import dev.fitko.fitconnect.client.testutil.LogCaptor;
+import dev.fitko.fitconnect.core.crypto.HashService;
+import dev.fitko.fitconnect.core.crypto.JWECryptoService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/client/src/test/java/de/fitko/fitconnect/client/cmd/CommandLineClientTest.java b/client/src/test/java/dev/fitko/fitconnect/client/cmd/CommandLineClientTest.java
similarity index 89%
rename from client/src/test/java/de/fitko/fitconnect/client/cmd/CommandLineClientTest.java
rename to client/src/test/java/dev/fitko/fitconnect/client/cmd/CommandLineClientTest.java
index 8e57ed88f5d6b7d1384270ed9f8b525443279d49..9b937800420ed0d9b319b90ae2ead9d5e3f5cf13 100644
--- a/client/src/test/java/de/fitko/fitconnect/client/cmd/CommandLineClientTest.java
+++ b/client/src/test/java/dev/fitko/fitconnect/client/cmd/CommandLineClientTest.java
@@ -1,14 +1,14 @@
-package de.fitko.fitconnect.client.cmd;
-
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
-import de.fitko.fitconnect.api.domain.model.metadata.attachment.AttachmentWithData;
-import de.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
-import de.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
-import de.fitko.fitconnect.client.SenderClient;
-import de.fitko.fitconnect.client.SubscriberClient;
-import de.fitko.fitconnect.client.model.ReceivedSubmission;
-import de.fitko.fitconnect.client.testutil.LogCaptor;
+package dev.fitko.fitconnect.client.cmd;
+
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
+import dev.fitko.fitconnect.api.domain.model.metadata.attachment.AttachmentWithData;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
+import dev.fitko.fitconnect.client.SenderClient;
+import dev.fitko.fitconnect.client.SubscriberClient;
+import dev.fitko.fitconnect.client.model.ReceivedSubmission;
+import dev.fitko.fitconnect.client.testutil.LogCaptor;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
diff --git a/client/src/test/java/de/fitko/fitconnect/client/cmd/util/UUIDConverterTest.java b/client/src/test/java/dev/fitko/fitconnect/client/cmd/util/UUIDConverterTest.java
similarity index 94%
rename from client/src/test/java/de/fitko/fitconnect/client/cmd/util/UUIDConverterTest.java
rename to client/src/test/java/dev/fitko/fitconnect/client/cmd/util/UUIDConverterTest.java
index 21b998d9bb36d90042fa28d65465b448710ae2ce..3d03fb49081d0cff70a47a9dc3bd29780453024b 100644
--- a/client/src/test/java/de/fitko/fitconnect/client/cmd/util/UUIDConverterTest.java
+++ b/client/src/test/java/dev/fitko/fitconnect/client/cmd/util/UUIDConverterTest.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.client.cmd.util;
+package dev.fitko.fitconnect.client.cmd.util;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/client/src/test/java/de/fitko/fitconnect/client/cmd/util/UUIDValidatorTest.java b/client/src/test/java/dev/fitko/fitconnect/client/cmd/util/UUIDValidatorTest.java
similarity index 93%
rename from client/src/test/java/de/fitko/fitconnect/client/cmd/util/UUIDValidatorTest.java
rename to client/src/test/java/dev/fitko/fitconnect/client/cmd/util/UUIDValidatorTest.java
index 3d1624efe196fe2c32325eae830f499c7406c3d0..dd15867e5e1af92de217a34a3216a92f0f2dc07d 100644
--- a/client/src/test/java/de/fitko/fitconnect/client/cmd/util/UUIDValidatorTest.java
+++ b/client/src/test/java/dev/fitko/fitconnect/client/cmd/util/UUIDValidatorTest.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.client.cmd.util;
+package dev.fitko.fitconnect.client.cmd.util;
 
 import com.beust.jcommander.ParameterException;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/client/src/test/java/de/fitko/fitconnect/client/factory/ApplicationConfigLoaderTest.java b/client/src/test/java/dev/fitko/fitconnect/client/factory/ApplicationConfigLoaderTest.java
similarity index 89%
rename from client/src/test/java/de/fitko/fitconnect/client/factory/ApplicationConfigLoaderTest.java
rename to client/src/test/java/dev/fitko/fitconnect/client/factory/ApplicationConfigLoaderTest.java
index 99d44737fe4e2363283b2a7890c806da7d142da0..af26b47f02fe0a61360532af8454a0cb2aa50925 100644
--- a/client/src/test/java/de/fitko/fitconnect/client/factory/ApplicationConfigLoaderTest.java
+++ b/client/src/test/java/dev/fitko/fitconnect/client/factory/ApplicationConfigLoaderTest.java
@@ -1,9 +1,9 @@
-package de.fitko.fitconnect.client.factory;
+package dev.fitko.fitconnect.client.factory;
 
-import de.fitko.fitconnect.api.config.ApplicationConfig;
-import de.fitko.fitconnect.api.config.Environment;
-import de.fitko.fitconnect.api.config.SenderConfig;
-import de.fitko.fitconnect.api.exceptions.InitializationException;
+import dev.fitko.fitconnect.api.config.ApplicationConfig;
+import dev.fitko.fitconnect.api.config.Environment;
+import dev.fitko.fitconnect.api.config.SenderConfig;
+import dev.fitko.fitconnect.api.exceptions.InitializationException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/client/src/test/java/de/fitko/fitconnect/client/factory/ClientFactoryTest.java b/client/src/test/java/dev/fitko/fitconnect/client/factory/ClientFactoryTest.java
similarity index 87%
rename from client/src/test/java/de/fitko/fitconnect/client/factory/ClientFactoryTest.java
rename to client/src/test/java/dev/fitko/fitconnect/client/factory/ClientFactoryTest.java
index 3e611a621cd4cf54ec4041afb19540a5b579f430..68625bc9a7ee47e2bc6df1786c23bebbe3ef14c2 100644
--- a/client/src/test/java/de/fitko/fitconnect/client/factory/ClientFactoryTest.java
+++ b/client/src/test/java/dev/fitko/fitconnect/client/factory/ClientFactoryTest.java
@@ -1,6 +1,11 @@
-package de.fitko.fitconnect.client.factory;
-
-import de.fitko.fitconnect.api.config.*;
+package dev.fitko.fitconnect.client.factory;
+
+import dev.fitko.fitconnect.api.config.ApplicationConfig;
+import dev.fitko.fitconnect.api.config.Environment;
+import dev.fitko.fitconnect.api.config.EnvironmentName;
+import dev.fitko.fitconnect.api.config.ResourcePaths;
+import dev.fitko.fitconnect.api.config.SenderConfig;
+import dev.fitko.fitconnect.api.config.SubscriberConfig;
 import org.junit.jupiter.api.Test;
 
 import java.util.Map;
diff --git a/client/src/test/java/de/fitko/fitconnect/client/testutil/LogCaptor.java b/client/src/test/java/dev/fitko/fitconnect/client/testutil/LogCaptor.java
similarity index 91%
rename from client/src/test/java/de/fitko/fitconnect/client/testutil/LogCaptor.java
rename to client/src/test/java/dev/fitko/fitconnect/client/testutil/LogCaptor.java
index 10e4d69ed685da19e107571f357480459d383368..50d90c1960e2775b812ad313e358a61a7c3de516 100644
--- a/client/src/test/java/de/fitko/fitconnect/client/testutil/LogCaptor.java
+++ b/client/src/test/java/dev/fitko/fitconnect/client/testutil/LogCaptor.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.client.testutil;
+package dev.fitko.fitconnect.client.testutil;
 
 import ch.qos.logback.classic.spi.LoggingEvent;
 import ch.qos.logback.core.AppenderBase;
diff --git a/core/pom.xml b/core/pom.xml
index aa2b7292c8ce982116aaca496507b6506239945d..9c464ea5f588c22cb135f3362c76db889cb77747 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -4,17 +4,18 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>sdk-java</artifactId>
-        <groupId>de.fitko.fitconnect.sdk</groupId>
+        <groupId>dev.fitko.fitconnect.sdk</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>core</artifactId>
     <packaging>jar</packaging>
+    <name>FIT-Connect Java SDK - Core Lib</name>
 
     <dependencies>
         <dependency>
-            <groupId>de.fitko.fitconnect.sdk</groupId>
+            <groupId>dev.fitko.fitconnect.sdk</groupId>
             <artifactId>api</artifactId>
         </dependency>
         <dependency>
@@ -70,4 +71,13 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file
diff --git a/core/src/main/java/de/fitko/fitconnect/core/SubmissionSender.java b/core/src/main/java/dev/fitko/fitconnect/core/SubmissionSender.java
similarity index 79%
rename from core/src/main/java/de/fitko/fitconnect/core/SubmissionSender.java
rename to core/src/main/java/dev/fitko/fitconnect/core/SubmissionSender.java
index d19332a82ccb5e075ac2a744b497e8f932ea1402..1f7204210b2d3d1b4e32b9c76f9c45e116328650 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/SubmissionSender.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/SubmissionSender.java
@@ -1,26 +1,26 @@
-package de.fitko.fitconnect.core;
+package dev.fitko.fitconnect.core;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.nimbusds.jose.jwk.RSAKey;
-import de.fitko.fitconnect.api.domain.model.destination.Destination;
-import de.fitko.fitconnect.api.domain.model.jwk.JWK;
-import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.model.submission.CreateSubmission;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
-import de.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
-import de.fitko.fitconnect.api.domain.validation.ValidationResult;
-import de.fitko.fitconnect.api.exceptions.EncryptionException;
-import de.fitko.fitconnect.api.exceptions.KeyNotRetrievedException;
-import de.fitko.fitconnect.api.exceptions.MetadataNotCreatedException;
-import de.fitko.fitconnect.api.exceptions.RestApiException;
-import de.fitko.fitconnect.api.services.Sender;
-import de.fitko.fitconnect.api.services.crypto.CryptoService;
-import de.fitko.fitconnect.api.services.destination.DestinationService;
-import de.fitko.fitconnect.api.services.events.EventLogService;
-import de.fitko.fitconnect.api.services.events.SecurityEventService;
-import de.fitko.fitconnect.api.services.submission.SubmissionService;
-import de.fitko.fitconnect.api.services.validation.ValidationService;
+import dev.fitko.fitconnect.api.domain.model.destination.Destination;
+import dev.fitko.fitconnect.api.domain.model.jwk.JWK;
+import dev.fitko.fitconnect.api.domain.model.metadata.Metadata;
+import dev.fitko.fitconnect.api.domain.model.submission.CreateSubmission;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
+import dev.fitko.fitconnect.api.domain.validation.ValidationResult;
+import dev.fitko.fitconnect.api.exceptions.EncryptionException;
+import dev.fitko.fitconnect.api.exceptions.KeyNotRetrievedException;
+import dev.fitko.fitconnect.api.exceptions.MetadataNotCreatedException;
+import dev.fitko.fitconnect.api.exceptions.RestApiException;
+import dev.fitko.fitconnect.api.services.Sender;
+import dev.fitko.fitconnect.api.services.crypto.CryptoService;
+import dev.fitko.fitconnect.api.services.destination.DestinationService;
+import dev.fitko.fitconnect.api.services.events.EventLogService;
+import dev.fitko.fitconnect.api.services.events.SecurityEventService;
+import dev.fitko.fitconnect.api.services.submission.SubmissionService;
+import dev.fitko.fitconnect.api.services.validation.ValidationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/core/src/main/java/de/fitko/fitconnect/core/SubmissionSubscriber.java b/core/src/main/java/dev/fitko/fitconnect/core/SubmissionSubscriber.java
similarity index 82%
rename from core/src/main/java/de/fitko/fitconnect/core/SubmissionSubscriber.java
rename to core/src/main/java/dev/fitko/fitconnect/core/SubmissionSubscriber.java
index 963ed559a505acf6a1490a5df4da85639418ea29..ec1639f9ca39c941aa220ab90fe79b2274b7b7ad 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/SubmissionSubscriber.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/SubmissionSubscriber.java
@@ -1,16 +1,16 @@
-package de.fitko.fitconnect.core;
+package dev.fitko.fitconnect.core;
 
 import com.nimbusds.jose.jwk.RSAKey;
-import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.model.submission.Submission;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
-import de.fitko.fitconnect.api.domain.validation.ValidationResult;
-import de.fitko.fitconnect.api.services.Subscriber;
-import de.fitko.fitconnect.api.services.crypto.CryptoService;
-import de.fitko.fitconnect.api.services.events.EventLogService;
-import de.fitko.fitconnect.api.services.events.SecurityEventService;
-import de.fitko.fitconnect.api.services.submission.SubmissionService;
-import de.fitko.fitconnect.api.services.validation.ValidationService;
+import dev.fitko.fitconnect.api.domain.model.metadata.Metadata;
+import dev.fitko.fitconnect.api.domain.model.submission.Submission;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.domain.validation.ValidationResult;
+import dev.fitko.fitconnect.api.services.Subscriber;
+import dev.fitko.fitconnect.api.services.crypto.CryptoService;
+import dev.fitko.fitconnect.api.services.events.EventLogService;
+import dev.fitko.fitconnect.api.services.events.SecurityEventService;
+import dev.fitko.fitconnect.api.services.submission.SubmissionService;
+import dev.fitko.fitconnect.api.services.validation.ValidationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/core/src/main/java/de/fitko/fitconnect/core/auth/DefaultOAuthService.java b/core/src/main/java/dev/fitko/fitconnect/core/auth/DefaultOAuthService.java
similarity index 90%
rename from core/src/main/java/de/fitko/fitconnect/core/auth/DefaultOAuthService.java
rename to core/src/main/java/dev/fitko/fitconnect/core/auth/DefaultOAuthService.java
index 7e2af3fab92299e8a2b77fa4c77e8057472485b6..27226352d96f99d8fe2937aa76bf9a64c09b61f6 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/auth/DefaultOAuthService.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/auth/DefaultOAuthService.java
@@ -1,9 +1,10 @@
-package de.fitko.fitconnect.core.auth;
+package dev.fitko.fitconnect.core.auth;
 
-import de.fitko.fitconnect.api.domain.auth.OAuthToken;
-import de.fitko.fitconnect.api.exceptions.AuthenticationException;
-import de.fitko.fitconnect.api.exceptions.RestApiException;
-import de.fitko.fitconnect.api.services.auth.OAuthService;
+import dev.fitko.fitconnect.api.domain.auth.OAuthToken;
+import dev.fitko.fitconnect.api.exceptions.AuthenticationException;
+import dev.fitko.fitconnect.api.exceptions.RestApiException;
+import dev.fitko.fitconnect.api.services.auth.OAuthService;
+import dev.fitko.fitconnect.core.util.Preconditions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpEntity;
@@ -19,7 +20,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
-import static de.fitko.fitconnect.core.util.Preconditions.checkNotNull;
+import static dev.fitko.fitconnect.core.util.Preconditions.checkNotNull;
 import static java.util.stream.Collectors.joining;
 
 public class DefaultOAuthService implements OAuthService {
diff --git a/core/src/main/java/de/fitko/fitconnect/core/crypto/HashService.java b/core/src/main/java/dev/fitko/fitconnect/core/crypto/HashService.java
similarity index 94%
rename from core/src/main/java/de/fitko/fitconnect/core/crypto/HashService.java
rename to core/src/main/java/dev/fitko/fitconnect/core/crypto/HashService.java
index 17070af66907c8f55803d755b320d33cbf2af16b..ade78681806b4bedc92bdd7768c798f2e93f91a1 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/crypto/HashService.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/crypto/HashService.java
@@ -1,7 +1,7 @@
-package de.fitko.fitconnect.core.crypto;
+package dev.fitko.fitconnect.core.crypto;
 
-import de.fitko.fitconnect.api.exceptions.InitializationException;
-import de.fitko.fitconnect.api.services.crypto.MessageDigestService;
+import dev.fitko.fitconnect.api.exceptions.InitializationException;
+import dev.fitko.fitconnect.api.services.crypto.MessageDigestService;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
diff --git a/core/src/main/java/de/fitko/fitconnect/core/crypto/JWECryptoService.java b/core/src/main/java/dev/fitko/fitconnect/core/crypto/JWECryptoService.java
similarity index 93%
rename from core/src/main/java/de/fitko/fitconnect/core/crypto/JWECryptoService.java
rename to core/src/main/java/dev/fitko/fitconnect/core/crypto/JWECryptoService.java
index 1eea483efead1d28ea715037eebd5bf30c57cb63..b8f5a044d4f5441966e464f3bc23a3ba1c7de512 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/crypto/JWECryptoService.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/crypto/JWECryptoService.java
@@ -1,13 +1,13 @@
-package de.fitko.fitconnect.core.crypto;
+package dev.fitko.fitconnect.core.crypto;
 
 import com.nimbusds.jose.*;
 import com.nimbusds.jose.crypto.RSADecrypter;
 import com.nimbusds.jose.crypto.RSAEncrypter;
 import com.nimbusds.jose.jwk.RSAKey;
-import de.fitko.fitconnect.api.exceptions.DecryptionException;
-import de.fitko.fitconnect.api.exceptions.EncryptionException;
-import de.fitko.fitconnect.api.services.crypto.CryptoService;
-import de.fitko.fitconnect.api.services.crypto.MessageDigestService;
+import dev.fitko.fitconnect.api.exceptions.DecryptionException;
+import dev.fitko.fitconnect.api.exceptions.EncryptionException;
+import dev.fitko.fitconnect.api.services.crypto.CryptoService;
+import dev.fitko.fitconnect.api.services.crypto.MessageDigestService;
 
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
diff --git a/core/src/main/java/de/fitko/fitconnect/core/destination/DestinationRestService.java b/core/src/main/java/dev/fitko/fitconnect/core/destination/DestinationRestService.java
similarity index 81%
rename from core/src/main/java/de/fitko/fitconnect/core/destination/DestinationRestService.java
rename to core/src/main/java/dev/fitko/fitconnect/core/destination/DestinationRestService.java
index d4cdc5addcf4771b45837561fa7c09be466e6e55..aa999edc594ecc0b7679db9392293c6e5754bd24 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/destination/DestinationRestService.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/destination/DestinationRestService.java
@@ -1,12 +1,12 @@
-package de.fitko.fitconnect.core.destination;
-
-import de.fitko.fitconnect.api.config.ApplicationConfig;
-import de.fitko.fitconnect.api.domain.auth.OAuthToken;
-import de.fitko.fitconnect.api.domain.model.destination.Destination;
-import de.fitko.fitconnect.api.domain.model.jwk.JWK;
-import de.fitko.fitconnect.api.exceptions.RestApiException;
-import de.fitko.fitconnect.api.services.auth.OAuthService;
-import de.fitko.fitconnect.api.services.destination.DestinationService;
+package dev.fitko.fitconnect.core.destination;
+
+import dev.fitko.fitconnect.api.config.ApplicationConfig;
+import dev.fitko.fitconnect.api.domain.auth.OAuthToken;
+import dev.fitko.fitconnect.api.domain.model.destination.Destination;
+import dev.fitko.fitconnect.api.domain.model.jwk.JWK;
+import dev.fitko.fitconnect.api.exceptions.RestApiException;
+import dev.fitko.fitconnect.api.services.auth.OAuthService;
+import dev.fitko.fitconnect.api.services.destination.DestinationService;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
diff --git a/core/src/main/java/de/fitko/fitconnect/core/events/EventLogApiService.java b/core/src/main/java/dev/fitko/fitconnect/core/events/EventLogApiService.java
similarity index 87%
rename from core/src/main/java/de/fitko/fitconnect/core/events/EventLogApiService.java
rename to core/src/main/java/dev/fitko/fitconnect/core/events/EventLogApiService.java
index afced7300a4993410ad903caff4e13bc2fe14f74..2d486ca93d22dfe1399cc62940a8cbf03bcb0dd7 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/events/EventLogApiService.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/events/EventLogApiService.java
@@ -1,10 +1,10 @@
-package de.fitko.fitconnect.core.events;
+package dev.fitko.fitconnect.core.events;
 
-import de.fitko.fitconnect.api.config.ApplicationConfig;
-import de.fitko.fitconnect.api.domain.model.event.EventLog;
-import de.fitko.fitconnect.api.exceptions.RestApiException;
-import de.fitko.fitconnect.api.services.auth.OAuthService;
-import de.fitko.fitconnect.api.services.events.EventLogService;
+import dev.fitko.fitconnect.api.config.ApplicationConfig;
+import dev.fitko.fitconnect.api.domain.model.event.EventLog;
+import dev.fitko.fitconnect.api.exceptions.RestApiException;
+import dev.fitko.fitconnect.api.services.auth.OAuthService;
+import dev.fitko.fitconnect.api.services.events.EventLogService;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
diff --git a/core/src/main/java/de/fitko/fitconnect/core/events/SecurityEventTokenService.java b/core/src/main/java/dev/fitko/fitconnect/core/events/SecurityEventTokenService.java
similarity index 95%
rename from core/src/main/java/de/fitko/fitconnect/core/events/SecurityEventTokenService.java
rename to core/src/main/java/dev/fitko/fitconnect/core/events/SecurityEventTokenService.java
index 9eb25b5f79620a960e27f99da53c95e9b9ff13b1..99ea25d2698c73591679e16b3508b072d162c823 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/events/SecurityEventTokenService.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/events/SecurityEventTokenService.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.core.events;
+package dev.fitko.fitconnect.core.events;
 
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.JWSAlgorithm;
@@ -9,9 +9,9 @@ import com.nimbusds.jose.jwk.JWK;
 import com.nimbusds.jose.jwk.RSAKey;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
-import de.fitko.fitconnect.api.exceptions.EventCreationException;
-import de.fitko.fitconnect.api.exceptions.InvalidSigningKeyException;
-import de.fitko.fitconnect.api.services.events.SecurityEventService;
+import dev.fitko.fitconnect.api.exceptions.EventCreationException;
+import dev.fitko.fitconnect.api.exceptions.InvalidSigningKeyException;
+import dev.fitko.fitconnect.api.services.events.SecurityEventService;
 
 import java.text.ParseException;
 import java.util.Date;
diff --git a/core/src/main/java/de/fitko/fitconnect/core/http/ApiRequestInterceptor.java b/core/src/main/java/dev/fitko/fitconnect/core/http/ApiRequestInterceptor.java
similarity index 95%
rename from core/src/main/java/de/fitko/fitconnect/core/http/ApiRequestInterceptor.java
rename to core/src/main/java/dev/fitko/fitconnect/core/http/ApiRequestInterceptor.java
index 6802ff6c0519cef9a102060a7e66ab678066e049..d4bbd501e31716284abbc827384fcbdd4fb39eac 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/http/ApiRequestInterceptor.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/http/ApiRequestInterceptor.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.core.http;
+package dev.fitko.fitconnect.core.http;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/de/fitko/fitconnect/core/http/ProxyConfig.java b/core/src/main/java/dev/fitko/fitconnect/core/http/ProxyConfig.java
similarity index 95%
rename from core/src/main/java/de/fitko/fitconnect/core/http/ProxyConfig.java
rename to core/src/main/java/dev/fitko/fitconnect/core/http/ProxyConfig.java
index 4f6a8c0a962e5ac007159bb47762377abae6eb52..2985838d1a4eb90d09a5447b26db3d7be079ec31 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/http/ProxyConfig.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/http/ProxyConfig.java
@@ -1,6 +1,6 @@
-package de.fitko.fitconnect.core.http;
+package dev.fitko.fitconnect.core.http;
 
-import de.fitko.fitconnect.core.util.Strings;
+import dev.fitko.fitconnect.core.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
diff --git a/core/src/main/java/de/fitko/fitconnect/core/http/ProxyRestTemplate.java b/core/src/main/java/dev/fitko/fitconnect/core/http/ProxyRestTemplate.java
similarity index 90%
rename from core/src/main/java/de/fitko/fitconnect/core/http/ProxyRestTemplate.java
rename to core/src/main/java/dev/fitko/fitconnect/core/http/ProxyRestTemplate.java
index ea3aa13a05b47d48ee988adb52e7f25d1c9667e3..3c3c0c18ee7e7ae7c9a3c310e6130c29b82eb906 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/http/ProxyRestTemplate.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/http/ProxyRestTemplate.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.core.http;
+package dev.fitko.fitconnect.core.http;
 
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
diff --git a/core/src/main/java/de/fitko/fitconnect/core/http/X509CRLHttpMessageConverter.java b/core/src/main/java/dev/fitko/fitconnect/core/http/X509CRLHttpMessageConverter.java
similarity index 97%
rename from core/src/main/java/de/fitko/fitconnect/core/http/X509CRLHttpMessageConverter.java
rename to core/src/main/java/dev/fitko/fitconnect/core/http/X509CRLHttpMessageConverter.java
index 9613a614314bc3256bf68647c25b5b4d7a9ac1da..bc41d6f3650053304b8306a09aaccb4bb5300503 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/http/X509CRLHttpMessageConverter.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/http/X509CRLHttpMessageConverter.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.core.http;
+package dev.fitko.fitconnect.core.http;
 
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
diff --git a/core/src/main/java/de/fitko/fitconnect/core/submission/SubmissionApiService.java b/core/src/main/java/dev/fitko/fitconnect/core/submission/SubmissionApiService.java
similarity index 91%
rename from core/src/main/java/de/fitko/fitconnect/core/submission/SubmissionApiService.java
rename to core/src/main/java/dev/fitko/fitconnect/core/submission/SubmissionApiService.java
index 813c1b3567491545b6f6e02368dae703355daa8d..205a6399ec3b74658c22a8bcfc530a979ed67789 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/submission/SubmissionApiService.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/submission/SubmissionApiService.java
@@ -1,13 +1,17 @@
-package de.fitko.fitconnect.core.submission;
+package dev.fitko.fitconnect.core.submission;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import de.fitko.fitconnect.api.config.ApplicationConfig;
-import de.fitko.fitconnect.api.domain.auth.OAuthToken;
-import de.fitko.fitconnect.api.domain.model.submission.*;
-import de.fitko.fitconnect.api.exceptions.RestApiException;
-import de.fitko.fitconnect.api.services.auth.OAuthService;
-import de.fitko.fitconnect.api.services.submission.SubmissionService;
+import dev.fitko.fitconnect.api.config.ApplicationConfig;
+import dev.fitko.fitconnect.api.domain.auth.OAuthToken;
+import dev.fitko.fitconnect.api.domain.model.submission.CreateSubmission;
+import dev.fitko.fitconnect.api.domain.model.submission.Submission;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionsForPickup;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
+import dev.fitko.fitconnect.api.exceptions.RestApiException;
+import dev.fitko.fitconnect.api.services.auth.OAuthService;
+import dev.fitko.fitconnect.api.services.submission.SubmissionService;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/core/src/main/java/de/fitko/fitconnect/core/util/Preconditions.java b/core/src/main/java/dev/fitko/fitconnect/core/util/Preconditions.java
similarity index 97%
rename from core/src/main/java/de/fitko/fitconnect/core/util/Preconditions.java
rename to core/src/main/java/dev/fitko/fitconnect/core/util/Preconditions.java
index 318d163b2bf7b951cd127a21269673eebe1c97b2..5513df132704ac403d00dfd0d59a8c0f727833d9 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/util/Preconditions.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/util/Preconditions.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.core.util;
+package dev.fitko.fitconnect.core.util;
 
 import java.util.function.Supplier;
 
diff --git a/core/src/main/java/de/fitko/fitconnect/core/util/Strings.java b/core/src/main/java/dev/fitko/fitconnect/core/util/Strings.java
similarity index 94%
rename from core/src/main/java/de/fitko/fitconnect/core/util/Strings.java
rename to core/src/main/java/dev/fitko/fitconnect/core/util/Strings.java
index 217fdc9acd1066496051154b6cf71a340b6d0289..9a722f69143763dd7488bdb0ee2290ce3d87025d 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/util/Strings.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/util/Strings.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.core.util;
+package dev.fitko.fitconnect.core.util;
 
 public final class Strings {
 
diff --git a/core/src/main/java/de/fitko/fitconnect/core/validation/DefaultValidationService.java b/core/src/main/java/dev/fitko/fitconnect/core/validation/DefaultValidationService.java
similarity index 91%
rename from core/src/main/java/de/fitko/fitconnect/core/validation/DefaultValidationService.java
rename to core/src/main/java/dev/fitko/fitconnect/core/validation/DefaultValidationService.java
index aaf6f8be9bb1665377f81b9b492761f2774b938e..c7a9bc4af38c57c7ff355dc4e1b8fde7b805e2b6 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/validation/DefaultValidationService.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/validation/DefaultValidationService.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.core.validation;
+package dev.fitko.fitconnect.core.validation;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -9,14 +9,14 @@ import com.networknt.schema.SpecVersion;
 import com.networknt.schema.ValidationMessage;
 import com.nimbusds.jose.jwk.RSAKey;
 import com.nimbusds.jose.util.Base64;
-import de.fitko.fitconnect.api.config.ApplicationConfig;
-import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.validation.ValidationResult;
-import de.fitko.fitconnect.api.exceptions.DataIntegrityException;
-import de.fitko.fitconnect.api.exceptions.ValidationException;
-import de.fitko.fitconnect.api.services.crypto.MessageDigestService;
-import de.fitko.fitconnect.api.services.validation.ValidationService;
-import de.fitko.fitconnect.core.util.Strings;
+import dev.fitko.fitconnect.api.config.ApplicationConfig;
+import dev.fitko.fitconnect.api.domain.model.metadata.Metadata;
+import dev.fitko.fitconnect.api.domain.validation.ValidationResult;
+import dev.fitko.fitconnect.api.exceptions.DataIntegrityException;
+import dev.fitko.fitconnect.api.exceptions.ValidationException;
+import dev.fitko.fitconnect.api.services.crypto.MessageDigestService;
+import dev.fitko.fitconnect.api.services.validation.ValidationService;
+import dev.fitko.fitconnect.core.util.Strings;
 import dev.fitko.fitconnect.jwkvalidator.JWKValidationException;
 import dev.fitko.fitconnect.jwkvalidator.JWKValidator;
 import org.slf4j.Logger;
diff --git a/core/src/test/java/de/fitko/fitconnect/core/RestEndpointBase.java b/core/src/test/java/dev/fitko/fitconnect/core/RestEndpointBase.java
similarity index 85%
rename from core/src/test/java/de/fitko/fitconnect/core/RestEndpointBase.java
rename to core/src/test/java/dev/fitko/fitconnect/core/RestEndpointBase.java
index 31cf5323aa6fe6a6ace5064e205ced7d7d7334d0..be6f17abc81be9f4f5d68e176e57e969bc2d129d 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/RestEndpointBase.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/RestEndpointBase.java
@@ -1,8 +1,11 @@
-package de.fitko.fitconnect.core;
+package dev.fitko.fitconnect.core;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.client.WireMock;
-import de.fitko.fitconnect.api.config.*;
+import dev.fitko.fitconnect.api.config.ApplicationConfig;
+import dev.fitko.fitconnect.api.config.Environment;
+import dev.fitko.fitconnect.api.config.EnvironmentName;
+import dev.fitko.fitconnect.api.config.ResourcePaths;
 
 import java.util.Map;
 
diff --git a/core/src/test/java/de/fitko/fitconnect/core/SubmissionSenderTest.java b/core/src/test/java/dev/fitko/fitconnect/core/SubmissionSenderTest.java
similarity index 87%
rename from core/src/test/java/de/fitko/fitconnect/core/SubmissionSenderTest.java
rename to core/src/test/java/dev/fitko/fitconnect/core/SubmissionSenderTest.java
index 325d36871f1a3ce190b2152480f9dd67a42f47e9..77444dba9d882b8340f969d334558463f5d6d52f 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/SubmissionSenderTest.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/SubmissionSenderTest.java
@@ -1,23 +1,31 @@
-package de.fitko.fitconnect.core;
+package dev.fitko.fitconnect.core;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.jwk.KeyUse;
 import com.nimbusds.jose.jwk.RSAKey;
 import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
-import de.fitko.fitconnect.api.domain.model.destination.Destination;
-import de.fitko.fitconnect.api.domain.model.jwk.JWK;
-import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.model.submission.*;
-import de.fitko.fitconnect.api.domain.validation.ValidationResult;
-import de.fitko.fitconnect.api.exceptions.*;
-import de.fitko.fitconnect.api.services.Sender;
-import de.fitko.fitconnect.api.services.crypto.CryptoService;
-import de.fitko.fitconnect.api.services.destination.DestinationService;
-import de.fitko.fitconnect.api.services.events.EventLogService;
-import de.fitko.fitconnect.api.services.submission.SubmissionService;
-import de.fitko.fitconnect.api.services.validation.ValidationService;
-import de.fitko.fitconnect.core.events.SecurityEventTokenService;
+import dev.fitko.fitconnect.api.domain.model.destination.Destination;
+import dev.fitko.fitconnect.api.domain.model.jwk.JWK;
+import dev.fitko.fitconnect.api.domain.model.metadata.Metadata;
+import dev.fitko.fitconnect.api.domain.model.submission.CreateSubmission;
+import dev.fitko.fitconnect.api.domain.model.submission.ServiceType;
+import dev.fitko.fitconnect.api.domain.model.submission.Submission;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
+import dev.fitko.fitconnect.api.domain.validation.ValidationResult;
+import dev.fitko.fitconnect.api.exceptions.EncryptionException;
+import dev.fitko.fitconnect.api.exceptions.KeyNotRetrievedException;
+import dev.fitko.fitconnect.api.exceptions.MetadataNotCreatedException;
+import dev.fitko.fitconnect.api.exceptions.RestApiException;
+import dev.fitko.fitconnect.api.exceptions.ValidationException;
+import dev.fitko.fitconnect.api.services.Sender;
+import dev.fitko.fitconnect.api.services.crypto.CryptoService;
+import dev.fitko.fitconnect.api.services.destination.DestinationService;
+import dev.fitko.fitconnect.api.services.events.EventLogService;
+import dev.fitko.fitconnect.api.services.submission.SubmissionService;
+import dev.fitko.fitconnect.api.services.validation.ValidationService;
+import dev.fitko.fitconnect.core.events.SecurityEventTokenService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/core/src/test/java/de/fitko/fitconnect/core/SubmissionSubscriberTest.java b/core/src/test/java/dev/fitko/fitconnect/core/SubmissionSubscriberTest.java
similarity index 89%
rename from core/src/test/java/de/fitko/fitconnect/core/SubmissionSubscriberTest.java
rename to core/src/test/java/dev/fitko/fitconnect/core/SubmissionSubscriberTest.java
index 82ea0cd304239bd0ec05f4da407f7fb621f4bbf6..961728c795e41b6424c5a8c0c95620da19e947c8 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/SubmissionSubscriberTest.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/SubmissionSubscriberTest.java
@@ -1,24 +1,23 @@
-package de.fitko.fitconnect.core;
+package dev.fitko.fitconnect.core;
 
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.jwk.KeyUse;
 import com.nimbusds.jose.jwk.RSAKey;
 import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
-import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.model.submission.Submission;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionsForPickup;
-import de.fitko.fitconnect.api.domain.validation.ValidationResult;
-import de.fitko.fitconnect.api.exceptions.DataIntegrityException;
-import de.fitko.fitconnect.api.exceptions.RestApiException;
-import de.fitko.fitconnect.api.services.Subscriber;
-import de.fitko.fitconnect.api.services.crypto.CryptoService;
-import de.fitko.fitconnect.api.services.events.EventLogService;
-import de.fitko.fitconnect.api.services.events.SecurityEventService;
-import de.fitko.fitconnect.api.services.submission.SubmissionService;
-import de.fitko.fitconnect.api.services.validation.ValidationService;
+import dev.fitko.fitconnect.api.domain.model.metadata.Metadata;
+import dev.fitko.fitconnect.api.domain.model.submission.Submission;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionsForPickup;
+import dev.fitko.fitconnect.api.domain.validation.ValidationResult;
+import dev.fitko.fitconnect.api.exceptions.DataIntegrityException;
+import dev.fitko.fitconnect.api.exceptions.RestApiException;
+import dev.fitko.fitconnect.api.services.Subscriber;
+import dev.fitko.fitconnect.api.services.crypto.CryptoService;
+import dev.fitko.fitconnect.api.services.events.EventLogService;
+import dev.fitko.fitconnect.api.services.events.SecurityEventService;
+import dev.fitko.fitconnect.api.services.submission.SubmissionService;
+import dev.fitko.fitconnect.api.services.validation.ValidationService;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
diff --git a/core/src/test/java/de/fitko/fitconnect/core/auth/DefaultOAuthServiceTest.java b/core/src/test/java/dev/fitko/fitconnect/core/auth/DefaultOAuthServiceTest.java
similarity index 93%
rename from core/src/test/java/de/fitko/fitconnect/core/auth/DefaultOAuthServiceTest.java
rename to core/src/test/java/dev/fitko/fitconnect/core/auth/DefaultOAuthServiceTest.java
index c2762e957dab165670e564b8a07f86cf40decce4..9f23c15b7226c1cf5838a43d0275853f4da4b85b 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/auth/DefaultOAuthServiceTest.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/auth/DefaultOAuthServiceTest.java
@@ -1,10 +1,10 @@
-package de.fitko.fitconnect.core.auth;
+package dev.fitko.fitconnect.core.auth;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import de.fitko.fitconnect.api.domain.auth.OAuthToken;
-import de.fitko.fitconnect.api.services.auth.OAuthService;
-import de.fitko.fitconnect.core.RestEndpointBase;
+import dev.fitko.fitconnect.api.domain.auth.OAuthToken;
+import dev.fitko.fitconnect.api.services.auth.OAuthService;
+import dev.fitko.fitconnect.core.RestEndpointBase;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.MediaType;
diff --git a/core/src/test/java/de/fitko/fitconnect/core/auth/OAuthTokenIntegrationTest.java b/core/src/test/java/dev/fitko/fitconnect/core/auth/OAuthTokenIntegrationTest.java
similarity index 90%
rename from core/src/test/java/de/fitko/fitconnect/core/auth/OAuthTokenIntegrationTest.java
rename to core/src/test/java/dev/fitko/fitconnect/core/auth/OAuthTokenIntegrationTest.java
index 5a165a999c861f6f78d81d06aca42ec0496da590..ef9224efd7ce6c7d08fa07a10304664ccf915f2a 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/auth/OAuthTokenIntegrationTest.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/auth/OAuthTokenIntegrationTest.java
@@ -1,6 +1,6 @@
-package de.fitko.fitconnect.core.auth;
+package dev.fitko.fitconnect.core.auth;
 
-import de.fitko.fitconnect.api.domain.auth.OAuthToken;
+import dev.fitko.fitconnect.api.domain.auth.OAuthToken;
 import org.junit.jupiter.api.Test;
 import org.springframework.web.client.RestTemplate;
 
diff --git a/core/src/test/java/de/fitko/fitconnect/core/crypto/HashServiceTest.java b/core/src/test/java/dev/fitko/fitconnect/core/crypto/HashServiceTest.java
similarity index 96%
rename from core/src/test/java/de/fitko/fitconnect/core/crypto/HashServiceTest.java
rename to core/src/test/java/dev/fitko/fitconnect/core/crypto/HashServiceTest.java
index 4b4074956b462acecf12bf18d845afa78ad779fc..35e009417aa7c5845cf2fa8889d1212285481f63 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/crypto/HashServiceTest.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/crypto/HashServiceTest.java
@@ -1,6 +1,6 @@
-package de.fitko.fitconnect.core.crypto;
+package dev.fitko.fitconnect.core.crypto;
 
-import de.fitko.fitconnect.api.services.crypto.MessageDigestService;
+import dev.fitko.fitconnect.api.services.crypto.MessageDigestService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/core/src/test/java/de/fitko/fitconnect/core/crypto/JWECryptoServiceTest.java b/core/src/test/java/dev/fitko/fitconnect/core/crypto/JWECryptoServiceTest.java
similarity index 93%
rename from core/src/test/java/de/fitko/fitconnect/core/crypto/JWECryptoServiceTest.java
rename to core/src/test/java/dev/fitko/fitconnect/core/crypto/JWECryptoServiceTest.java
index 3455ca22597d3ed8c8c9df461e5ba7ee56457d79..ab80117911abc93543de0b86575154d55931eb67 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/crypto/JWECryptoServiceTest.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/crypto/JWECryptoServiceTest.java
@@ -1,10 +1,10 @@
-package de.fitko.fitconnect.core.crypto;
+package dev.fitko.fitconnect.core.crypto;
 
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.jwk.KeyUse;
 import com.nimbusds.jose.jwk.RSAKey;
 import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
-import de.fitko.fitconnect.api.services.crypto.CryptoService;
+import dev.fitko.fitconnect.api.services.crypto.CryptoService;
 import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
@@ -73,7 +73,7 @@ public class JWECryptoServiceTest {
 
         // Then
         assertNotNull(decrypted);
-        assertTrue(Arrays.equals(decrypted, "some foo".getBytes(StandardCharsets.UTF_8)));
+        assertArrayEquals(decrypted, "some foo".getBytes(StandardCharsets.UTF_8));
     }
 
 
diff --git a/core/src/test/java/de/fitko/fitconnect/core/destination/DestinationRestServiceTest.java b/core/src/test/java/dev/fitko/fitconnect/core/destination/DestinationRestServiceTest.java
similarity index 86%
rename from core/src/test/java/de/fitko/fitconnect/core/destination/DestinationRestServiceTest.java
rename to core/src/test/java/dev/fitko/fitconnect/core/destination/DestinationRestServiceTest.java
index a273da99a952b3f7f6084f81d3153cda9036ccda..2ced763edc8a43ad51c3f07b5ff9f6c5a40ba888 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/destination/DestinationRestServiceTest.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/destination/DestinationRestServiceTest.java
@@ -1,14 +1,14 @@
-package de.fitko.fitconnect.core.destination;
+package dev.fitko.fitconnect.core.destination;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import de.fitko.fitconnect.api.config.ApplicationConfig;
-import de.fitko.fitconnect.api.domain.auth.OAuthToken;
-import de.fitko.fitconnect.api.domain.model.destination.Destination;
-import de.fitko.fitconnect.api.domain.model.jwk.JWK;
-import de.fitko.fitconnect.api.services.auth.OAuthService;
-import de.fitko.fitconnect.api.services.destination.DestinationService;
-import de.fitko.fitconnect.core.RestEndpointBase;
+import dev.fitko.fitconnect.api.config.ApplicationConfig;
+import dev.fitko.fitconnect.api.domain.auth.OAuthToken;
+import dev.fitko.fitconnect.api.domain.model.destination.Destination;
+import dev.fitko.fitconnect.api.domain.model.jwk.JWK;
+import dev.fitko.fitconnect.api.services.auth.OAuthService;
+import dev.fitko.fitconnect.api.services.destination.DestinationService;
+import dev.fitko.fitconnect.core.RestEndpointBase;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.MediaType;
diff --git a/core/src/test/java/de/fitko/fitconnect/core/events/EventLogApiServiceTest.java b/core/src/test/java/dev/fitko/fitconnect/core/events/EventLogApiServiceTest.java
similarity index 92%
rename from core/src/test/java/de/fitko/fitconnect/core/events/EventLogApiServiceTest.java
rename to core/src/test/java/dev/fitko/fitconnect/core/events/EventLogApiServiceTest.java
index f78967a06844e8344642f60c85957206c6ce676a..83c80e4450ce2bcd597839e6f7cddcec18624666 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/events/EventLogApiServiceTest.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/events/EventLogApiServiceTest.java
@@ -1,13 +1,13 @@
-package de.fitko.fitconnect.core.events;
+package dev.fitko.fitconnect.core.events;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
-import de.fitko.fitconnect.api.domain.auth.OAuthToken;
-import de.fitko.fitconnect.api.domain.model.event.EventLog;
-import de.fitko.fitconnect.api.services.auth.OAuthService;
-import de.fitko.fitconnect.api.services.events.EventLogService;
-import de.fitko.fitconnect.core.RestEndpointBase;
+import dev.fitko.fitconnect.api.domain.auth.OAuthToken;
+import dev.fitko.fitconnect.api.domain.model.event.EventLog;
+import dev.fitko.fitconnect.api.services.auth.OAuthService;
+import dev.fitko.fitconnect.api.services.events.EventLogService;
+import dev.fitko.fitconnect.core.RestEndpointBase;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/core/src/test/java/de/fitko/fitconnect/core/events/SecurityEventTokenServiceTest.java b/core/src/test/java/dev/fitko/fitconnect/core/events/SecurityEventTokenServiceTest.java
similarity index 94%
rename from core/src/test/java/de/fitko/fitconnect/core/events/SecurityEventTokenServiceTest.java
rename to core/src/test/java/dev/fitko/fitconnect/core/events/SecurityEventTokenServiceTest.java
index 2b302cfd2c9739646d124501aa8162d265014d86..697d35a623706db145bdbd8e2a649bf2bdb4743e 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/events/SecurityEventTokenServiceTest.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/events/SecurityEventTokenServiceTest.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.core.events;
+package dev.fitko.fitconnect.core.events;
 
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.JWSAlgorithm;
@@ -8,8 +8,8 @@ import com.nimbusds.jose.crypto.RSASSAVerifier;
 import com.nimbusds.jose.jwk.JWK;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
-import de.fitko.fitconnect.api.exceptions.InvalidSigningKeyException;
-import de.fitko.fitconnect.api.services.events.SecurityEventService;
+import dev.fitko.fitconnect.api.exceptions.InvalidSigningKeyException;
+import dev.fitko.fitconnect.api.services.events.SecurityEventService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/core/src/test/java/de/fitko/fitconnect/core/http/ProxyConfigTest.java b/core/src/test/java/dev/fitko/fitconnect/core/http/ProxyConfigTest.java
similarity index 97%
rename from core/src/test/java/de/fitko/fitconnect/core/http/ProxyConfigTest.java
rename to core/src/test/java/dev/fitko/fitconnect/core/http/ProxyConfigTest.java
index aef00310e7bca58d13a1169f7ecc75e74332c6b0..be3f330f7ec887540b02e8514bc5130498d5be9e 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/http/ProxyConfigTest.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/http/ProxyConfigTest.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.core.http;
+package dev.fitko.fitconnect.core.http;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.http.client.InterceptingClientHttpRequestFactory;
diff --git a/core/src/test/java/de/fitko/fitconnect/core/submission/SubmissionApiServiceTest.java b/core/src/test/java/dev/fitko/fitconnect/core/submission/SubmissionApiServiceTest.java
similarity index 93%
rename from core/src/test/java/de/fitko/fitconnect/core/submission/SubmissionApiServiceTest.java
rename to core/src/test/java/dev/fitko/fitconnect/core/submission/SubmissionApiServiceTest.java
index 9f97fe41bc86ccaa9c8db32a961db74ee19c30e5..44951448fa0c09c1b3e2717e7d436615da148953 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/submission/SubmissionApiServiceTest.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/submission/SubmissionApiServiceTest.java
@@ -1,14 +1,19 @@
-package de.fitko.fitconnect.core.submission;
+package dev.fitko.fitconnect.core.submission;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
-import de.fitko.fitconnect.api.config.*;
-import de.fitko.fitconnect.api.domain.auth.OAuthToken;
-import de.fitko.fitconnect.api.domain.model.submission.*;
-import de.fitko.fitconnect.api.services.auth.OAuthService;
-import de.fitko.fitconnect.api.services.submission.SubmissionService;
-import de.fitko.fitconnect.core.RestEndpointBase;
+import dev.fitko.fitconnect.api.config.ApplicationConfig;
+import dev.fitko.fitconnect.api.domain.auth.OAuthToken;
+import dev.fitko.fitconnect.api.domain.model.submission.CreateSubmission;
+import dev.fitko.fitconnect.api.domain.model.submission.ServiceType;
+import dev.fitko.fitconnect.api.domain.model.submission.Submission;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionForPickup;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmissionsForPickup;
+import dev.fitko.fitconnect.api.domain.model.submission.SubmitSubmission;
+import dev.fitko.fitconnect.api.services.auth.OAuthService;
+import dev.fitko.fitconnect.api.services.submission.SubmissionService;
+import dev.fitko.fitconnect.core.RestEndpointBase;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/core/src/test/java/de/fitko/fitconnect/core/testutil/LogCaptor.java b/core/src/test/java/dev/fitko/fitconnect/core/testutil/LogCaptor.java
similarity index 92%
rename from core/src/test/java/de/fitko/fitconnect/core/testutil/LogCaptor.java
rename to core/src/test/java/dev/fitko/fitconnect/core/testutil/LogCaptor.java
index 1089bf85d94819e2e8bd9abcb365e07a95f785ae..6b366f30f79674ae0fd5990bcb1c4d3b23dd3631 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/testutil/LogCaptor.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/testutil/LogCaptor.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.core.testutil;
+package dev.fitko.fitconnect.core.testutil;
 
 import ch.qos.logback.classic.spi.LoggingEvent;
 import ch.qos.logback.core.AppenderBase;
diff --git a/core/src/test/java/de/fitko/fitconnect/core/util/StringsTest.java b/core/src/test/java/dev/fitko/fitconnect/core/util/StringsTest.java
similarity index 93%
rename from core/src/test/java/de/fitko/fitconnect/core/util/StringsTest.java
rename to core/src/test/java/dev/fitko/fitconnect/core/util/StringsTest.java
index adc4a413b74387f5420c2d8172dedf586e105db6..3e8113e317a75d239eecf036210668dc493a177a 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/util/StringsTest.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/util/StringsTest.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.core.util;
+package dev.fitko.fitconnect.core.util;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/core/src/test/java/de/fitko/fitconnect/core/validation/DefaultValidationServiceTest.java b/core/src/test/java/dev/fitko/fitconnect/core/validation/DefaultValidationServiceTest.java
similarity index 94%
rename from core/src/test/java/de/fitko/fitconnect/core/validation/DefaultValidationServiceTest.java
rename to core/src/test/java/dev/fitko/fitconnect/core/validation/DefaultValidationServiceTest.java
index 84158b25b894ad885e521d2b1d7797424b42cb38..0851c1fa0ac3224f9bf1e86b51404a816851f11d 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/validation/DefaultValidationServiceTest.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/validation/DefaultValidationServiceTest.java
@@ -1,4 +1,4 @@
-package de.fitko.fitconnect.core.validation;
+package dev.fitko.fitconnect.core.validation;
 
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.JWEAlgorithm;
@@ -8,15 +8,19 @@ import com.nimbusds.jose.jwk.RSAKey;
 import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
 import com.nimbusds.jose.util.Base64;
 import com.nimbusds.jose.util.Base64URL;
-import de.fitko.fitconnect.api.config.ApplicationConfig;
-import de.fitko.fitconnect.api.domain.model.metadata.ContentStructure;
-import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.model.metadata.data.*;
-import de.fitko.fitconnect.api.domain.validation.ValidationResult;
-import de.fitko.fitconnect.api.services.crypto.MessageDigestService;
-import de.fitko.fitconnect.api.services.validation.ValidationService;
-import de.fitko.fitconnect.core.testutil.LogCaptor;
-import de.fitko.fitconnect.core.crypto.HashService;
+import dev.fitko.fitconnect.api.config.ApplicationConfig;
+import dev.fitko.fitconnect.api.domain.model.metadata.ContentStructure;
+import dev.fitko.fitconnect.api.domain.model.metadata.Metadata;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.Data;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.DataSignatureType;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.Hash;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
+import dev.fitko.fitconnect.api.domain.model.metadata.data.SubmissionSchema;
+import dev.fitko.fitconnect.api.domain.validation.ValidationResult;
+import dev.fitko.fitconnect.api.services.crypto.MessageDigestService;
+import dev.fitko.fitconnect.api.services.validation.ValidationService;
+import dev.fitko.fitconnect.core.testutil.LogCaptor;
+import dev.fitko.fitconnect.core.crypto.HashService;
 import dev.fitko.fitconnect.jwkvalidator.JWKValidationException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/pom.xml b/pom.xml
index cc4bf7afa7e5f3c46bcf2286874c3fe5736fd6aa..925c42e8c536852f4ad71f25c9cc2bdd9f8a0b3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,49 @@
          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>
 
-    <groupId>de.fitko.fitconnect.sdk</groupId>
+    <groupId>dev.fitko.fitconnect.sdk</groupId>
     <artifactId>sdk-java</artifactId>
     <packaging>pom</packaging>
     <version>1.0.0-SNAPSHOT</version>
 
+    <name>FIT-Connect Java SDK</name>
+    <description>Library for sending and subscribing to submissions of FIT-Connect REST endpoints</description>
+    <url>https://git.fitko.de/fit-connect/sdk-java</url>
+
+    <licenses>
+        <license>
+            <name>EUPL-1.2</name>
+            <url>https://eupl.eu/1.2/en</url>
+            <distribution>repo</distribution>
+        </license>
+        <license>
+            <name>Apache-2.0</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0</url>
+            <distribution>repo</distribution>
+        </license>
+        <license>
+            <name>CC0-1.0</name>
+            <url>https://creativecommons.org/publicdomain/zero/1.0/deed.en</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Marco Holz</name>
+            <email>fit-connect@fitko.de</email>
+            <organization>FITKO</organization>
+            <organizationUrl>https://www.fitko.de</organizationUrl>
+        </developer>
+    </developers>
+
+    <scm>
+        <connection>scm:git:https://git.fitko.de/fit-connect/sdk-java</connection>
+        <developerConnection>scm:git:https://git.fitko.de/fit-connect/sdk-java</developerConnection>
+        <url>https://git.fitko.de/fit-connect/sdk-java</url>
+    </scm>
+
+
     <properties>
         <java.version>11</java.version>
         <maven.compiler.release>11</maven.compiler.release>
@@ -41,6 +79,7 @@
         <maven-checkstyle-plugin.version>3.2.0</maven-checkstyle-plugin.version>
         <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
         <maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
+        <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
 
     </properties>
 
@@ -55,19 +94,19 @@
 
             <!-- Module Dependencies -->
             <dependency>
-                <groupId>de.fitko.fitconnect.sdk</groupId>
+                <groupId>dev.fitko.fitconnect.sdk</groupId>
                 <artifactId>api</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>de.fitko.fitconnect.sdk</groupId>
+                <groupId>dev.fitko.fitconnect.sdk</groupId>
                 <artifactId>core</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>de.fitko.fitconnect.sdk</groupId>
+                <groupId>dev.fitko.fitconnect.sdk</groupId>
                 <artifactId>client</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -217,8 +256,66 @@
                         </execution>
                     </executions>
                 </plugin>
+                <!-- maven snapshot deployment -->
+                <plugin>
+                    <groupId>org.sonatype.plugins</groupId>
+                    <artifactId>nexus-staging-maven-plugin</artifactId>
+                    <version>1.6.13</version>
+                    <extensions>true</extensions>
+                    <executions>
+                        <execution>
+                            <id>default-deploy</id>
+                            <phase>deploy</phase>
+                            <goals>
+                                <goal>deploy</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <serverId>ossrh</serverId>
+                        <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+                        <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.2.1</version>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <goals>
+                                <goal>jar-no-fork</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>${maven-javadoc-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <id>attach-javadocs</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <failOnError>false</failOnError>
+                        <additionalJOption>-Xdoclint:none</additionalJOption>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
 
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+
 </project>
\ No newline at end of file