diff --git a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListViewModel.kt b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListViewModel.kt
index 799622c9a6..3a22684bc9 100644
--- a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListViewModel.kt
+++ b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListViewModel.kt
@@ -5,7 +5,7 @@ import com.airbnb.mvrx.MavericksViewModel
 import com.airbnb.mvrx.MavericksViewModelFactory
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
-import io.element.android.x.core.data.parallelMap
+import io.element.android.x.core.coroutine.parallelMap
 import io.element.android.x.designsystem.components.avatar.AvatarData
 import io.element.android.x.designsystem.components.avatar.AvatarSize
 import io.element.android.x.features.roomlist.model.MatrixUser
diff --git a/libraries/core/src/main/java/io/element/android/x/core/compose/Previews.kt b/libraries/core/src/main/java/io/element/android/x/core/compose/PairCombinedPreviewParameter.kt
similarity index 100%
rename from libraries/core/src/main/java/io/element/android/x/core/compose/Previews.kt
rename to libraries/core/src/main/java/io/element/android/x/core/compose/PairCombinedPreviewParameter.kt
diff --git a/libraries/core/src/main/java/io/element/android/x/core/coroutine/TimingOperators.kt b/libraries/core/src/main/java/io/element/android/x/core/coroutine/TimingOperators.kt
index 67e187b746..c29cb79d9e 100644
--- a/libraries/core/src/main/java/io/element/android/x/core/coroutine/TimingOperators.kt
+++ b/libraries/core/src/main/java/io/element/android/x/core/coroutine/TimingOperators.kt
@@ -1,4 +1,4 @@
-package io.element.android.x.core.data.flow
+package io.element.android.x.core.coroutine
 
 import android.os.SystemClock
 import kotlinx.coroutines.CoroutineScope
diff --git a/libraries/core/src/main/java/io/element/android/x/core/coroutine/pmap.kt b/libraries/core/src/main/java/io/element/android/x/core/coroutine/pmap.kt
index 36790dd426..90d2b38984 100644
--- a/libraries/core/src/main/java/io/element/android/x/core/coroutine/pmap.kt
+++ b/libraries/core/src/main/java/io/element/android/x/core/coroutine/pmap.kt
@@ -1,4 +1,4 @@
-package io.element.android.x.core.data
+package io.element.android.x.core.coroutine
 
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -7,4 +7,4 @@ import kotlinx.coroutines.coroutineScope
 // https://jivimberg.io/blog/2018/05/04/parallel-map-in-kotlin/
 suspend fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> = coroutineScope {
     map { async { f(it) } }.awaitAll()
-}
\ No newline at end of file
+}