diff --git a/api/src/main/java/fitconnect/api/Sender.java b/api/src/main/java/fitconnect/api/services/Sender.java
similarity index 98%
rename from api/src/main/java/fitconnect/api/Sender.java
rename to api/src/main/java/fitconnect/api/services/Sender.java
index efaaadc86023e2e67afdb0dda45984eff4530d70..6c0bfac703c0a02da3c276ae20f03f202695d42d 100644
--- a/api/src/main/java/fitconnect/api/Sender.java
+++ b/api/src/main/java/fitconnect/api/services/Sender.java
@@ -1,4 +1,4 @@
-package fitconnect.api;
+package fitconnect.api.services;
 
 import com.nimbusds.jose.jwk.RSAKey;
 import fitconnect.api.domain.auth.OAuthToken;
diff --git a/api/src/main/java/fitconnect/api/Subscriber.java b/api/src/main/java/fitconnect/api/services/Subscriber.java
similarity index 98%
rename from api/src/main/java/fitconnect/api/Subscriber.java
rename to api/src/main/java/fitconnect/api/services/Subscriber.java
index 5f47f302360d9a2d991960853a2e0730abe9862a..d6ee13bc131952b13f9c9d332e130a1ab1040c21 100644
--- a/api/src/main/java/fitconnect/api/Subscriber.java
+++ b/api/src/main/java/fitconnect/api/services/Subscriber.java
@@ -1,4 +1,4 @@
-package fitconnect.api;
+package fitconnect.api.services;
 
 import com.nimbusds.jose.jwk.RSAKey;
 import fitconnect.api.domain.auth.OAuthToken;
diff --git a/client/src/main/java/de/fitconnect/client/ClientFactory.java b/client/src/main/java/de/fitconnect/client/ClientFactory.java
index 43301119bbe8d1dd0684cb4f56f896e4b0adbd3f..1bf87706bdbc32f63d4d4277ecffd383d4d0a3f4 100644
--- a/client/src/main/java/de/fitconnect/client/ClientFactory.java
+++ b/client/src/main/java/de/fitconnect/client/ClientFactory.java
@@ -1,7 +1,7 @@
 package de.fitconnect.client;
 
-import fitconnect.api.Sender;
-import fitconnect.api.Subscriber;
+import fitconnect.api.services.Sender;
+import fitconnect.api.services.Subscriber;
 import fitconnect.api.services.auth.OAuthService;
 import fitconnect.api.services.crypto.CryptoService;
 import fitconnect.api.services.validation.CertificateValidator;
diff --git a/client/src/main/java/de/fitconnect/client/FitConnectClient.java b/client/src/main/java/de/fitconnect/client/FitConnectClient.java
index 47135fc66a598d0948538d721b281e5921528828..9ff95f54fb0d6b104af9f4724c631232af64e5da 100644
--- a/client/src/main/java/de/fitconnect/client/FitConnectClient.java
+++ b/client/src/main/java/de/fitconnect/client/FitConnectClient.java
@@ -1,6 +1,6 @@
 package de.fitconnect.client;
 
-import fitconnect.api.Sender;
+import fitconnect.api.services.Sender;
 import fitconnect.api.domain.auth.OAuthToken;
 import fitconnect.api.domain.model.metadata.Metadata;
 import fitconnect.api.domain.model.metadata.attachment.Attachment;
diff --git a/impl/src/main/java/fitconnect/impl/SubmissionSender.java b/impl/src/main/java/fitconnect/impl/SubmissionSender.java
index 62f4449269d8d36a67ee585841b3e9a90ddf35c5..dc441e79cc203a3e0551891a812a6628d553b775 100644
--- a/impl/src/main/java/fitconnect/impl/SubmissionSender.java
+++ b/impl/src/main/java/fitconnect/impl/SubmissionSender.java
@@ -1,7 +1,7 @@
 package fitconnect.impl;
 
 import com.nimbusds.jose.jwk.RSAKey;
-import fitconnect.api.Sender;
+import fitconnect.api.services.Sender;
 import fitconnect.api.services.auth.OAuthService;
 import fitconnect.api.domain.auth.OAuthToken;
 import fitconnect.api.services.crypto.CryptoService;
diff --git a/impl/src/main/java/fitconnect/impl/SubmissionSubscriber.java b/impl/src/main/java/fitconnect/impl/SubmissionSubscriber.java
index b0f7f0e6f579731b00118719e7960d9636d9d926..4e0c68c3381c7766b98b8a89f6521da9fdcca202 100644
--- a/impl/src/main/java/fitconnect/impl/SubmissionSubscriber.java
+++ b/impl/src/main/java/fitconnect/impl/SubmissionSubscriber.java
@@ -1,7 +1,7 @@
 package fitconnect.impl;
 
 import com.nimbusds.jose.jwk.RSAKey;
-import fitconnect.api.Subscriber;
+import fitconnect.api.services.Subscriber;
 import fitconnect.api.services.auth.OAuthService;
 import fitconnect.api.domain.auth.OAuthToken;
 import fitconnect.api.services.crypto.CryptoService;
diff --git a/impl/src/test/java/fitconnect/impl/auth/OAuthTokenIntegrationTest.java b/impl/src/test/java/fitconnect/impl/auth/OAuthTokenIntegrationTest.java
index b7344225614f795206b76ea93001f715dce28a52..e282aff6b581dc416c8d05cd89e97f3dc13b67f1 100644
--- a/impl/src/test/java/fitconnect/impl/auth/OAuthTokenIntegrationTest.java
+++ b/impl/src/test/java/fitconnect/impl/auth/OAuthTokenIntegrationTest.java
@@ -1,6 +1,6 @@
 package fitconnect.impl.auth;
 
-import fitconnect.api.Sender;
+import fitconnect.api.services.Sender;
 import fitconnect.api.domain.auth.OAuthToken;
 import fitconnect.impl.SubmissionSender;
 import org.junit.jupiter.api.Test;