diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/MatrixInitProvider.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/MatrixInitProvider.kt
index dbddbafb..f57992ff 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/MatrixInitProvider.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/MatrixInitProvider.kt
@@ -6,7 +6,7 @@ import android.database.Cursor
 import android.net.Uri
 import im.vector.matrix.android.api.Matrix
 
-class MatrixInitProvider : ContentProvider() {
+internal class MatrixInitProvider : ContentProvider() {
 
     override fun onCreate(): Boolean {
         Matrix.initialize(context!!)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
index 55990d4e..41644ad8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
@@ -6,7 +6,7 @@ import im.vector.matrix.android.api.auth.data.SessionParams
 import im.vector.matrix.android.api.session.group.GroupService
 import im.vector.matrix.android.api.session.room.RoomService
 import im.vector.matrix.android.internal.database.LiveEntityObserver
-import im.vector.matrix.android.internal.session.events.prune.EventsPruner
+import im.vector.matrix.android.internal.session.room.prune.EventsPruner
 import im.vector.matrix.android.internal.session.group.DefaultGroupService
 import im.vector.matrix.android.internal.session.group.GroupSummaryUpdater
 import im.vector.matrix.android.internal.session.room.DefaultRoomService
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/events/prune/EventsPruner.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/prune/EventsPruner.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/events/prune/EventsPruner.kt
rename to matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/prune/EventsPruner.kt
index 195315e8..a80b7ccc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/events/prune/EventsPruner.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/prune/EventsPruner.kt
@@ -1,4 +1,4 @@
-package im.vector.matrix.android.internal.session.events.prune
+package im.vector.matrix.android.internal.session.room.prune
 
 import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequestBuilder
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/events/prune/PruneEventWorker.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/prune/PruneEventWorker.kt
similarity index 98%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/events/prune/PruneEventWorker.kt
rename to matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/prune/PruneEventWorker.kt
index 441ca009..6562fd14 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/events/prune/PruneEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/prune/PruneEventWorker.kt
@@ -1,4 +1,4 @@
-package im.vector.matrix.android.internal.session.events.prune
+package im.vector.matrix.android.internal.session.room.prune
 
 import android.content.Context
 import androidx.work.Worker