diff --git a/OsmAnd/res/xml/configure_profile.xml b/OsmAnd/res/xml/configure_profile.xml
index d86a80620f..9fb131486e 100644
--- a/OsmAnd/res/xml/configure_profile.xml
+++ b/OsmAnd/res/xml/configure_profile.xml
@@ -16,7 +16,7 @@
 		android:persistent="false"
 		android:summary="@string/general_settings_profile_descr"
 		android:title="@string/general_settings_2"
-		app:fragment="net.osmand.plus.settings.GeneralProfileSettingsFragment"
+		app:fragment="net.osmand.plus.settings.fragments.GeneralProfileSettingsFragment"
 		tools:icon="@drawable/ic_action_settings" />
 
 	<Preference
@@ -25,7 +25,7 @@
 		android:persistent="false"
 		android:summary="@string/configure_navigation"
 		android:title="@string/routing_settings_2"
-		app:fragment="net.osmand.plus.settings.NavigationFragment"
+		app:fragment="net.osmand.plus.settings.fragments.NavigationFragment"
 		tools:icon="@drawable/ic_action_gdirections_dark" />
 
 	<Preference
diff --git a/OsmAnd/res/xml/general_profile_settings.xml b/OsmAnd/res/xml/general_profile_settings.xml
index 0cae429f10..9196b5d7fa 100644
--- a/OsmAnd/res/xml/general_profile_settings.xml
+++ b/OsmAnd/res/xml/general_profile_settings.xml
@@ -53,7 +53,7 @@
 		android:key="coordinates_format"
 		android:layout="@layout/preference_with_descr"
 		android:title="@string/coords_format"
-		app:fragment="net.osmand.plus.settings.CoordinatesFormatFragment" />
+		app:fragment="net.osmand.plus.settings.fragments.CoordinatesFormatFragment" />
 
 	<net.osmand.plus.settings.preferences.ListPreferenceEx
 		android:key="angular_measurement"
diff --git a/OsmAnd/res/xml/global_settings.xml b/OsmAnd/res/xml/global_settings.xml
index 7367f562d0..32f31fb859 100644
--- a/OsmAnd/res/xml/global_settings.xml
+++ b/OsmAnd/res/xml/global_settings.xml
@@ -21,7 +21,7 @@
 		android:layout="@layout/preference_with_descr"
 		android:persistent="false"
 		android:title="@string/application_dir"
-		app:fragment="net.osmand.plus.settings.DataStorageFragment"
+		app:fragment="net.osmand.plus.settings.fragments.DataStorageFragment"
 		tools:icon="@drawable/ic_action_folder" />
 
 	<Preference
@@ -48,7 +48,7 @@
 		android:persistent="false"
 		android:title="@string/dialogs_and_notifications_title"
 		android:summary="@string/shared_string_all"
-		app:fragment="net.osmand.plus.settings.DialogsAndNotificationsSettingsFragment"
+		app:fragment="net.osmand.plus.settings.fragments.DialogsAndNotificationsSettingsFragment"
 		tools:icon="@drawable/ic_action_notification" />
 
 	<net.osmand.plus.settings.preferences.SwitchPreferenceEx
diff --git a/OsmAnd/res/xml/navigation_settings_new.xml b/OsmAnd/res/xml/navigation_settings_new.xml
index 341fcd1b8a..25df608227 100644
--- a/OsmAnd/res/xml/navigation_settings_new.xml
+++ b/OsmAnd/res/xml/navigation_settings_new.xml
@@ -16,7 +16,7 @@
 		android:layout="@layout/preference_with_descr"
 		android:summary="@string/route_parameters_descr"
 		android:title="@string/route_parameters"
-		app:fragment="net.osmand.plus.settings.RouteParametersFragment"
+		app:fragment="net.osmand.plus.settings.fragments.RouteParametersFragment"
 		tools:icon="@drawable/ic_action_route_distance" />
 
 	<net.osmand.plus.settings.preferences.SwitchPreferenceEx
@@ -42,7 +42,7 @@
 		android:layout="@layout/preference_with_descr"
 		android:summary="@string/vehicle_parameters_descr"
 		android:title="@string/vehicle_parameters"
-		app:fragment="net.osmand.plus.settings.VehicleParametersFragment"
+		app:fragment="net.osmand.plus.settings.fragments.VehicleParametersFragment"
 		tools:icon="@drawable/ic_action_car_dark" />
 
 	<PreferenceCategory
@@ -54,7 +54,7 @@
 		android:key="map_during_navigation"
 		android:layout="@layout/preference_with_descr"
 		android:title="@string/map_during_navigation"
-		app:fragment="net.osmand.plus.settings.MapDuringNavigationFragment" />
+		app:fragment="net.osmand.plus.settings.fragments.MapDuringNavigationFragment" />
 
 	<net.osmand.plus.settings.preferences.SwitchPreferenceEx
 		android:key="turn_screen_on_enabled"
diff --git a/OsmAnd/res/xml/settings_main_screen.xml b/OsmAnd/res/xml/settings_main_screen.xml
index 71cbd86fa3..e2a2a5be80 100644
--- a/OsmAnd/res/xml/settings_main_screen.xml
+++ b/OsmAnd/res/xml/settings_main_screen.xml
@@ -10,7 +10,7 @@
 		android:persistent="false"
 		android:summary="@string/osmand_settings_descr"
 		android:title="@string/osmand_settings"
-		app:fragment="net.osmand.plus.settings.GlobalSettingsFragment"
+		app:fragment="net.osmand.plus.settings.fragments.GlobalSettingsFragment"
 		tools:icon="@drawable/ic_action_settings" />
 
 	<Preference
@@ -27,7 +27,7 @@
 		android:layout="@layout/preference_with_descr"
 		android:persistent="false"
 		android:title="@string/configure_profile"
-		app:fragment="net.osmand.plus.settings.ConfigureProfileFragment"
+		app:fragment="net.osmand.plus.settings.fragments.ConfigureProfileFragment"
 		tools:icon="@drawable/ic_action_car_dark" />
 
 	<PreferenceCategory