diff --git a/android/app/src/main/java/com/epfl/dedis/hbt/data/Document.kt b/android/app/src/main/java/com/epfl/dedis/hbt/data/document/Document.kt
similarity index 74%
rename from android/app/src/main/java/com/epfl/dedis/hbt/data/Document.kt
rename to android/app/src/main/java/com/epfl/dedis/hbt/data/document/Document.kt
index 32dc0778..092baa45 100644
--- a/android/app/src/main/java/com/epfl/dedis/hbt/data/Document.kt
+++ b/android/app/src/main/java/com/epfl/dedis/hbt/data/document/Document.kt
@@ -1,4 +1,4 @@
-package com.epfl.dedis.hbt.data
+package com.epfl.dedis.hbt.data.document
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/android/app/src/main/java/com/epfl/dedis/hbt/di/HttpModule.kt b/android/app/src/main/java/com/epfl/dedis/hbt/di/HttpModule.kt
index 9803ad7a..62a8f5f8 100644
--- a/android/app/src/main/java/com/epfl/dedis/hbt/di/HttpModule.kt
+++ b/android/app/src/main/java/com/epfl/dedis/hbt/di/HttpModule.kt
@@ -13,7 +13,7 @@ import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-class HttpModule {
+object HttpModule {
 
     @BaseURL
     @Provides
diff --git a/android/app/src/main/java/com/epfl/dedis/hbt/service/document/DocumentService.kt b/android/app/src/main/java/com/epfl/dedis/hbt/service/document/DocumentService.kt
index 69a9974a..c6b7989d 100644
--- a/android/app/src/main/java/com/epfl/dedis/hbt/service/document/DocumentService.kt
+++ b/android/app/src/main/java/com/epfl/dedis/hbt/service/document/DocumentService.kt
@@ -1,6 +1,6 @@
 package com.epfl.dedis.hbt.service.document
 
-import com.epfl.dedis.hbt.data.Document
+import com.epfl.dedis.hbt.data.document.Document
 import okhttp3.RequestBody
 import retrofit2.Call
 import retrofit2.http.Multipart