diff --git a/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt
index 38c5c94a27f1540707e9bf758d55786618860c2f..762bcf378c3b3a390d076a347e0d156b2c61d4af 100644
--- a/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt
@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.mapNotNull
 import org.futo.circles.R
-import org.futo.circles.base.ExpandableItemsDataSource
+import org.futo.circles.core.ExpandableItemsDataSource
 import org.futo.circles.core.extensions.createResult
 import org.futo.circles.core.extensions.getOrThrow
 import org.futo.circles.core.mapping.nameOrId
diff --git a/app/src/main/java/org/futo/circles/base/ExpandableItemsDataSource.kt b/core/src/main/java/org/futo/circles/core/ExpandableItemsDataSource.kt
similarity index 95%
rename from app/src/main/java/org/futo/circles/base/ExpandableItemsDataSource.kt
rename to core/src/main/java/org/futo/circles/core/ExpandableItemsDataSource.kt
index b9a014cb27b1cd61384488e5885c7227445e85f3..1b7df4ae5d9dd51cf0e777046cd7eb4ec227fe24 100644
--- a/app/src/main/java/org/futo/circles/base/ExpandableItemsDataSource.kt
+++ b/core/src/main/java/org/futo/circles/core/ExpandableItemsDataSource.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.base
+package org.futo.circles.core
 
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
diff --git a/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/ActiveSessionsDataSource.kt b/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/ActiveSessionsDataSource.kt
index 6f154444330d4a29d6d9fc7f3838d8f2fcd24e0c..52627e5bb2b34af8d379a750c08359e1fe254e26 100644
--- a/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/ActiveSessionsDataSource.kt
+++ b/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/ActiveSessionsDataSource.kt
@@ -10,7 +10,7 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOn
 import org.futo.circles.auth.feature.reauth.AuthConfirmationProvider
-import org.futo.circles.base.ExpandableItemsDataSource
+import org.futo.circles.core.ExpandableItemsDataSource
 import org.futo.circles.core.extensions.Response
 import org.futo.circles.core.extensions.createResult
 import org.futo.circles.core.provider.MatrixSessionProvider