From f08a81c40912068aa4899d10746a3841d431674b Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Wed, 28 Feb 2024 13:28:08 +0200
Subject: [PATCH] Packages structure

---
 .../circles/feature/settings/SettingsDataSource.kt |  2 +-
 .../circles/feature/settings/SettingsFragment.kt   |  2 +-
 .../circles/feature/settings/SettingsViewModel.kt  |  7 +++----
 .../active_sessions/ActiveSessionsDataSource.kt    |  2 +-
 .../change_password/ChangePasswordDataSource.kt    |  2 +-
 .../feature/log_in/log_out/LogoutDataSource.kt     | 13 -------------
 .../recovery/EnterPassPhraseDialog.kt              |  2 +-
 .../recovery/EnterPassPhraseDialogListener.kt      |  2 +-
 .../futo/circles/auth/feature/uia/UIADataSource.kt |  2 +-
 .../flow}/reauth/AuthConfirmationProvider.kt       |  2 +-
 .../flow}/reauth/ReAuthCancellationListener.kt     |  2 +-
 .../flow}/reauth/ReAuthStagesDataSource.kt         |  2 +-
 .../{log_in => uia/stages}/EmptyFragment.kt        |  2 +-
 .../stages}/password/BsSpekeStageDataSource.kt     |  2 +-
 .../stages}/password/PasswordDataSource.kt         |  2 +-
 .../stages}/password/PasswordFragment.kt           |  4 ++--
 .../stages}/password/PasswordViewModel.kt          |  2 +-
 .../confirmation/SetupPasswordWarningDialog.kt     |  2 +-
 .../SubscriptionStageDataSource.kt                 |  2 +-
 .../SubscriptionStageFragment.kt                   |  4 ++--
 .../SubscriptionStageViewModel.kt                  |  2 +-
 .../list/SubscriptionViewHolder.kt                 |  2 +-
 .../list/SubscriptionsAdapter.kt                   |  2 +-
 .../stages}/terms/AcceptTermsDataSource.kt         |  2 +-
 .../stages}/terms/AcceptTermsFragment.kt           |  4 ++--
 .../stages}/terms/AcceptTermsViewModel.kt          |  2 +-
 .../stages}/terms/list/TermsItemViewHolder.kt      |  2 +-
 .../stages}/terms/list/TermsListAdapter.kt         |  2 +-
 .../stages}/username/UsernameDataSource.kt         |  2 +-
 .../stages}/username/UsernameFragment.kt           |  2 +-
 .../stages}/username/UsernameViewModel.kt          |  2 +-
 .../validate_email/ValidateEmailDataSource.kt      |  2 +-
 .../validate_email/ValidateEmailFragment.kt        |  2 +-
 .../validate_email/ValidateEmailViewModel.kt       |  2 +-
 .../validate_token/ValidateTokenDataSource.kt      |  2 +-
 .../validate_token/ValidateTokenFragment.kt        |  2 +-
 .../validate_token/ValidateTokenViewModel.kt       |  2 +-
 auth/src/main/res/navigation/uia_nav_graph.xml     | 14 +++++++-------
 38 files changed, 48 insertions(+), 62 deletions(-)
 delete mode 100644 auth/src/main/java/org/futo/circles/auth/feature/log_in/log_out/LogoutDataSource.kt
 rename auth/src/main/java/org/futo/circles/auth/feature/{log_in => pass_phrase}/recovery/EnterPassPhraseDialog.kt (98%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{log_in => pass_phrase}/recovery/EnterPassPhraseDialogListener.kt (81%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{ => uia/flow}/reauth/AuthConfirmationProvider.kt (96%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{ => uia/flow}/reauth/ReAuthCancellationListener.kt (55%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{ => uia/flow}/reauth/ReAuthStagesDataSource.kt (98%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{log_in => uia/stages}/EmptyFragment.kt (72%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/password/BsSpekeStageDataSource.kt (99%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/password/PasswordDataSource.kt (98%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/password/PasswordFragment.kt (95%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/password/PasswordViewModel.kt (93%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/password/confirmation/SetupPasswordWarningDialog.kt (93%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/subscription_stage/SubscriptionStageDataSource.kt (96%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/subscription_stage/SubscriptionStageFragment.kt (94%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/subscription_stage/SubscriptionStageViewModel.kt (97%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/subscription_stage/list/SubscriptionViewHolder.kt (92%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/subscription_stage/list/SubscriptionsAdapter.kt (90%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/terms/AcceptTermsDataSource.kt (96%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/terms/AcceptTermsFragment.kt (95%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/terms/AcceptTermsViewModel.kt (93%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/terms/list/TermsItemViewHolder.kt (94%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/terms/list/TermsListAdapter.kt (92%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/username/UsernameDataSource.kt (94%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/username/UsernameFragment.kt (97%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/username/UsernameViewModel.kt (93%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/validate_email/ValidateEmailDataSource.kt (96%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/validate_email/ValidateEmailFragment.kt (98%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/validate_email/ValidateEmailViewModel.kt (95%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/validate_token/ValidateTokenDataSource.kt (93%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/validate_token/ValidateTokenFragment.kt (96%)
 rename auth/src/main/java/org/futo/circles/auth/feature/{sign_up => uia/stages}/validate_token/ValidateTokenViewModel.kt (91%)

diff --git a/app/src/main/java/org/futo/circles/feature/settings/SettingsDataSource.kt b/app/src/main/java/org/futo/circles/feature/settings/SettingsDataSource.kt
index c7e6b4c62..b60abdd6c 100644
--- a/app/src/main/java/org/futo/circles/feature/settings/SettingsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/SettingsDataSource.kt
@@ -1,7 +1,7 @@
 package org.futo.circles.feature.settings
 
 import org.futo.circles.auth.feature.change_password.ChangePasswordDataSource
-import org.futo.circles.auth.feature.reauth.AuthConfirmationProvider
+import org.futo.circles.auth.feature.uia.flow.reauth.AuthConfirmationProvider
 import org.futo.circles.core.extensions.Response
 import org.futo.circles.core.extensions.createResult
 import org.futo.circles.core.provider.MatrixSessionProvider
diff --git a/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt b/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt
index 11e4fa65c..4af55af0b 100644
--- a/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt
@@ -11,7 +11,7 @@ import by.kirich1409.viewbindingdelegate.viewBinding
 import dagger.hilt.android.AndroidEntryPoint
 import org.futo.circles.MainActivity
 import org.futo.circles.R
-import org.futo.circles.auth.feature.reauth.ReAuthCancellationListener
+import org.futo.circles.auth.feature.uia.flow.reauth.ReAuthCancellationListener
 import org.futo.circles.auth.model.LogOut
 import org.futo.circles.auth.model.SwitchUser
 import org.futo.circles.core.base.CirclesAppConfig
diff --git a/app/src/main/java/org/futo/circles/feature/settings/SettingsViewModel.kt b/app/src/main/java/org/futo/circles/feature/settings/SettingsViewModel.kt
index bacd54ec9..b7d11b530 100644
--- a/app/src/main/java/org/futo/circles/feature/settings/SettingsViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/SettingsViewModel.kt
@@ -2,13 +2,11 @@ package org.futo.circles.feature.settings
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import org.futo.circles.auth.feature.log_in.log_out.LogoutDataSource
 import org.futo.circles.auth.feature.token.RefreshTokenManager
 import org.futo.circles.core.base.SingleEventLiveData
 import org.futo.circles.core.extensions.Response
 import org.futo.circles.core.extensions.createResult
 import org.futo.circles.core.extensions.launchBg
-import org.futo.circles.core.feature.workspace.SharedCircleDataSource
 import org.futo.circles.core.provider.MatrixSessionProvider
 import org.matrix.android.sdk.internal.session.media.MediaUsageInfo
 import javax.inject.Inject
@@ -16,7 +14,6 @@ import javax.inject.Inject
 @HiltViewModel
 class SettingsViewModel @Inject constructor(
     private val settingsDataSource: SettingsDataSource,
-    private val logoutDataSource: LogoutDataSource,
     private val refreshTokenManager: RefreshTokenManager
 ) : ViewModel() {
 
@@ -31,7 +28,9 @@ class SettingsViewModel @Inject constructor(
     fun logOut() {
         launchBg {
             MatrixSessionProvider.currentSession?.let { refreshTokenManager.cancelTokenRefreshing(it) }
-            val result = logoutDataSource.logOut()
+            val result = createResult {
+                MatrixSessionProvider.getSessionOrThrow().signOutService().signOut(true)
+            }
             logOutLiveData.postValue(result)
         }
     }
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/active_sessions/ActiveSessionsDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/active_sessions/ActiveSessionsDataSource.kt
index f2ab8ff52..74d62d6b1 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/active_sessions/ActiveSessionsDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/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.R
-import org.futo.circles.auth.feature.reauth.AuthConfirmationProvider
+import org.futo.circles.auth.feature.uia.flow.reauth.AuthConfirmationProvider
 import org.futo.circles.auth.model.ActiveSession
 import org.futo.circles.auth.model.ActiveSessionListItem
 import org.futo.circles.auth.model.SessionHeader
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/change_password/ChangePasswordDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/change_password/ChangePasswordDataSource.kt
index 54c5f0632..1c1d71ca9 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/change_password/ChangePasswordDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/change_password/ChangePasswordDataSource.kt
@@ -3,7 +3,7 @@ package org.futo.circles.auth.feature.change_password
 import org.futo.circles.auth.bsspeke.BSSpekeClientProvider
 import org.futo.circles.auth.feature.pass_phrase.EncryptionAlgorithmHelper
 import org.futo.circles.auth.feature.pass_phrase.create.CreatePassPhraseDataSource
-import org.futo.circles.auth.feature.reauth.AuthConfirmationProvider
+import org.futo.circles.auth.feature.uia.flow.reauth.AuthConfirmationProvider
 import org.futo.circles.core.extensions.Response
 import org.futo.circles.core.extensions.createResult
 import org.futo.circles.core.provider.MatrixSessionProvider
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/log_in/log_out/LogoutDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/log_in/log_out/LogoutDataSource.kt
deleted file mode 100644
index 95ce658c1..000000000
--- a/auth/src/main/java/org/futo/circles/auth/feature/log_in/log_out/LogoutDataSource.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.futo.circles.auth.feature.log_in.log_out
-
-import org.futo.circles.core.extensions.createResult
-import org.futo.circles.core.provider.MatrixSessionProvider
-import javax.inject.Inject
-
-class LogoutDataSource @Inject constructor() {
-
-    suspend fun logOut() = createResult {
-        MatrixSessionProvider.getSessionOrThrow().signOutService().signOut(true)
-    }
-
-}
\ No newline at end of file
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/log_in/recovery/EnterPassPhraseDialog.kt b/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/recovery/EnterPassPhraseDialog.kt
similarity index 98%
rename from auth/src/main/java/org/futo/circles/auth/feature/log_in/recovery/EnterPassPhraseDialog.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/recovery/EnterPassPhraseDialog.kt
index 25f0035fe..de00621cf 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/log_in/recovery/EnterPassPhraseDialog.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/recovery/EnterPassPhraseDialog.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.log_in.recovery
+package org.futo.circles.auth.feature.pass_phrase.recovery
 
 import android.app.ActionBar
 import android.content.Context
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/log_in/recovery/EnterPassPhraseDialogListener.kt b/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/recovery/EnterPassPhraseDialogListener.kt
similarity index 81%
rename from auth/src/main/java/org/futo/circles/auth/feature/log_in/recovery/EnterPassPhraseDialogListener.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/recovery/EnterPassPhraseDialogListener.kt
index 9c750f912..f8407df94 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/log_in/recovery/EnterPassPhraseDialogListener.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/recovery/EnterPassPhraseDialogListener.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.log_in.recovery
+package org.futo.circles.auth.feature.pass_phrase.recovery
 
 import android.net.Uri
 
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/uia/UIADataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/UIADataSource.kt
index c8929d325..10037a888 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/uia/UIADataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/UIADataSource.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import org.futo.circles.auth.R
 import org.futo.circles.auth.model.UIANavigationEvent
 import org.futo.circles.auth.feature.uia.flow.LoginStagesDataSource
-import org.futo.circles.auth.feature.reauth.ReAuthStagesDataSource
+import org.futo.circles.auth.feature.uia.flow.reauth.ReAuthStagesDataSource
 import org.futo.circles.auth.feature.uia.flow.SignUpStagesDataSource
 import org.futo.circles.core.base.SingleEventLiveData
 import org.futo.circles.core.extensions.Response
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/reauth/AuthConfirmationProvider.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/flow/reauth/AuthConfirmationProvider.kt
similarity index 96%
rename from auth/src/main/java/org/futo/circles/auth/feature/reauth/AuthConfirmationProvider.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/flow/reauth/AuthConfirmationProvider.kt
index 61c77565d..c93abbff8 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/reauth/AuthConfirmationProvider.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/flow/reauth/AuthConfirmationProvider.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.reauth
+package org.futo.circles.auth.feature.uia.flow.reauth
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/reauth/ReAuthCancellationListener.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/flow/reauth/ReAuthCancellationListener.kt
similarity index 55%
rename from auth/src/main/java/org/futo/circles/auth/feature/reauth/ReAuthCancellationListener.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/flow/reauth/ReAuthCancellationListener.kt
index a5fbeb54c..fbd4b1b23 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/reauth/ReAuthCancellationListener.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/flow/reauth/ReAuthCancellationListener.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.reauth
+package org.futo.circles.auth.feature.uia.flow.reauth
 
 interface ReAuthCancellationListener {
     fun onReAuthCanceled()
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/reauth/ReAuthStagesDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/flow/reauth/ReAuthStagesDataSource.kt
similarity index 98%
rename from auth/src/main/java/org/futo/circles/auth/feature/reauth/ReAuthStagesDataSource.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/flow/reauth/ReAuthStagesDataSource.kt
index ae90e2d03..b464010d3 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/reauth/ReAuthStagesDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/flow/reauth/ReAuthStagesDataSource.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.reauth
+package org.futo.circles.auth.feature.uia.flow.reauth
 
 import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/log_in/EmptyFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/EmptyFragment.kt
similarity index 72%
rename from auth/src/main/java/org/futo/circles/auth/feature/log_in/EmptyFragment.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/EmptyFragment.kt
index 65bf99149..ffdd3e047 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/log_in/EmptyFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/EmptyFragment.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.log_in
+package org.futo.circles.auth.feature.uia.stages
 
 import androidx.fragment.app.Fragment
 import org.futo.circles.auth.R
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/password/BsSpekeStageDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/BsSpekeStageDataSource.kt
similarity index 99%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/password/BsSpekeStageDataSource.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/BsSpekeStageDataSource.kt
index 9dcdd41a3..8ef8708b7 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/password/BsSpekeStageDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/BsSpekeStageDataSource.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.password
+package org.futo.circles.auth.feature.uia.stages.password
 
 import android.content.Context
 import android.util.Base64
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/password/PasswordDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/PasswordDataSource.kt
similarity index 98%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/password/PasswordDataSource.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/PasswordDataSource.kt
index f7f0f4269..265510cef 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/password/PasswordDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/PasswordDataSource.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.password
+package org.futo.circles.auth.feature.uia.stages.password
 
 import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/password/PasswordFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/PasswordFragment.kt
similarity index 95%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/password/PasswordFragment.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/PasswordFragment.kt
index b17fc1308..5f768f58c 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/password/PasswordFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/PasswordFragment.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.password
+package org.futo.circles.auth.feature.uia.stages.password
 
 import android.os.Bundle
 import android.view.View
@@ -11,7 +11,7 @@ import by.kirich1409.viewbindingdelegate.viewBinding
 import dagger.hilt.android.AndroidEntryPoint
 import org.futo.circles.auth.R
 import org.futo.circles.auth.databinding.FragmentPasswordBinding
-import org.futo.circles.auth.feature.sign_up.password.confirmation.SetupPasswordWarningDialog
+import org.futo.circles.auth.feature.uia.stages.password.confirmation.SetupPasswordWarningDialog
 import org.futo.circles.core.base.fragment.HasLoadingState
 import org.futo.circles.core.base.fragment.ParentBackPressOwnerFragment
 import org.futo.circles.core.extensions.getText
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/password/PasswordViewModel.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/PasswordViewModel.kt
similarity index 93%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/password/PasswordViewModel.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/PasswordViewModel.kt
index 21959f614..6db8e20dd 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/password/PasswordViewModel.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/PasswordViewModel.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.password
+package org.futo.circles.auth.feature.uia.stages.password
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/password/confirmation/SetupPasswordWarningDialog.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/confirmation/SetupPasswordWarningDialog.kt
similarity index 93%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/password/confirmation/SetupPasswordWarningDialog.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/confirmation/SetupPasswordWarningDialog.kt
index c82824761..3c3f4c0f6 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/password/confirmation/SetupPasswordWarningDialog.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/confirmation/SetupPasswordWarningDialog.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.password.confirmation
+package org.futo.circles.auth.feature.uia.stages.password.confirmation
 
 import android.app.ActionBar
 import android.content.Context
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/SubscriptionStageDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/subscription_stage/SubscriptionStageDataSource.kt
similarity index 96%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/SubscriptionStageDataSource.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/subscription_stage/SubscriptionStageDataSource.kt
index 8e6c653fc..bfc5055f0 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/SubscriptionStageDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/subscription_stage/SubscriptionStageDataSource.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.subscription_stage
+package org.futo.circles.auth.feature.uia.stages.subscription_stage
 
 import org.futo.circles.auth.feature.uia.UIADataSource.Companion.REGISTRATION_SUBSCRIPTION_TYPE
 import org.futo.circles.auth.feature.uia.UIADataSource.Companion.TYPE_PARAM_KEY
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/SubscriptionStageFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/subscription_stage/SubscriptionStageFragment.kt
similarity index 94%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/SubscriptionStageFragment.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/subscription_stage/SubscriptionStageFragment.kt
index 6e723478a..92f6fb7fa 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/SubscriptionStageFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/subscription_stage/SubscriptionStageFragment.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.subscription_stage
+package org.futo.circles.auth.feature.uia.stages.subscription_stage
 
 import android.os.Bundle
 import android.view.View
@@ -9,7 +9,7 @@ import com.google.android.material.divider.MaterialDividerItemDecoration
 import dagger.hilt.android.AndroidEntryPoint
 import org.futo.circles.auth.R
 import org.futo.circles.auth.databinding.FragmentSubscriptionStageBinding
-import org.futo.circles.auth.feature.sign_up.subscription_stage.list.SubscriptionsAdapter
+import org.futo.circles.auth.feature.uia.stages.subscription_stage.list.SubscriptionsAdapter
 import org.futo.circles.auth.model.SubscriptionReceiptData
 import org.futo.circles.auth.subscriptions.ItemPurchasedListener
 import org.futo.circles.auth.subscriptions.SubscriptionProvider
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/SubscriptionStageViewModel.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/subscription_stage/SubscriptionStageViewModel.kt
similarity index 97%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/SubscriptionStageViewModel.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/subscription_stage/SubscriptionStageViewModel.kt
index 65d58bc5e..cd838a003 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/SubscriptionStageViewModel.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/subscription_stage/SubscriptionStageViewModel.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.subscription_stage
+package org.futo.circles.auth.feature.uia.stages.subscription_stage
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/list/SubscriptionViewHolder.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/subscription_stage/list/SubscriptionViewHolder.kt
similarity index 92%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/list/SubscriptionViewHolder.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/subscription_stage/list/SubscriptionViewHolder.kt
index b14da3fa1..2e84a24df 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/list/SubscriptionViewHolder.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/subscription_stage/list/SubscriptionViewHolder.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.subscription_stage.list
+package org.futo.circles.auth.feature.uia.stages.subscription_stage.list
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/list/SubscriptionsAdapter.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/subscription_stage/list/SubscriptionsAdapter.kt
similarity index 90%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/list/SubscriptionsAdapter.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/subscription_stage/list/SubscriptionsAdapter.kt
index 4adda9540..d8160878b 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/list/SubscriptionsAdapter.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/subscription_stage/list/SubscriptionsAdapter.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.subscription_stage.list
+package org.futo.circles.auth.feature.uia.stages.subscription_stage.list
 
 import android.view.ViewGroup
 import org.futo.circles.core.base.list.BaseRvAdapter
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/terms/AcceptTermsDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/terms/AcceptTermsDataSource.kt
similarity index 96%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/terms/AcceptTermsDataSource.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/terms/AcceptTermsDataSource.kt
index 9f900dfc2..f67bb85d2 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/terms/AcceptTermsDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/terms/AcceptTermsDataSource.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.terms
+package org.futo.circles.auth.feature.uia.stages.terms
 
 import androidx.lifecycle.MutableLiveData
 import org.futo.circles.auth.extensions.toTermsListItems
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/terms/AcceptTermsFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/terms/AcceptTermsFragment.kt
similarity index 95%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/terms/AcceptTermsFragment.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/terms/AcceptTermsFragment.kt
index ee5643d5c..8b0912dc7 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/terms/AcceptTermsFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/terms/AcceptTermsFragment.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.terms
+package org.futo.circles.auth.feature.uia.stages.terms
 
 import android.os.Bundle
 import android.view.View
@@ -10,7 +10,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.futo.circles.auth.R
 import org.futo.circles.auth.databinding.FragmentAcceptTermsBinding
 import org.futo.circles.auth.extensions.openCustomTabUrl
-import org.futo.circles.auth.feature.sign_up.terms.list.TermsListAdapter
+import org.futo.circles.auth.feature.uia.stages.terms.list.TermsListAdapter
 import org.futo.circles.auth.model.TermsListItem
 import org.futo.circles.core.base.fragment.HasLoadingState
 import org.futo.circles.core.base.fragment.ParentBackPressOwnerFragment
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/terms/AcceptTermsViewModel.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/terms/AcceptTermsViewModel.kt
similarity index 93%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/terms/AcceptTermsViewModel.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/terms/AcceptTermsViewModel.kt
index 99354af76..aef81d8b1 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/terms/AcceptTermsViewModel.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/terms/AcceptTermsViewModel.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.terms
+package org.futo.circles.auth.feature.uia.stages.terms
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/terms/list/TermsItemViewHolder.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/terms/list/TermsItemViewHolder.kt
similarity index 94%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/terms/list/TermsItemViewHolder.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/terms/list/TermsItemViewHolder.kt
index 12a2d1082..1bf7ecbc7 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/terms/list/TermsItemViewHolder.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/terms/list/TermsItemViewHolder.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.terms.list
+package org.futo.circles.auth.feature.uia.stages.terms.list
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/terms/list/TermsListAdapter.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/terms/list/TermsListAdapter.kt
similarity index 92%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/terms/list/TermsListAdapter.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/terms/list/TermsListAdapter.kt
index b63db703a..f3065d4b8 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/terms/list/TermsListAdapter.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/terms/list/TermsListAdapter.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.terms.list
+package org.futo.circles.auth.feature.uia.stages.terms.list
 
 
 import android.view.ViewGroup
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/username/UsernameDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/username/UsernameDataSource.kt
similarity index 94%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/username/UsernameDataSource.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/username/UsernameDataSource.kt
index aac9cf77c..25c3e3b82 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/username/UsernameDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/username/UsernameDataSource.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.username
+package org.futo.circles.auth.feature.uia.stages.username
 
 import androidx.lifecycle.MutableLiveData
 import org.futo.circles.auth.feature.uia.UIADataSource.Companion.REGISTRATION_USERNAME_TYPE
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/username/UsernameFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/username/UsernameFragment.kt
similarity index 97%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/username/UsernameFragment.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/username/UsernameFragment.kt
index b1e07753e..682e7238f 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/username/UsernameFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/username/UsernameFragment.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.username
+package org.futo.circles.auth.feature.uia.stages.username
 
 import android.os.Bundle
 import android.text.InputFilter
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/username/UsernameViewModel.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/username/UsernameViewModel.kt
similarity index 93%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/username/UsernameViewModel.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/username/UsernameViewModel.kt
index 6a7ac038d..870e462fa 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/username/UsernameViewModel.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/username/UsernameViewModel.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.username
+package org.futo.circles.auth.feature.uia.stages.username
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_email/ValidateEmailDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_email/ValidateEmailDataSource.kt
similarity index 96%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_email/ValidateEmailDataSource.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_email/ValidateEmailDataSource.kt
index af6451996..083a9d1d7 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_email/ValidateEmailDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_email/ValidateEmailDataSource.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.validate_email
+package org.futo.circles.auth.feature.uia.stages.validate_email
 
 import org.futo.circles.auth.feature.uia.UIADataSource.Companion.REGISTRATION_EMAIL_REQUEST_TOKEN_TYPE
 import org.futo.circles.auth.feature.uia.UIADataSource.Companion.REGISTRATION_EMAIL_SUBMIT_TOKEN_TYPE
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_email/ValidateEmailFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_email/ValidateEmailFragment.kt
similarity index 98%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_email/ValidateEmailFragment.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_email/ValidateEmailFragment.kt
index 93f52bb96..8a216fa21 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_email/ValidateEmailFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_email/ValidateEmailFragment.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.validate_email
+package org.futo.circles.auth.feature.uia.stages.validate_email
 
 import android.os.Bundle
 import android.view.View
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_email/ValidateEmailViewModel.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_email/ValidateEmailViewModel.kt
similarity index 95%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_email/ValidateEmailViewModel.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_email/ValidateEmailViewModel.kt
index dcd9b7d45..0f119f467 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_email/ValidateEmailViewModel.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_email/ValidateEmailViewModel.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.validate_email
+package org.futo.circles.auth.feature.uia.stages.validate_email
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_token/ValidateTokenDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_token/ValidateTokenDataSource.kt
similarity index 93%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_token/ValidateTokenDataSource.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_token/ValidateTokenDataSource.kt
index 832dbcc53..a35f11aee 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_token/ValidateTokenDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_token/ValidateTokenDataSource.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.validate_token
+package org.futo.circles.auth.feature.uia.stages.validate_token
 
 import org.futo.circles.auth.feature.uia.UIADataSource.Companion.REGISTRATION_TOKEN_TYPE
 import org.futo.circles.auth.feature.uia.UIADataSource.Companion.TYPE_PARAM_KEY
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_token/ValidateTokenFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_token/ValidateTokenFragment.kt
similarity index 96%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_token/ValidateTokenFragment.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_token/ValidateTokenFragment.kt
index 32cec67c4..a71313000 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_token/ValidateTokenFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_token/ValidateTokenFragment.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.validate_token
+package org.futo.circles.auth.feature.uia.stages.validate_token
 
 import android.os.Bundle
 import android.view.View
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_token/ValidateTokenViewModel.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_token/ValidateTokenViewModel.kt
similarity index 91%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_token/ValidateTokenViewModel.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_token/ValidateTokenViewModel.kt
index a17e35e81..05c34f9eb 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/validate_token/ValidateTokenViewModel.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/validate_token/ValidateTokenViewModel.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.validate_token
+package org.futo.circles.auth.feature.uia.stages.validate_token
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
diff --git a/auth/src/main/res/navigation/uia_nav_graph.xml b/auth/src/main/res/navigation/uia_nav_graph.xml
index 2d1abd7c9..50842c733 100644
--- a/auth/src/main/res/navigation/uia_nav_graph.xml
+++ b/auth/src/main/res/navigation/uia_nav_graph.xml
@@ -33,36 +33,36 @@
 
     <fragment
         android:id="@+id/validateTokenFragment"
-        android:name="org.futo.circles.auth.feature.sign_up.validate_token.ValidateTokenFragment"
+        android:name="org.futo.circles.auth.feature.uia.stages.validate_token.ValidateTokenFragment"
         tools:layout="@layout/fragment_validate_token" />
 
     <fragment
         android:id="@+id/validateEmailFragment"
-        android:name="org.futo.circles.auth.feature.sign_up.validate_email.ValidateEmailFragment"
+        android:name="org.futo.circles.auth.feature.uia.stages.validate_email.ValidateEmailFragment"
         tools:layout="@layout/fragment_validate_email" />
 
     <fragment
         android:id="@+id/acceptTermsFragment"
-        android:name="org.futo.circles.auth.feature.sign_up.terms.AcceptTermsFragment"
+        android:name="org.futo.circles.auth.feature.uia.stages.terms.AcceptTermsFragment"
         tools:layout="@layout/fragment_accept_terms" />
 
     <fragment
         android:id="@+id/subscriptionStageFragment"
-        android:name="org.futo.circles.auth.feature.sign_up.subscription_stage.SubscriptionStageFragment"
+        android:name="org.futo.circles.auth.feature.uia.stages.subscription_stage.SubscriptionStageFragment"
         tools:layout="@layout/fragment_subscription_stage" />
     <fragment
         android:id="@+id/passwordFragment"
-        android:name="org.futo.circles.auth.feature.sign_up.password.PasswordFragment"
+        android:name="org.futo.circles.auth.feature.uia.stages.password.PasswordFragment"
         tools:layout="@layout/fragment_password" />
 
     <fragment
         android:id="@+id/usernameFragment"
-        android:name="org.futo.circles.auth.feature.sign_up.username.UsernameFragment"
+        android:name="org.futo.circles.auth.feature.uia.stages.username.UsernameFragment"
         tools:layout="@layout/fragment_username" />
 
     <fragment
         android:id="@+id/emptyFragment"
-        android:name="org.futo.circles.auth.feature.log_in.EmptyFragment"
+        android:name="org.futo.circles.auth.feature.uia.stages.EmptyFragment"
         tools:layout="@layout/fragment_empty" />
 
 
-- 
GitLab