diff --git a/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/TestAspectRatioSerializer.kt b/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/serializer/TestAspectRatioSerializer.kt
similarity index 93%
rename from data/src/test/java/ch/srg/dataProvider/integrationlayer/data/TestAspectRatioSerializer.kt
rename to data/src/test/java/ch/srg/dataProvider/integrationlayer/data/serializer/TestAspectRatioSerializer.kt
index 274df94..7bda2d7 100644
--- a/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/TestAspectRatioSerializer.kt
+++ b/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/serializer/TestAspectRatioSerializer.kt
@@ -1,5 +1,6 @@
-package ch.srg.dataProvider.integrationlayer.data
+package ch.srg.dataProvider.integrationlayer.data.serializer
 
+import ch.srg.dataProvider.integrationlayer.data.DataProviderJson
 import ch.srg.dataProvider.integrationlayer.data.remote.AspectRatio
 import kotlinx.serialization.encodeToString
 import kotlin.test.Test
diff --git a/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/TestBlockReasonSerializer.kt b/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/serializer/TestBlockReasonSerializer.kt
similarity index 87%
rename from data/src/test/java/ch/srg/dataProvider/integrationlayer/data/TestBlockReasonSerializer.kt
rename to data/src/test/java/ch/srg/dataProvider/integrationlayer/data/serializer/TestBlockReasonSerializer.kt
index 95564ed..f397461 100644
--- a/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/TestBlockReasonSerializer.kt
+++ b/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/serializer/TestBlockReasonSerializer.kt
@@ -1,5 +1,6 @@
-package ch.srg.dataProvider.integrationlayer.data
+package ch.srg.dataProvider.integrationlayer.data.serializer
 
+import ch.srg.dataProvider.integrationlayer.data.DataProviderJson
 import ch.srg.dataProvider.integrationlayer.data.remote.BlockReason
 import kotlinx.serialization.encodeToString
 import kotlin.test.Test
diff --git a/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/TestDateSerializer.kt b/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/serializer/TestDateSerializer.kt
similarity index 87%
rename from data/src/test/java/ch/srg/dataProvider/integrationlayer/data/TestDateSerializer.kt
rename to data/src/test/java/ch/srg/dataProvider/integrationlayer/data/serializer/TestDateSerializer.kt
index b35c420..a714c3b 100644
--- a/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/TestDateSerializer.kt
+++ b/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/serializer/TestDateSerializer.kt
@@ -1,7 +1,7 @@
-package ch.srg.dataProvider.integrationlayer.data
+package ch.srg.dataProvider.integrationlayer.data.serializer
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import ch.srg.dataProvider.integrationlayer.data.serializer.DateSerializer
+import ch.srg.dataProvider.integrationlayer.data.DataProviderJson
 import org.junit.runner.RunWith
 import java.util.Date
 import kotlin.test.Ignore
diff --git a/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/TestImageUrlSerializer.kt b/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/serializer/TestImageUrlSerializer.kt
similarity index 77%
rename from data/src/test/java/ch/srg/dataProvider/integrationlayer/data/TestImageUrlSerializer.kt
rename to data/src/test/java/ch/srg/dataProvider/integrationlayer/data/serializer/TestImageUrlSerializer.kt
index b552930..6e64479 100644
--- a/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/TestImageUrlSerializer.kt
+++ b/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/serializer/TestImageUrlSerializer.kt
@@ -1,5 +1,7 @@
-package ch.srg.dataProvider.integrationlayer.data
+package ch.srg.dataProvider.integrationlayer.data.serializer
 
+import ch.srg.dataProvider.integrationlayer.data.DataProviderJson
+import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import kotlinx.serialization.encodeToString
 import kotlin.test.Test
 import kotlin.test.assertEquals