diff --git a/app/src/main/res/navigation/settings_nav_graph.xml b/app/src/main/res/navigation/settings_nav_graph.xml
index f0cea5e281749af61027f7dcd4b5ccac7c61c277..28898b3046b54321fa9f9a2b97bdcd156d2465ce 100644
--- a/app/src/main/res/navigation/settings_nav_graph.xml
+++ b/app/src/main/res/navigation/settings_nav_graph.xml
@@ -60,7 +60,7 @@
 
     <dialog
         android:id="@+id/editProfileDialogFragment"
-        android:name="org.futo.circles.feature.settings.edit_profile.EditProfileDialogFragment"
+        android:name="org.futo.circles.auth.feature.profile.edit.EditProfileDialogFragment"
         android:label="ProfileDialogFragment"
         tools:layout="@layout/dialog_fragment_edit_profile" />
     <dialog
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e04d79f95b68478e38f52100d5180cf425cfa0b2..34d5ae3e65e0e664cc790002b72e0b3e750452c2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -282,7 +282,6 @@
     <string name="send_request_to_follow_user">Send request to follow this user</string>
     <string name="resend">Resend</string>
     <string name="unable_to_parse_url">Unable to parse url</string>
-    <string name="profile_updated">Profile updated</string>
     <string name="version_format">Version %s</string>
     <string name="developer_mode_enabled">Developer mode is enabled</string>
     <string name="developer_mode_disabled">Developer mode is disabled</string>
diff --git a/app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/profile/edit/EditProfileDialogFragment.kt
similarity index 95%
rename from app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/profile/edit/EditProfileDialogFragment.kt
index 6569c565312e8c66a4d2046586b199bb6e367e66..6ce72025cb23ba35f4e6fd0bcd1ed57dba998f83 100644
--- a/app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/profile/edit/EditProfileDialogFragment.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.feature.settings.edit_profile
+package org.futo.circles.auth.feature.profile.edit
 
 import android.os.Bundle
 import android.view.View
@@ -6,7 +6,8 @@ import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
-import org.futo.circles.R
+import org.futo.circles.auth.R
+import org.futo.circles.auth.databinding.DialogFragmentEditProfileBinding
 import org.futo.circles.core.extensions.getText
 import org.futo.circles.core.extensions.loadProfileIcon
 import org.futo.circles.core.extensions.notEmptyDisplayName
@@ -16,7 +17,6 @@ import org.futo.circles.core.extensions.onBackPressed
 import org.futo.circles.core.extensions.showSuccess
 import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
 import org.futo.circles.core.fragment.HasLoadingState
-import org.futo.circles.databinding.DialogFragmentEditProfileBinding
 import org.futo.circles.gallery.feature.pick.AllMediaPickerHelper
 import org.matrix.android.sdk.api.session.user.model.User
 
diff --git a/app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt b/auth/src/main/java/org/futo/circles/auth/feature/profile/edit/EditProfileViewModel.kt
similarity index 91%
rename from app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/profile/edit/EditProfileViewModel.kt
index b1eec4aaa658776d8a883da071f2103317892f13..4810e6b21f6a2cc03377db67f325c76f01cb5472 100644
--- a/app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/profile/edit/EditProfileViewModel.kt
@@ -1,10 +1,10 @@
-package org.futo.circles.feature.settings.edit_profile
+package org.futo.circles.auth.feature.profile.edit
 
 import android.net.Uri
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import org.futo.circles.auth.feature.sign_up.setup_profile.SetupProfileDataSource
+import org.futo.circles.auth.feature.profile.setup.SetupProfileDataSource
 import org.futo.circles.core.SingleEventLiveData
 import org.futo.circles.core.extensions.Response
 import org.futo.circles.core.extensions.launchBg
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/setup_profile/SetupProfileDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/profile/setup/SetupProfileDataSource.kt
similarity index 95%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/setup_profile/SetupProfileDataSource.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/profile/setup/SetupProfileDataSource.kt
index 2006f36f822115da00d4dba36bacff56b5fc05ad..d0497fdef23ad4c2569b02b9713250a14cc42083 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/setup_profile/SetupProfileDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/profile/setup/SetupProfileDataSource.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.setup_profile
+package org.futo.circles.auth.feature.profile.setup
 
 import android.content.Context
 import android.net.Uri
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/setup_profile/SetupProfileFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/profile/setup/SetupProfileFragment.kt
similarity index 95%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/setup_profile/SetupProfileFragment.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/profile/setup/SetupProfileFragment.kt
index f8b465137e64203d0fb3d07b87e27c29c899833d..588250fc19bf459830d18ad2c0e7c20e41fd7f67 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/setup_profile/SetupProfileFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/profile/setup/SetupProfileFragment.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.setup_profile
+package org.futo.circles.auth.feature.profile.setup
 
 import android.os.Bundle
 import android.view.View
@@ -10,6 +10,7 @@ import by.kirich1409.viewbindingdelegate.viewBinding
 import dagger.hilt.android.AndroidEntryPoint
 import org.futo.circles.auth.R
 import org.futo.circles.auth.databinding.FragmentSetupProfileBinding
+import org.futo.circles.auth.feature.sign_up.setup_profile.SetupProfileFragmentDirections
 import org.futo.circles.core.CirclesAppConfig
 import org.futo.circles.core.extensions.getText
 import org.futo.circles.core.extensions.navigateSafe
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/setup_profile/SetupProfileViewModel.kt b/auth/src/main/java/org/futo/circles/auth/feature/profile/setup/SetupProfileViewModel.kt
similarity index 94%
rename from auth/src/main/java/org/futo/circles/auth/feature/sign_up/setup_profile/SetupProfileViewModel.kt
rename to auth/src/main/java/org/futo/circles/auth/feature/profile/setup/SetupProfileViewModel.kt
index 27d801221095a0aa5fca6257d59a8c81b8fe3f6f..dda34c926effe0a58043f60470b93a4d13bf44d1 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/setup_profile/SetupProfileViewModel.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/profile/setup/SetupProfileViewModel.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.auth.feature.sign_up.setup_profile
+package org.futo.circles.auth.feature.profile.setup
 
 import android.net.Uri
 import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/res/layout/dialog_fragment_edit_profile.xml b/auth/src/main/res/layout/dialog_fragment_edit_profile.xml
similarity index 100%
rename from app/src/main/res/layout/dialog_fragment_edit_profile.xml
rename to auth/src/main/res/layout/dialog_fragment_edit_profile.xml
diff --git a/auth/src/main/res/navigation/nav_graph_auth.xml b/auth/src/main/res/navigation/nav_graph_auth.xml
index f3ca8a36100babb9542c5f8213f47bd6ca3e9178..130ebbc3140b4318758efaf5e6dbf5659dfdd311 100644
--- a/auth/src/main/res/navigation/nav_graph_auth.xml
+++ b/auth/src/main/res/navigation/nav_graph_auth.xml
@@ -51,7 +51,7 @@
     </fragment>
     <fragment
         android:id="@+id/setupProfileFragment"
-        android:name="org.futo.circles.auth.feature.sign_up.setup_profile.SetupProfileFragment"
+        android:name="org.futo.circles.auth.feature.profile.setup.SetupProfileFragment"
         android:label="SetupProfileFragment"
         tools:layout="@layout/fragment_setup_profile">
         <action
diff --git a/auth/src/main/res/values/strings.xml b/auth/src/main/res/values/strings.xml
index fa168e1eede8b5cede8e7a1ed5bb522f12d2b21d..8099aca550f2ab9575ade50772c0d3a90368590e 100644
--- a/auth/src/main/res/values/strings.xml
+++ b/auth/src/main/res/values/strings.xml
@@ -120,6 +120,7 @@
     <string name="active_login_sessions">Active login sessions</string>
     <string name="verify_session">Verify session</string>
     <string name="scan_qr_code">Scan QR code</string>
+    <string name="profile_updated">Profile updated</string>
 
     <plurals name="days">
         <item quantity="one">%1$d day</item>