diff --git a/anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt b/anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt
index 0ca9da53af..895a6347fd 100644
--- a/anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt
+++ b/anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt
@@ -148,7 +148,7 @@ class ContributesNodeCodeGenerator : CodeGenerator {
     }
 
     companion object {
-        private val assistedNodeFactoryFqName = FqName("io.element.android.x.architecture.AssistedNodeFactory")
-        private val nodeKeyFqName = FqName("io.element.android.x.architecture.NodeKey")
+        private val assistedNodeFactoryFqName = FqName("io.element.android.libraries.architecture.AssistedNodeFactory")
+        private val nodeKeyFqName = FqName("io.element.android.libraries.architecture.NodeKey")
     }
 }
diff --git a/app/src/main/kotlin/io/element/android/x/MainActivity.kt b/app/src/main/kotlin/io/element/android/x/MainActivity.kt
index 2630c78c7e..dc050debb4 100644
--- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt
+++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.Modifier
 import androidx.core.view.WindowCompat
 import com.bumble.appyx.core.integration.NodeHost
 import com.bumble.appyx.core.integrationpoint.NodeComponentActivity
-import io.element.android.x.architecture.bindings
+import io.element.android.libraries.architecture.bindings
 import io.element.android.x.di.DaggerComponentOwner
 import io.element.android.x.designsystem.ElementXTheme
 import io.element.android.x.di.AppBindings
diff --git a/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt b/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt
index 342c18e3a4..c412fa9163 100644
--- a/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt
@@ -20,7 +20,7 @@ import android.content.Context
 import com.squareup.anvil.annotations.MergeComponent
 import dagger.BindsInstance
 import dagger.Component
-import io.element.android.x.architecture.NodeFactoriesBindings
+import io.element.android.libraries.architecture.NodeFactoriesBindings
 
 @SingleIn(AppScope::class)
 @MergeComponent(AppScope::class)
diff --git a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt
index cfd7eee471..8d19684d18 100644
--- a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt
@@ -20,7 +20,7 @@ import com.squareup.anvil.annotations.ContributesTo
 import com.squareup.anvil.annotations.MergeSubcomponent
 import dagger.BindsInstance
 import dagger.Subcomponent
-import io.element.android.x.architecture.NodeFactoriesBindings
+import io.element.android.libraries.architecture.NodeFactoriesBindings
 import io.element.android.x.matrix.room.MatrixRoom
 
 @SingleIn(RoomScope::class)
diff --git a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt
index 8da31df8eb..57de09231f 100644
--- a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt
@@ -20,7 +20,7 @@ import com.squareup.anvil.annotations.ContributesTo
 import com.squareup.anvil.annotations.MergeSubcomponent
 import dagger.BindsInstance
 import dagger.Subcomponent
-import io.element.android.x.architecture.NodeFactoriesBindings
+import io.element.android.libraries.architecture.NodeFactoriesBindings
 import io.element.android.x.matrix.MatrixClient
 
 @SingleIn(SessionScope::class)
diff --git a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt
index 8a5a967875..b707d1071b 100644
--- a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt
+++ b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt
@@ -32,8 +32,8 @@ import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.core.node.node
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.push
-import io.element.android.x.architecture.bindings
-import io.element.android.x.architecture.createNode
+import io.element.android.libraries.architecture.bindings
+import io.element.android.libraries.architecture.createNode
 import io.element.android.x.di.DaggerComponentOwner
 import io.element.android.x.di.SessionComponent
 import io.element.android.x.features.preferences.PreferencesFlowNode
diff --git a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt
index 9db5f5cfb5..fc505303af 100644
--- a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt
+++ b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt
@@ -25,8 +25,8 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.navmodel.backstack.BackStack
-import io.element.android.x.architecture.bindings
-import io.element.android.x.architecture.createNode
+import io.element.android.libraries.architecture.bindings
+import io.element.android.libraries.architecture.createNode
 import io.element.android.x.di.DaggerComponentOwner
 import io.element.android.x.di.RoomComponent
 import io.element.android.x.features.messages.MessagesNode
diff --git a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt
index 9dee857470..6784b1f7cf 100644
--- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt
+++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt
@@ -36,8 +36,8 @@ import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.newRoot
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
-import io.element.android.x.architecture.createNode
-import io.element.android.x.architecture.presenterConnector
+import io.element.android.libraries.architecture.createNode
+import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.x.di.DaggerComponentOwner
 import io.element.android.x.features.rageshake.bugreport.BugReportNode
 import io.element.android.x.matrix.MatrixClient
diff --git a/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt b/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt
index 2bcf49505a..0ca0efd0bb 100644
--- a/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt
+++ b/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt
@@ -19,7 +19,7 @@ package io.element.android.x.root
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
-import io.element.android.x.architecture.Presenter
+import io.element.android.libraries.architecture.Presenter
 import io.element.android.x.features.rageshake.bugreport.BugReportPresenter
 import io.element.android.x.features.rageshake.crash.ui.CrashDetectionPresenter
 import io.element.android.x.features.rageshake.detection.RageshakeDetectionPresenter
diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/LoginFlowNode.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/LoginFlowNode.kt
index 12aa0887f2..f564eaf901 100644
--- a/features/login/src/main/kotlin/io/element/android/x/features/login/LoginFlowNode.kt
+++ b/features/login/src/main/kotlin/io/element/android/x/features/login/LoginFlowNode.kt
@@ -25,7 +25,7 @@ import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.push
-import io.element.android.x.architecture.createNode
+import io.element.android.libraries.architecture.createNode
 import io.element.android.x.features.login.changeserver.ChangeServerNode
 import io.element.android.x.features.login.root.LoginRootNode
 import kotlinx.parcelize.Parcelize
diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt
index 2e20380182..41ea7240a4 100644
--- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt
+++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt
@@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.x.anvilannotations.ContributesNode
-import io.element.android.x.architecture.presenterConnector
+import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.x.di.AppScope
 
 @ContributesNode(AppScope::class)
diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt
index 13259baf42..2b010724b5 100644
--- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt
+++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt
@@ -22,9 +22,9 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
-import io.element.android.x.architecture.Async
-import io.element.android.x.architecture.Presenter
-import io.element.android.x.architecture.execute
+import io.element.android.libraries.architecture.Async
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.architecture.execute
 import io.element.android.x.matrix.auth.MatrixAuthenticationService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerState.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerState.kt
index 90dcb8ce64..19405763e1 100644
--- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerState.kt
+++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerState.kt
@@ -16,7 +16,7 @@
 
 package io.element.android.x.features.login.changeserver
 
-import io.element.android.x.architecture.Async
+import io.element.android.libraries.architecture.Async
 
 data class ChangeServerState(
     val homeserver: String = "",
diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt
index 3dfb1b1a25..68846a70ff 100644
--- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt
+++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt
@@ -52,7 +52,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import io.element.android.x.architecture.Async
+import io.element.android.libraries.architecture.Async
 import io.element.android.x.core.compose.textFieldState
 import io.element.android.x.designsystem.components.VectorIcon
 import io.element.android.x.features.login.R
diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt
index eb1f1d304b..bccf36fb22 100644
--- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt
+++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt
@@ -28,7 +28,7 @@ import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.x.anvilannotations.ContributesNode
-import io.element.android.x.architecture.presenterConnector
+import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.x.core.compose.OnLifecycleEvent
 import io.element.android.x.di.AppScope
 
diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt
index e6908dab5b..eda3efcf57 100644
--- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt
+++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt
@@ -22,7 +22,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
-import io.element.android.x.architecture.Presenter
+import io.element.android.libraries.architecture.Presenter
 import io.element.android.x.matrix.auth.MatrixAuthenticationService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt
index 578de59787..b4fa7e9bd1 100644
--- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt
+++ b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt
@@ -21,15 +21,16 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import io.element.android.x.architecture.Async
-import io.element.android.x.architecture.Presenter
-import io.element.android.x.architecture.execute
+import io.element.android.libraries.architecture.Async
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.architecture.execute
 import io.element.android.x.matrix.MatrixClient
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-class LogoutPreferencePresenter @Inject constructor(private val matrixClient: MatrixClient) : Presenter<LogoutPreferenceState> {
+class LogoutPreferencePresenter @Inject constructor(private val matrixClient: MatrixClient) :
+    Presenter<LogoutPreferenceState> {
 
     @Composable
     override fun present(): LogoutPreferenceState {
diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt
index 5f76d9e3b4..28b259a989 100644
--- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt
+++ b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt
@@ -24,7 +24,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import io.element.android.x.architecture.Async
+import io.element.android.libraries.architecture.Async
 import io.element.android.x.designsystem.components.ProgressDialog
 import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.x.designsystem.components.preferences.PreferenceCategory
diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceState.kt b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceState.kt
index 70e637899b..cfa82c575e 100644
--- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceState.kt
+++ b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceState.kt
@@ -16,7 +16,7 @@
 
 package io.element.android.x.features.logout
 
-import io.element.android.x.architecture.Async
+import io.element.android.libraries.architecture.Async
 
 data class LogoutPreferenceState(
     val logoutAction: Async<Unit> = Async.Uninitialized,
diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt
index dd7b435ef0..3eb489e365 100644
--- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt
+++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt
@@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.x.anvilannotations.ContributesNode
-import io.element.android.x.architecture.presenterConnector
+import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.x.di.RoomScope
 
 @ContributesNode(RoomScope::class)
diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt
index 8324dc806b..778efa5a79 100644
--- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt
+++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt
@@ -24,7 +24,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
-import io.element.android.x.architecture.Presenter
+import io.element.android.libraries.architecture.Presenter
 import io.element.android.x.designsystem.components.avatar.AvatarData
 import io.element.android.x.designsystem.components.avatar.AvatarSize
 import io.element.android.x.features.messages.actionlist.ActionListPresenter
diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt
index cc894931c6..9a4e3b3168 100644
--- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt
+++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt
@@ -21,7 +21,7 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import io.element.android.x.architecture.Presenter
+import io.element.android.libraries.architecture.Presenter
 import io.element.android.x.features.messages.actionlist.model.TimelineItemAction
 import io.element.android.x.features.messages.timeline.model.TimelineItem
 import io.element.android.x.features.messages.timeline.model.content.TimelineItemRedactedContent
diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt
index aba47ec90b..63906b31da 100644
--- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt
+++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt
@@ -21,7 +21,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
-import io.element.android.x.architecture.Presenter
+import io.element.android.libraries.architecture.Presenter
 import io.element.android.x.core.data.StableCharSequence
 import io.element.android.x.core.data.toStableCharSequence
 import io.element.android.x.matrix.room.MatrixRoom
diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt
index 9cbd2a4acf..8aaddfe705 100644
--- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt
+++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt
@@ -24,7 +24,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
-import io.element.android.x.architecture.Presenter
+import io.element.android.libraries.architecture.Presenter
 import io.element.android.x.core.coroutine.CoroutineDispatchers
 import io.element.android.x.matrix.MatrixClient
 import io.element.android.x.matrix.core.EventId
diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/PreferencesFlowNode.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/PreferencesFlowNode.kt
index 6a5397074f..98255fd7c4 100644
--- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/PreferencesFlowNode.kt
+++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/PreferencesFlowNode.kt
@@ -24,7 +24,7 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.navmodel.backstack.BackStack
-import io.element.android.x.architecture.createNode
+import io.element.android.libraries.architecture.createNode
 import io.element.android.x.features.preferences.root.PreferencesRootNode
 import kotlinx.parcelize.Parcelize
 
diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt
index 429609e207..e6a03ec6b1 100644
--- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt
+++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt
@@ -27,7 +27,7 @@ import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.x.anvilannotations.ContributesNode
-import io.element.android.x.architecture.presenterConnector
+import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.x.di.SessionScope
 
 @ContributesNode(SessionScope::class)
diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootPresenter.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootPresenter.kt
index dbc233b805..065aef7fd3 100644
--- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootPresenter.kt
+++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootPresenter.kt
@@ -17,8 +17,8 @@
 package io.element.android.x.features.preferences.root
 
 import androidx.compose.runtime.Composable
-import io.element.android.x.architecture.Async
-import io.element.android.x.architecture.Presenter
+import io.element.android.libraries.architecture.Async
+import io.element.android.libraries.architecture.Presenter
 import io.element.android.x.features.logout.LogoutPreferencePresenter
 import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter
 import javax.inject.Inject
diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt
index 9339f00464..6541eb8c6d 100644
--- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt
+++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt
@@ -16,7 +16,7 @@
 
 package io.element.android.x.features.preferences.root
 
-import io.element.android.x.architecture.Async
+import io.element.android.libraries.architecture.Async
 import io.element.android.x.features.logout.LogoutPreferenceState
 import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState
 import io.element.android.x.matrix.ui.model.MatrixUser
diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt
index 5d3e1dab7b..ed9f72b43b 100644
--- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt
+++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt
@@ -20,7 +20,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import io.element.android.x.architecture.Async
+import io.element.android.libraries.architecture.Async
 import io.element.android.x.designsystem.components.preferences.PreferenceView
 import io.element.android.x.features.logout.LogoutPreferenceState
 import io.element.android.x.features.logout.LogoutPreferenceView
diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt
index 5422a3f3f5..93a7db4d7e 100644
--- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt
+++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt
@@ -21,7 +21,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import io.element.android.x.architecture.Async
+import io.element.android.libraries.architecture.Async
 import io.element.android.x.matrix.ui.components.MatrixUserHeader
 import io.element.android.x.matrix.ui.model.MatrixUser
 
diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt
index c01f153ddd..48e3b79d30 100644
--- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt
+++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt
@@ -27,7 +27,7 @@ import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.x.anvilannotations.ContributesNode
-import io.element.android.x.architecture.presenterConnector
+import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.x.di.AppScope
 
 @ContributesNode(AppScope::class)
diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportPresenter.kt
index c6f2f473e3..5dfd3392e7 100644
--- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportPresenter.kt
+++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportPresenter.kt
@@ -24,8 +24,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.core.net.toUri
-import io.element.android.x.architecture.Async
-import io.element.android.x.architecture.Presenter
+import io.element.android.libraries.architecture.Async
+import io.element.android.libraries.architecture.Presenter
 import io.element.android.x.features.rageshake.crash.CrashDataStore
 import io.element.android.x.features.rageshake.logs.VectorFileLogger
 import io.element.android.x.features.rageshake.reporter.BugReporter
diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportState.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportState.kt
index 80912a7923..85736a76e4 100644
--- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportState.kt
+++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportState.kt
@@ -17,7 +17,7 @@
 package io.element.android.x.features.rageshake.bugreport
 
 import android.os.Parcelable
-import io.element.android.x.architecture.Async
+import io.element.android.libraries.architecture.Async
 import kotlinx.parcelize.Parcelize
 
 data class BugReportState(
diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt
index 009ca812ef..6fd143e5ab 100644
--- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt
+++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt
@@ -50,7 +50,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
-import io.element.android.x.architecture.Async
+import io.element.android.libraries.architecture.Async
 import io.element.android.x.core.compose.LogCompositions
 import io.element.android.x.core.compose.textFieldState
 import io.element.android.x.designsystem.components.LabelledCheckbox
diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionPresenter.kt
index 3549bf3cb7..918a89ddbb 100644
--- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionPresenter.kt
+++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionPresenter.kt
@@ -19,13 +19,14 @@ package io.element.android.x.features.rageshake.crash.ui
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.rememberCoroutineScope
-import io.element.android.x.architecture.Presenter
+import io.element.android.libraries.architecture.Presenter
 import io.element.android.x.features.rageshake.crash.CrashDataStore
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-class CrashDetectionPresenter @Inject constructor(private val crashDataStore: CrashDataStore) : Presenter<CrashDetectionState> {
+class CrashDetectionPresenter @Inject constructor(private val crashDataStore: CrashDataStore) :
+    Presenter<CrashDetectionState> {
 
     @Composable
     override fun present(): CrashDetectionState {
diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt
index 62e974703d..96657c6933 100644
--- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt
+++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt
@@ -23,7 +23,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
-import io.element.android.x.architecture.Presenter
+import io.element.android.libraries.architecture.Presenter
 import io.element.android.x.core.screenshot.ImageResult
 import io.element.android.x.features.rageshake.preferences.RageshakePreferencesEvents
 import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter
diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesPresenter.kt
index e435a1a756..9878c26417 100644
--- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesPresenter.kt
+++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesPresenter.kt
@@ -22,7 +22,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
-import io.element.android.x.architecture.Presenter
+import io.element.android.libraries.architecture.Presenter
 import io.element.android.x.features.rageshake.rageshake.RageShake
 import io.element.android.x.features.rageshake.rageshake.RageshakeDataStore
 import kotlinx.coroutines.CoroutineScope
diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt
index 246545588f..5e216dca42 100644
--- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt
+++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt
@@ -27,7 +27,7 @@ import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.x.anvilannotations.ContributesNode
-import io.element.android.x.architecture.presenterConnector
+import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.x.di.SessionScope
 import io.element.android.x.matrix.core.RoomId
 
diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt
index 991239ba59..2ffad36aab 100644
--- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt
+++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt
@@ -25,7 +25,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import io.element.android.x.architecture.Presenter
+import io.element.android.libraries.architecture.Presenter
 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
diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt
index 7c5c4e78de..90a3954d3a 100644
--- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt
+++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt
@@ -25,8 +25,8 @@ import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
+import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.x.anvilannotations.ContributesNode
-import io.element.android.x.architecture.presenterConnector
 import io.element.android.x.di.AppScope
 
 // TODO Change to use the right Scope for your feature. For now it can be AppScope, SessionScope or RoomScope
diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt
index 3f6b5938e6..f552aea412 100644
--- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt
+++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt
@@ -17,7 +17,7 @@
 package io.element.android.x.features.template
 
 import androidx.compose.runtime.Composable
-import io.element.android.x.architecture.Presenter
+import io.element.android.libraries.architecture.Presenter
 import javax.inject.Inject
 
 class TemplatePresenter @Inject constructor() : Presenter<TemplateState> {
diff --git a/libraries/architecture/build.gradle.kts b/libraries/architecture/build.gradle.kts
index 2fad440e85..962c6021be 100644
--- a/libraries/architecture/build.gradle.kts
+++ b/libraries/architecture/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.x.libraries.architecture"
+    namespace = "io.element.android.libraries.architecture"
 }
 
 dependencies {
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/AssistedNodeFactory.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AssistedNodeFactory.kt
similarity index 94%
rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/AssistedNodeFactory.kt
rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AssistedNodeFactory.kt
index eb1d416fa7..6852bf9adb 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/AssistedNodeFactory.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AssistedNodeFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.x.architecture
+package io.element.android.libraries.architecture
 
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Async.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Async.kt
similarity index 97%
rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Async.kt
rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Async.kt
index 9428eda509..94d81a28e2 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Async.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Async.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.x.architecture
+package io.element.android.libraries.architecture
 
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.Stable
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Bindings.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt
similarity index 97%
rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Bindings.kt
rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt
index be09103db3..2ac135a31c 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Bindings.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.x.architecture
+package io.element.android.libraries.architecture
 
 import android.content.Context
 import android.content.ContextWrapper
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeFactories.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeFactories.kt
similarity index 96%
rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeFactories.kt
rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeFactories.kt
index c7a82bd481..6a4d52d20e 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeFactories.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeFactories.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.x.architecture
+package io.element.android.libraries.architecture
 
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeKey.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeKey.kt
similarity index 94%
rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeKey.kt
rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeKey.kt
index 59150edf5f..b28d5a8145 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeKey.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeKey.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.x.architecture
+package io.element.android.libraries.architecture
 
 import com.bumble.appyx.core.node.Node
 import dagger.MapKey
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Presenter.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Presenter.kt
similarity index 93%
rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Presenter.kt
rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Presenter.kt
index 6d5e7de444..9bfd089c27 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Presenter.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Presenter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.x.architecture
+package io.element.android.libraries.architecture
 
 import androidx.compose.runtime.Composable
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/PresenterConnector.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/PresenterConnector.kt
similarity index 96%
rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/PresenterConnector.kt
rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/PresenterConnector.kt
index 61659c7f80..0e97dba712 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/PresenterConnector.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/PresenterConnector.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.x.architecture
+package io.element.android.libraries.architecture
 
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope