diff --git a/app/build.gradle b/app/build.gradle
index 0c81b07456d3ac78bf0b23f989d49b3064f2c104..1f307f8ccdce7e90c05cb274b7ddba78364c67d0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -73,10 +73,6 @@ dependencies {
     //Emoji
     implementation "com.vanniktech:emoji-google:0.16.0"
 
-    //QR
-    implementation 'com.google.zxing:core:3.5.1'
-    implementation 'com.github.yuriy-budiyev:code-scanner:2.3.2'
-
     //Markdown
     def markwon_version = "4.6.2"
     implementation "io.noties.markwon:core:$markwon_version"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 47ea3c5aa5883d59c516dc8fe93b60fdc1c717af..e23a1d3d8fb19b2e2bc99b9d4b7e0e48c32407ad 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,7 +28,7 @@
         tools:ignore="DataExtractionRules"
         tools:targetApi="tiramisu">
         <activity
-            android:name=".feature.settings.active_sessions.verify.qr.QrScannerActivity"
+            android:name=".settings.active_sessions.verify.qr.QrScannerActivity"
             android:exported="false"
             android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity" />
diff --git a/app/src/main/res/layout/dialog_fragment_share_room.xml b/app/src/main/res/layout/dialog_fragment_share_room.xml
index 730b47dd6e80b6ed3fcb5e10c07e4c9006b7126b..d87a64cffd507545e0c7262239e2cab40be37fcf 100644
--- a/app/src/main/res/layout/dialog_fragment_share_room.xml
+++ b/app/src/main/res/layout/dialog_fragment_share_room.xml
@@ -27,7 +27,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbar" />
 
-    <org.futo.circles.view.QrCodeImageView
+    <org.futo.circles.settings.view.QrCodeImageView
         android:id="@+id/ivQr"
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/app/src/main/res/navigation/settings_nav_graph.xml b/app/src/main/res/navigation/settings_nav_graph.xml
index 1bc720e05b024cbc7f4134f23f7b3a01fd987d32..856462439a49eb3a9490adf675fafe2f3ded1f13 100644
--- a/app/src/main/res/navigation/settings_nav_graph.xml
+++ b/app/src/main/res/navigation/settings_nav_graph.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/settingsFragment"
-        android:name="org.futo.circles.feature.settings.SettingsFragment"
+        android:name="org.futo.circles.settings.feature.SettingsFragment"
         android:label="@string/settings"
         tools:layout="@layout/fragment_settings">
         <action
@@ -63,17 +63,17 @@
 
     <dialog
         android:id="@+id/editProfileDialogFragment"
-        android:name="org.futo.circles.feature.settings.profile.edit.EditProfileDialogFragment"
+        android:name="org.futo.circles.settings.edit_profile.EditProfileDialogFragment"
         android:label="ProfileDialogFragment"
         tools:layout="@layout/dialog_fragment_edit_profile" />
     <dialog
         android:id="@+id/changePasswordDialogFragment"
-        android:name="org.futo.circles.feature.settings.change_password.ChangePasswordDialogFragment"
+        android:name="org.futo.circles.settings.change_password.ChangePasswordDialogFragment"
         android:label="ChangePasswordDialogFragment"
         tools:layout="@layout/dialog_fragment_change_password" />
     <dialog
         android:id="@+id/activeSessionsDialogFragment"
-        android:name="org.futo.circles.feature.settings.active_sessions.ActiveSessionsDialogFragment"
+        android:name="org.futo.circles.settings.active_sessions.ActiveSessionsDialogFragment"
         android:label="ActiveSessionsDialogFragment"
         tools:layout="@layout/dialog_fragment_active_sessions">
         <action
@@ -110,7 +110,7 @@
     </dialog>
     <dialog
         android:id="@+id/verifySessionDialogFragment"
-        android:name="org.futo.circles.feature.settings.active_sessions.verify.VerifySessionDialogFragment"
+        android:name="org.futo.circles.settings.active_sessions.verify.VerifySessionDialogFragment"
         tools:layout="@layout/dialog_fragment_verify_session">
 
         <argument
diff --git a/settings/build.gradle b/settings/build.gradle
index a0bb9f013c122b223a14d26ad0b52ef8bbe7e37f..e2b29b8bd72f0e730b2618d1a3ea38c9a8d45f23 100644
--- a/settings/build.gradle
+++ b/settings/build.gradle
@@ -43,6 +43,9 @@ android {
 dependencies {
     implementation project(path: ':core')
 
+    //QR
+    implementation 'com.google.zxing:core:3.5.1'
+    implementation 'com.github.yuriy-budiyev:code-scanner:2.3.2'
 
     //Hilt
     def hilt = '2.46.1'