diff --git a/client/src/main/java/fitconnect/client/SubmissionSender.java b/client/src/main/java/fitconnect/client/SubmissionSender.java
deleted file mode 100644
index 178b92b3a63602983532ac82f5473ceb25a1289b..0000000000000000000000000000000000000000
--- a/client/src/main/java/fitconnect/client/SubmissionSender.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package fitconnect.client;
-
-import fitconnect.api.Sender;
-import fitconnect.api.auth.OAuthService;
-import fitconnect.api.auth.OAuthToken;
-import fitconnect.api.data.Data;
-import fitconnect.api.data.Metadata;
-import fitconnect.api.validation.ValidationResult;
-
-import java.io.ByteArrayInputStream;
-
-public class SubmissionSender implements Sender {
-
-    private final OAuthService authService;
-
-    public SubmissionSender(final OAuthService authService){
-        this.authService = authService;
-    }
-
-    @Override
-    public OAuthToken retrieveAuthenticationToken(String clientId, String clientSecret, String... scope) {
-        return authService.authenticate(clientId, clientSecret, scope).orElseThrow();
-    }
-
-    @Override
-    public ValidationResult validateCertificateChain(byte[] chain) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-    @Override
-    public Data encryptData(Data unencryptedData) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-    @Override
-    public ByteArrayInputStream encryptAttachment(ByteArrayInputStream unencryptedAttachmentBinary) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-    @Override
-    public Metadata generateMetadata(byte[] attachment) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-}
diff --git a/client/src/main/java/fitconnect/client/FitCoAuthService.java b/client/src/main/java/fitconnect/client/impl/auth/FitCoAuthService.java
similarity index 98%
rename from client/src/main/java/fitconnect/client/FitCoAuthService.java
rename to client/src/main/java/fitconnect/client/impl/auth/FitCoAuthService.java
index 3e6167041033515d3d27514e56c52ef3bfa8aac3..a5433f0d2fae61e2375f48239ba7e8471bea9a0a 100644
--- a/client/src/main/java/fitconnect/client/FitCoAuthService.java
+++ b/client/src/main/java/fitconnect/client/impl/auth/FitCoAuthService.java
@@ -1,4 +1,4 @@
-package fitconnect.client;
+package fitconnect.client.impl.auth;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import fitconnect.api.auth.OAuthService;
diff --git a/client/src/test/java/fitconnect/client/OAuthTokenIntegrationTest.java b/client/src/test/java/fitconnect/client/auth/OAuthTokenIntegrationTest.java
similarity index 82%
rename from client/src/test/java/fitconnect/client/OAuthTokenIntegrationTest.java
rename to client/src/test/java/fitconnect/client/auth/OAuthTokenIntegrationTest.java
index 2be2d7aac9cef76b037cbfd121ae9386d4ac4aa0..30f2f3ca5d6d0dd10fbf41bc05a17c2a474af577 100644
--- a/client/src/test/java/fitconnect/client/OAuthTokenIntegrationTest.java
+++ b/client/src/test/java/fitconnect/client/auth/OAuthTokenIntegrationTest.java
@@ -1,6 +1,8 @@
-package fitconnect.client;
+package fitconnect.client.auth;
 
 import fitconnect.api.auth.OAuthToken;
+import fitconnect.client.impl.auth.FitCoAuthService;
+import fitconnect.client.impl.SubmissionSender;
 import org.junit.jupiter.api.Test;
 
 import java.net.http.HttpClient;
@@ -20,7 +22,7 @@ class OAuthTokenIntegrationTest {
 
         var httpClient = HttpClient.newHttpClient();
         var authService = new FitCoAuthService(httpClient, tokenUrl);
-        var sender = new SubmissionSender(authService);
+        var sender = new SubmissionSender(authService, null);
 
         // When
         OAuthToken token = sender.retrieveAuthenticationToken(clientId, secret, scope);