diff --git a/app/src/main/java/pbd/tubes/exe_android/data/api/ApiService.kt b/app/src/main/java/pbd/tubes/exe_android/data/api/ApiService.kt
new file mode 100644
index 0000000000000000000000000000000000000000..3302493c46b83913262d85de0773599a54e3172c
--- /dev/null
+++ b/app/src/main/java/pbd/tubes/exe_android/data/api/ApiService.kt
@@ -0,0 +1,15 @@
+package pbd.tubes.exe_android.data.api
+
+import pbd.tubes.exe_android.data.api.login.LoginRequest
+import pbd.tubes.exe_android.data.api.login.LoginResponse
+import pbd.tubes.exe_android.data.api.upload.UploadImage
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface ApiService {
+    @POST("/api/auth/login")
+    suspend fun login(@Body credentials: LoginRequest): Response<LoginResponse>
+    @POST("/api/bill/upload")
+    suspend fun upload(@Body data: UploadImage): Response<LoginResponse>
+}
diff --git a/app/src/main/java/pbd/tubes/exe_android/data/login/LoginRequest.kt b/app/src/main/java/pbd/tubes/exe_android/data/api/login/LoginRequest.kt
similarity index 62%
rename from app/src/main/java/pbd/tubes/exe_android/data/login/LoginRequest.kt
rename to app/src/main/java/pbd/tubes/exe_android/data/api/login/LoginRequest.kt
index 2105e28f485eb73753ad84e4008b4f057a663577..3f9fa94bda16dcaa7ad68977278d6bfeefc2275a 100644
--- a/app/src/main/java/pbd/tubes/exe_android/data/login/LoginRequest.kt
+++ b/app/src/main/java/pbd/tubes/exe_android/data/api/login/LoginRequest.kt
@@ -1,4 +1,4 @@
-package pbd.tubes.exe_android.data.login
+package pbd.tubes.exe_android.data.api.login
 
 data class LoginRequest(
     val email: String,
diff --git a/app/src/main/java/pbd/tubes/exe_android/data/login/LoginResponse.kt b/app/src/main/java/pbd/tubes/exe_android/data/api/login/LoginResponse.kt
similarity index 53%
rename from app/src/main/java/pbd/tubes/exe_android/data/login/LoginResponse.kt
rename to app/src/main/java/pbd/tubes/exe_android/data/api/login/LoginResponse.kt
index 3affb820696e3d56924abefd356e610681030382..71ee5e086c99113cb08b8f0607398fbab94b3eae 100644
--- a/app/src/main/java/pbd/tubes/exe_android/data/login/LoginResponse.kt
+++ b/app/src/main/java/pbd/tubes/exe_android/data/api/login/LoginResponse.kt
@@ -1,4 +1,4 @@
-package pbd.tubes.exe_android.data.login
+package pbd.tubes.exe_android.data.api.login
 
 data class LoginResponse(
     val token: String
diff --git a/app/src/main/java/pbd/tubes/exe_android/data/api/upload/UploadImage.kt b/app/src/main/java/pbd/tubes/exe_android/data/api/upload/UploadImage.kt
new file mode 100644
index 0000000000000000000000000000000000000000..e7e1018a59ac7d218b991a38df5273a87f19a316
--- /dev/null
+++ b/app/src/main/java/pbd/tubes/exe_android/data/api/upload/UploadImage.kt
@@ -0,0 +1,7 @@
+package pbd.tubes.exe_android.data.api.upload
+
+import android.media.Image
+
+data class UploadImage(
+    val image: Image //or file? FIXME(key: image or file)
+)
diff --git a/app/src/main/java/pbd/tubes/exe_android/data/login/ApiService.kt b/app/src/main/java/pbd/tubes/exe_android/data/login/ApiService.kt
deleted file mode 100644
index e4ca82940da2e2ce8b8fa2589b110c7bb82bdde1..0000000000000000000000000000000000000000
--- a/app/src/main/java/pbd/tubes/exe_android/data/login/ApiService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package pbd.tubes.exe_android.data.login
-
-import retrofit2.Response
-import retrofit2.http.Body
-import retrofit2.http.POST
-
-interface ApiService {
-    @POST("/api/auth/login")
-    suspend fun login(@Body credentials: LoginRequest): Response<LoginResponse>
-}
diff --git a/app/src/main/java/pbd/tubes/exe_android/ui/login/LoginActivity.kt b/app/src/main/java/pbd/tubes/exe_android/ui/login/LoginActivity.kt
index d92719f4e1f451ee38a25ef8548316d4dd6d1763..618369d0d784218d609b7a31ecb78a02cc93b78d 100644
--- a/app/src/main/java/pbd/tubes/exe_android/ui/login/LoginActivity.kt
+++ b/app/src/main/java/pbd/tubes/exe_android/ui/login/LoginActivity.kt
@@ -10,8 +10,8 @@ import androidx.appcompat.app.AppCompatActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import pbd.tubes.exe_android.data.login.ApiService
-import pbd.tubes.exe_android.data.login.LoginRequest
+import pbd.tubes.exe_android.data.api.ApiService
+import pbd.tubes.exe_android.data.api.login.LoginRequest
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory