diff --git a/android/Staccato_AN/app/src/test/java/com/on/staccato/ApiDataFixture.kt b/android/Staccato_AN/app/src/test/java/com/on/staccato/data/ApiDataFixture.kt
similarity index 98%
rename from android/Staccato_AN/app/src/test/java/com/on/staccato/ApiDataFixture.kt
rename to android/Staccato_AN/app/src/test/java/com/on/staccato/data/ApiDataFixture.kt
index c269799c..9de201e0 100644
--- a/android/Staccato_AN/app/src/test/java/com/on/staccato/ApiDataFixture.kt
+++ b/android/Staccato_AN/app/src/test/java/com/on/staccato/data/ApiDataFixture.kt
@@ -1,4 +1,4 @@
-package com.on.staccato
+package com.on.staccato.data
 
 import com.on.staccato.data.dto.memory.MemoryRequest
 
diff --git a/android/Staccato_AN/app/src/test/java/com/on/staccato/data/ApiResultCallAdapterTest.kt b/android/Staccato_AN/app/src/test/java/com/on/staccato/data/ApiResultCallAdapterTest.kt
index e5ed097d..52d69a08 100644
--- a/android/Staccato_AN/app/src/test/java/com/on/staccato/data/ApiResultCallAdapterTest.kt
+++ b/android/Staccato_AN/app/src/test/java/com/on/staccato/data/ApiResultCallAdapterTest.kt
@@ -2,16 +2,6 @@ package com.on.staccato.data
 
 import com.on.staccato.CoroutinesTestExtension
 import com.on.staccato.StaccatoApplication.Companion.retrofit
-import com.on.staccato.createErrorBy400
-import com.on.staccato.createErrorBy401
-import com.on.staccato.createErrorBy403
-import com.on.staccato.createErrorBy413
-import com.on.staccato.createErrorBy500
-import com.on.staccato.createFakeImageFile
-import com.on.staccato.createInvalidMemoryRequest
-import com.on.staccato.createMemoryCreationResponse
-import com.on.staccato.createMemoryResponse
-import com.on.staccato.createValidMemoryRequest
 import com.on.staccato.data.comment.CommentApiService
 import com.on.staccato.data.dto.image.ImageResponse
 import com.on.staccato.data.dto.memory.MemoryCreationResponse
diff --git a/android/Staccato_AN/app/src/test/java/com/on/staccato/FakeFileProvider.kt b/android/Staccato_AN/app/src/test/java/com/on/staccato/data/FakeFileProvider.kt
similarity index 94%
rename from android/Staccato_AN/app/src/test/java/com/on/staccato/FakeFileProvider.kt
rename to android/Staccato_AN/app/src/test/java/com/on/staccato/data/FakeFileProvider.kt
index 3676e1bb..e7931dbf 100644
--- a/android/Staccato_AN/app/src/test/java/com/on/staccato/FakeFileProvider.kt
+++ b/android/Staccato_AN/app/src/test/java/com/on/staccato/data/FakeFileProvider.kt
@@ -1,4 +1,4 @@
-package com.on.staccato
+package com.on.staccato.data
 
 import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaTypeOrNull