diff --git a/OsmAnd/res/xml/global_settings.xml b/OsmAnd/res/xml/global_settings.xml
index 4effc59467..7367f562d0 100644
--- a/OsmAnd/res/xml/global_settings.xml
+++ b/OsmAnd/res/xml/global_settings.xml
@@ -57,7 +57,7 @@
 		android:summaryOff="@string/shared_string_off"
 		android:summaryOn="@string/shared_string_on"
 		android:title="@string/proxy_pref_title"
-		app:fragment="net.osmand.plus.settings.ProxySettingsFragment"
+		app:fragment="net.osmand.plus.settings.fragments.ProxySettingsFragment"
 		tools:icon="@drawable/ic_action_proxy" />
 
 	<Preference
diff --git a/OsmAnd/res/xml/monitoring_settings.xml b/OsmAnd/res/xml/monitoring_settings.xml
index d331163df4..98bbfaef25 100644
--- a/OsmAnd/res/xml/monitoring_settings.xml
+++ b/OsmAnd/res/xml/monitoring_settings.xml
@@ -109,7 +109,7 @@
 		android:summaryOff="@string/shared_string_disabled"
 		android:summaryOn="@string/shared_string_enabled"
 		android:title="@string/live_monitoring"
-		app:fragment="net.osmand.plus.settings.LiveMonitoringFragment"
+		app:fragment="net.osmand.plus.settings.fragments.LiveMonitoringFragment"
 		tools:icon="@drawable/ic_world_globe_dark" />
 
 	<Preference
diff --git a/OsmAnd/res/xml/navigation_settings_new.xml b/OsmAnd/res/xml/navigation_settings_new.xml
index 50df1cdf35..341fcd1b8a 100644
--- a/OsmAnd/res/xml/navigation_settings_new.xml
+++ b/OsmAnd/res/xml/navigation_settings_new.xml
@@ -25,7 +25,7 @@
 		android:summaryOff="@string/shared_string_off"
 		android:summaryOn="@string/shared_string_on"
 		android:title="@string/screen_alerts"
-		app:fragment="net.osmand.plus.settings.ScreenAlertsFragment"
+		app:fragment="net.osmand.plus.settings.fragments.ScreenAlertsFragment"
 		tools:icon="@drawable/ic_action_alert" />
 
 	<net.osmand.plus.settings.preferences.SwitchPreferenceEx
@@ -34,7 +34,7 @@
 		android:persistent="false"
 		android:summary="@string/voice_announces_descr"
 		android:title="@string/voice_announces"
-		app:fragment="net.osmand.plus.settings.VoiceAnnouncesFragment"
+		app:fragment="net.osmand.plus.settings.fragments.VoiceAnnouncesFragment"
 		tools:icon="@drawable/ic_action_volume_up" />
 
 	<Preference
@@ -62,7 +62,7 @@
 		android:summaryOff="@string/shared_string_off"
 		android:summaryOn="@string/shared_string_on"
 		android:title="@string/turn_screen_on"
-		app:fragment="net.osmand.plus.settings.TurnScreenOnFragment"
+		app:fragment="net.osmand.plus.settings.fragments.TurnScreenOnFragment"
 		tools:icon="@drawable/ic_action_turn_screen_on" />
 
 	<net.osmand.plus.settings.preferences.SwitchPreferenceEx
diff --git a/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java b/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java
index 084c5ee508..4112f08cd5 100644
--- a/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java
+++ b/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java
@@ -10,7 +10,7 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java b/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java
index 198c3c4b51..05e8156675 100644
--- a/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java
+++ b/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java
@@ -28,8 +28,8 @@ import net.osmand.plus.access.RelativeDirectionStyle;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet;
 import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet.CopyAppModePrefsListener;
-import net.osmand.plus.settings.BaseSettingsFragment;
-import net.osmand.plus.settings.OnPreferenceChanged;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.OnPreferenceChanged;
 import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet;
 import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet.ResetAppModePrefsListener;
 import net.osmand.plus.settings.preferences.ListPreferenceEx;
diff --git a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
index fa43138534..39562c99df 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
@@ -41,7 +41,7 @@ import net.osmand.plus.osmedit.OsmEditingPlugin;
 import net.osmand.plus.parkingpoint.ParkingPositionPlugin;
 import net.osmand.plus.quickaction.QuickActionType;
 import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.plus.skimapsplugin.SkiMapsPlugin;
 import net.osmand.plus.srtmplugin.SRTMPlugin;
 import net.osmand.plus.views.OsmandMapTileView;
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 664e426a41..a3b0b49908 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -313,7 +313,7 @@ public class OsmandSettings {
 		}
 	}
 
-	void migrateEnumPreferences() {
+	public void migrateEnumPreferences() {
 		for (OsmandPreference pref : registeredPreferences.values()) {
 			if (pref instanceof EnumStringPreference) {
 				EnumStringPreference enumPref = (EnumStringPreference) pref;
@@ -339,7 +339,7 @@ public class OsmandSettings {
 		}
 	}
 
-	void migrateHomeWorkParkingToFavorites() {
+	publicvoid migrateHomeWorkParkingToFavorites() {
 		FavouritesDbHelper favorites = ctx.getFavorites();
 
 		LatLon homePoint = null;
@@ -665,7 +665,7 @@ public class OsmandSettings {
 		return true;
 	}
 
-	protected ApplicationMode readApplicationMode() {
+	public ApplicationMode readApplicationMode() {
 		String s = settingsAPI.getString(globalPreferences, APPLICATION_MODE.getId(), ApplicationMode.DEFAULT.getStringKey());
 		return ApplicationMode.valueOfStringKey(s, ApplicationMode.DEFAULT);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index d3ac516d81..05a9f821ef 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -135,14 +135,14 @@ import net.osmand.plus.routing.TransportRoutingHelper.TransportRouteCalculationP
 import net.osmand.plus.search.QuickSearchDialogFragment;
 import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchTab;
 import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchType;
-import net.osmand.plus.settings.BaseSettingsFragment;
-import net.osmand.plus.settings.BaseSettingsFragment.SettingsScreenType;
-import net.osmand.plus.settings.ConfigureMenuItemsFragment;
-import net.osmand.plus.settings.ConfigureProfileFragment;
-import net.osmand.plus.settings.DataStorageFragment;
-import net.osmand.plus.settings.ImportCompleteFragment;
-import net.osmand.plus.settings.ImportSettingsFragment;
-import net.osmand.plus.settings.ProfileAppearanceFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment.SettingsScreenType;
+import net.osmand.plus.settings.fragments.ConfigureMenuItemsFragment;
+import net.osmand.plus.settings.fragments.ConfigureProfileFragment;
+import net.osmand.plus.settings.fragments.DataStorageFragment;
+import net.osmand.plus.settings.fragments.ImportCompleteFragment;
+import net.osmand.plus.settings.fragments.ImportSettingsFragment;
+import net.osmand.plus.settings.fragments.ProfileAppearanceFragment;
 import net.osmand.plus.views.AddGpxPointBottomSheetHelper.NewGpxPoint;
 import net.osmand.plus.views.AnimateDraggingMapThread;
 import net.osmand.plus.views.MapControlsLayer;
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 3884afd132..0fabc3b3ec 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -67,7 +67,7 @@ import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
 import net.osmand.plus.routepreparationmenu.WaypointsFragment;
 import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.plus.views.BaseMapLayer;
 import net.osmand.plus.views.MapControlsLayer;
 import net.osmand.plus.views.MapTileLayer;
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index 707b5dea8f..334a2345c9 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -66,7 +66,7 @@ import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.myplaces.FavoritesActivity;
 import net.osmand.plus.quickaction.QuickActionType;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.plus.views.MapInfoLayer;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.OsmandMapTileView;
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java
index 267fc8d177..196bc1eed2 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java
@@ -33,7 +33,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.FontCache;
 import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet;
 import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet.CopyAppModePrefsListener;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet;
 import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet.ResetAppModePrefsListener;
 import net.osmand.plus.settings.preferences.ListPreferenceEx;
diff --git a/OsmAnd/src/net/osmand/plus/development/DevelopmentSettingsFragment.java b/OsmAnd/src/net/osmand/plus/development/DevelopmentSettingsFragment.java
index cc85939308..7a3503e004 100644
--- a/OsmAnd/src/net/osmand/plus/development/DevelopmentSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/development/DevelopmentSettingsFragment.java
@@ -9,7 +9,7 @@ import net.osmand.plus.OsmAndLocationSimulation;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.render.NativeOsmandLibrary;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.plus.settings.preferences.SwitchPreferenceEx;
 import net.osmand.util.SunriseSunset;
 
diff --git a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
index 9be9a5c69d..0edc688b29 100644
--- a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
@@ -14,7 +14,7 @@ import net.osmand.plus.Version;
 import net.osmand.plus.activities.ContributionVersionActivity;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dashboard.tools.DashFragmentData;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.plus.views.MapInfoLayer;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.OsmandMapTileView;
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java b/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java
index 43abf6d515..ac4deae391 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java
@@ -33,7 +33,7 @@ import net.osmand.plus.download.DownloadValidationManager;
 import net.osmand.plus.download.IndexItem;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.FontCache;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.plus.widgets.style.CustomTypefaceSpan;
 
 import org.apache.commons.logging.Log;
diff --git a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
index 3193463bfb..94bb1a916e 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
@@ -58,7 +58,7 @@ import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerHalfItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.ShortDescriptionItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
 import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
-import net.osmand.plus.settings.ImportSettingsFragment;
+import net.osmand.plus.settings.fragments.ImportSettingsFragment;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.router.RoutingConfiguration;
 import net.osmand.util.Algorithms;
diff --git a/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java b/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java
index 01b1de039c..90957eb2a2 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java
@@ -19,8 +19,8 @@ import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dashboard.DashboardOnMap.DashboardType;
 import net.osmand.plus.mapmarkers.MapMarkersDialogFragment;
-import net.osmand.plus.settings.BaseSettingsFragment;
-import net.osmand.plus.settings.BaseSettingsFragment.SettingsScreenType;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment.SettingsScreenType;
 import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index 0bb79dd8cc..3ee7a0b9ed 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -89,7 +89,7 @@ import java.util.List;
 
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MORE_ID;
 import static net.osmand.plus.mapcontextmenu.MenuBuilder.SHADOW_HEIGHT_TOP_DP;
-import static net.osmand.plus.settings.ConfigureMenuItemsFragment.MAIN_BUTTONS_QUANTITY;
+import static net.osmand.plus.settings.fragments.ConfigureMenuItemsFragment.MAIN_BUTTONS_QUANTITY;
 
 
 public class MapContextMenuFragment extends BaseOsmAndFragment implements DownloadEvents {
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java
index 512d42aab7..a3730cdfaa 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java
@@ -20,7 +20,7 @@ import net.osmand.plus.helpers.FontCache;
 import net.osmand.plus.myplaces.FavoritesActivity;
 import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet;
 import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet.CopyAppModePrefsListener;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet;
 import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet.ResetAppModePrefsListener;
 import net.osmand.plus.settings.bottomsheets.SingleSelectPreferenceBottomSheet;
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index 2a81894017..afd68a0046 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -38,7 +38,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.SavingTrackHelper;
 import net.osmand.plus.activities.SavingTrackHelper.SaveGpxResult;
 import net.osmand.plus.dashboard.tools.DashFragmentData;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.plus.views.MapInfoLayer;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.OsmandMapTileView;
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingFragment.java
index 2c44a0a28a..c809265048 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingFragment.java
@@ -18,8 +18,8 @@ import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.FontCache;
-import net.osmand.plus.settings.BaseSettingsFragment;
-import net.osmand.plus.settings.OnPreferenceChanged;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.OnPreferenceChanged;
 import net.osmand.plus.settings.bottomsheets.OsmLoginDataBottomSheet;
 import net.osmand.plus.settings.preferences.SwitchPreferenceEx;
 import net.osmand.plus.widgets.style.CustomTypefaceSpan;
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
index ff71aace3c..52138cfd53 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
@@ -43,7 +43,7 @@ import net.osmand.plus.myplaces.AvailableGPXFragment.GpxInfo;
 import net.osmand.plus.myplaces.FavoritesActivity;
 import net.osmand.plus.osmedit.OsmPoint.Action;
 import net.osmand.plus.quickaction.QuickActionType;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.util.Algorithms;
 
diff --git a/OsmAnd/src/net/osmand/plus/profiles/AppModesBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/profiles/AppModesBottomSheetDialogFragment.java
index d2fb534a8b..926973bfdc 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/AppModesBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/AppModesBottomSheetDialogFragment.java
@@ -13,7 +13,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.base.MenuBottomSheetDialogFragment;
 import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 
 public abstract class AppModesBottomSheetDialogFragment<T extends AbstractProfileMenuAdapter> extends MenuBottomSheetDialogFragment 
 		implements AbstractProfileMenuAdapter.ButtonPressedListener, AbstractProfileMenuAdapter.ProfilePressedListener {
diff --git a/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java b/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java
index f738528cbe..f8f3599cd7 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java
@@ -16,7 +16,7 @@ import net.osmand.PlatformUtil;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
index c2766ca4ba..1581f89e2b 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
@@ -32,7 +32,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.BaseOsmAndFragment;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.plus.views.controls.ReorderItemTouchHelperCallback;
 
 import java.util.ArrayList;
diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectMultipleProfilesBottomSheet.java b/OsmAnd/src/net/osmand/plus/profiles/SelectMultipleProfilesBottomSheet.java
index 3929703cbf..23068084d8 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/SelectMultipleProfilesBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/SelectMultipleProfilesBottomSheet.java
@@ -19,13 +19,11 @@ import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
-import net.osmand.plus.settings.NavigationFragment;
+import net.osmand.plus.settings.fragments.NavigationFragment;
 import net.osmand.plus.settings.bottomsheets.BasePreferenceBottomSheet;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 public class SelectMultipleProfilesBottomSheet extends BasePreferenceBottomSheet {
 
diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java
index 458cec3aa2..c7d7ec843c 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java
@@ -29,9 +29,9 @@ import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.LongDescriptionItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
-import net.osmand.plus.settings.MainSettingsFragment;
-import net.osmand.plus.settings.NavigationFragment;
-import net.osmand.plus.settings.ProfileAppearanceFragment;
+import net.osmand.plus.settings.fragments.MainSettingsFragment;
+import net.osmand.plus.settings.fragments.NavigationFragment;
+import net.osmand.plus.settings.fragments.ProfileAppearanceFragment;
 import net.osmand.plus.settings.bottomsheets.BasePreferenceBottomSheet;
 import net.osmand.router.RoutingConfiguration;
 
diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java
index 4dc2ba6153..1a5601ee28 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java
@@ -19,7 +19,7 @@ import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java
index 344ea910da..93e20dfc88 100644
--- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java
@@ -46,7 +46,7 @@ import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.ShowAlongTheRou
 import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.TimeConditionalRoutingItem;
 import net.osmand.plus.routing.RouteProvider;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.router.GeneralRouter;
 
 import java.io.File;
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BasePreferenceBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BasePreferenceBottomSheet.java
index 67c16d9d22..e07637a863 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BasePreferenceBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BasePreferenceBottomSheet.java
@@ -11,7 +11,7 @@ import androidx.preference.Preference;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.base.MenuBottomSheetDialogFragment;
-import net.osmand.plus.settings.ApplyQueryType;
+import net.osmand.plus.settings.fragments.ApplyQueryType;
 
 import java.util.List;
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java
index 55458a72d9..2107c4c7ab 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java
@@ -25,9 +25,9 @@ import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithDescription;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
-import net.osmand.plus.settings.ApplyQueryType;
-import net.osmand.plus.settings.OnConfirmPreferenceChange;
-import net.osmand.plus.settings.OnPreferenceChanged;
+import net.osmand.plus.settings.fragments.ApplyQueryType;
+import net.osmand.plus.settings.fragments.OnConfirmPreferenceChange;
+import net.osmand.plus.settings.fragments.OnPreferenceChanged;
 import net.osmand.plus.settings.preferences.SwitchPreferenceEx;
 
 import org.apache.commons.logging.Log;
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java
index b1b31e5d8e..efc1b4500d 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java
@@ -18,14 +18,14 @@ import net.osmand.plus.UiUtilities;
 import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithDescription;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
-import net.osmand.plus.settings.BaseSettingsFragment;
-import net.osmand.plus.settings.DataStorageMenuItem;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.DataStorageMenuItem;
 
 import org.apache.commons.logging.Log;
 
 import java.io.File;
 
-import static net.osmand.plus.settings.DataStorageHelper.MANUALLY_SPECIFIED;
+import static net.osmand.plus.settings.fragments.DataStorageHelper.MANUALLY_SPECIFIED;
 
 public class ChangeDataStorageBottomSheet extends BasePreferenceBottomSheet {
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java
index 4895924bb6..9daa2211a9 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java
@@ -17,7 +17,7 @@ import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.LongDescriptionItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 
 import org.apache.commons.logging.Log;
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/EditTextPreferenceBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/EditTextPreferenceBottomSheet.java
index b9c3724c5f..82adb0ab84 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/EditTextPreferenceBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/EditTextPreferenceBottomSheet.java
@@ -17,7 +17,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
-import net.osmand.plus.settings.OnPreferenceChanged;
+import net.osmand.plus.settings.fragments.OnPreferenceChanged;
 import net.osmand.plus.settings.preferences.EditTextPreferenceEx;
 import net.osmand.util.Algorithms;
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/MultiSelectPreferencesBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/MultiSelectPreferencesBottomSheet.java
index 09973463c5..96c13cd3b5 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/MultiSelectPreferencesBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/MultiSelectPreferencesBottomSheet.java
@@ -16,7 +16,7 @@ import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.LongDescriptionItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
-import net.osmand.plus.settings.OnPreferenceChanged;
+import net.osmand.plus.settings.fragments.OnPreferenceChanged;
 import net.osmand.plus.settings.preferences.MultiSelectBooleanPreference;
 import net.osmand.util.Algorithms;
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java
index 24bea5af6a..ab5e49899b 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java
@@ -19,7 +19,7 @@ import net.osmand.plus.UiUtilities;
 import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
 import net.osmand.plus.osmedit.SettingsOsmEditingActivity;
-import net.osmand.plus.settings.OnPreferenceChanged;
+import net.osmand.plus.settings.fragments.OnPreferenceChanged;
 
 public class OsmLoginDataBottomSheet extends BasePreferenceBottomSheet {
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java
index 377652f4a7..e957624aa2 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java
@@ -27,12 +27,12 @@ import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerSpaceItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.SubtitmeListDividerItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.settings.ApplyQueryType;
-import net.osmand.plus.settings.OnConfirmPreferenceChange;
+import net.osmand.plus.settings.fragments.ApplyQueryType;
+import net.osmand.plus.settings.fragments.OnConfirmPreferenceChange;
 import net.osmand.plus.settings.preferences.SwitchPreferenceEx;
 
-import static net.osmand.plus.settings.RouteParametersFragment.DEFAULT_MODE;
-import static net.osmand.plus.settings.RouteParametersFragment.DISABLE_MODE;
+import static net.osmand.plus.settings.fragments.RouteParametersFragment.DEFAULT_MODE;
+import static net.osmand.plus.settings.fragments.RouteParametersFragment.DISABLE_MODE;
 
 public class RecalculateRouteInDeviationBottomSheet extends BooleanPreferenceBottomSheet {
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java
index 58300c6d95..580cd20834 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java
@@ -19,7 +19,7 @@ import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithDescription;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 
 public class ResetProfilePrefsBottomSheet extends BasePreferenceBottomSheet {
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SelectFolderBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SelectFolderBottomSheet.java
index e370d885e4..6a3cc193b2 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SelectFolderBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SelectFolderBottomSheet.java
@@ -14,7 +14,7 @@ import net.osmand.PlatformUtil;
 import net.osmand.plus.R;
 import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
-import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 
 import org.apache.commons.logging.Log;
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SingleSelectPreferenceBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SingleSelectPreferenceBottomSheet.java
index a1aa1fa964..fc95d584df 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SingleSelectPreferenceBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SingleSelectPreferenceBottomSheet.java
@@ -18,7 +18,7 @@ import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemTitleWithDescrAndButt
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithDescription;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
-import net.osmand.plus.settings.OnPreferenceChanged;
+import net.osmand.plus.settings.fragments.OnPreferenceChanged;
 import net.osmand.plus.settings.preferences.ListPreferenceEx;
 import net.osmand.util.Algorithms;
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/ApplyQueryType.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ApplyQueryType.java
similarity index 58%
rename from OsmAnd/src/net/osmand/plus/settings/ApplyQueryType.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/ApplyQueryType.java
index 8100f0b0ce..64bd6759c9 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ApplyQueryType.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ApplyQueryType.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 public enum ApplyQueryType {
 	NONE, SNACK_BAR, BOTTOM_SHEET
diff --git a/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
index b91b53bb0b..0a67e28669 100644
--- a/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -47,7 +47,6 @@ import androidx.preference.TwoStatePreference;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.snackbar.BaseTransientBottomBar;
 import com.google.android.material.snackbar.Snackbar;
 
 import net.osmand.AndroidUtils;
diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java
similarity index 96%
rename from OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java
index 40fc694680..9ca91b6f02 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.app.Activity;
 import android.content.Context;
@@ -36,11 +36,11 @@ import net.osmand.plus.base.BaseOsmAndFragment;
 import net.osmand.plus.dialogs.ConfigureMapMenu;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet;
-import net.osmand.plus.settings.ConfigureMenuRootFragment.ScreenType;
+import net.osmand.plus.settings.fragments.ConfigureMenuRootFragment.ScreenType;
 import net.osmand.plus.settings.bottomsheets.ChangeGeneralProfilesPrefBottomSheet;
 import net.osmand.plus.views.controls.ReorderItemTouchHelperCallback;
-import net.osmand.plus.settings.RearrangeMenuItemsAdapter.RearrangeMenuAdapterItem;
-import net.osmand.plus.settings.RearrangeMenuItemsAdapter.MenuItemsAdapterListener;
+import net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.RearrangeMenuAdapterItem;
+import net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.MenuItemsAdapterListener;
 
 import org.apache.commons.logging.Log;
 
@@ -52,11 +52,11 @@ import java.util.List;
 
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.APP_PROFILES_ID;
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MORE_ID;
-import static net.osmand.plus.settings.RearrangeMenuItemsAdapter.AdapterItemType.BUTTON;
-import static net.osmand.plus.settings.RearrangeMenuItemsAdapter.AdapterItemType.DESCRIPTION;
-import static net.osmand.plus.settings.RearrangeMenuItemsAdapter.AdapterItemType.DIVIDER;
-import static net.osmand.plus.settings.RearrangeMenuItemsAdapter.AdapterItemType.HEADER;
-import static net.osmand.plus.settings.RearrangeMenuItemsAdapter.AdapterItemType.MENU_ITEM;
+import static net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.AdapterItemType.BUTTON;
+import static net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.AdapterItemType.DESCRIPTION;
+import static net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.AdapterItemType.DIVIDER;
+import static net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.AdapterItemType.HEADER;
+import static net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.AdapterItemType.MENU_ITEM;
 
 public class ConfigureMenuItemsFragment extends BaseOsmAndFragment
 		implements SelectCopyAppModeBottomSheet.CopyAppModePrefsListener {
diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuRootFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuRootFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/ConfigureMenuRootFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuRootFragment.java
index f8c84a2e75..50e71ed671 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuRootFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuRootFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java
index 833819167b..87af22d4c5 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.content.Context;
 import android.content.DialogInterface;
diff --git a/OsmAnd/src/net/osmand/plus/settings/CoordinatesFormatFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/CoordinatesFormatFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/CoordinatesFormatFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/CoordinatesFormatFragment.java
index 98dd6fb34a..d89e6d9f0b 100644
--- a/OsmAnd/src/net/osmand/plus/settings/CoordinatesFormatFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/CoordinatesFormatFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.content.Context;
 import android.net.Uri;
diff --git a/OsmAnd/src/net/osmand/plus/settings/DataStorageFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java
similarity index 98%
rename from OsmAnd/src/net/osmand/plus/settings/DataStorageFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java
index 147928ec6a..6fc4028afc 100644
--- a/OsmAnd/src/net/osmand/plus/settings/DataStorageFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -43,10 +43,10 @@ import java.lang.ref.WeakReference;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 
-import static net.osmand.plus.settings.DataStorageHelper.INTERNAL_STORAGE;
-import static net.osmand.plus.settings.DataStorageHelper.MANUALLY_SPECIFIED;
-import static net.osmand.plus.settings.DataStorageHelper.OTHER_MEMORY;
-import static net.osmand.plus.settings.DataStorageHelper.TILES_MEMORY;
+import static net.osmand.plus.settings.fragments.DataStorageHelper.INTERNAL_STORAGE;
+import static net.osmand.plus.settings.fragments.DataStorageHelper.MANUALLY_SPECIFIED;
+import static net.osmand.plus.settings.fragments.DataStorageHelper.OTHER_MEMORY;
+import static net.osmand.plus.settings.fragments.DataStorageHelper.TILES_MEMORY;
 import static net.osmand.plus.settings.bottomsheets.ChangeDataStorageBottomSheet.CHOSEN_DIRECTORY;
 import static net.osmand.plus.settings.bottomsheets.ChangeDataStorageBottomSheet.MOVE_DATA;
 import static net.osmand.plus.settings.bottomsheets.SelectFolderBottomSheet.NEW_PATH;
diff --git a/OsmAnd/src/net/osmand/plus/settings/DataStorageHelper.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageHelper.java
similarity index 97%
rename from OsmAnd/src/net/osmand/plus/settings/DataStorageHelper.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageHelper.java
index 80e446caa0..bcf9f9e1f2 100644
--- a/OsmAnd/src/net/osmand/plus/settings/DataStorageHelper.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageHelper.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.os.AsyncTask;
 import android.os.Build;
@@ -13,10 +13,10 @@ import java.io.File;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 
-import static net.osmand.plus.settings.DataStorageFragment.UI_REFRESH_TIME_MS;
-import static net.osmand.plus.settings.DataStorageMemoryItem.Directory;
-import static net.osmand.plus.settings.DataStorageMemoryItem.EXTENSIONS;
-import static net.osmand.plus.settings.DataStorageMemoryItem.PREFIX;
+import static net.osmand.plus.settings.fragments.DataStorageFragment.UI_REFRESH_TIME_MS;
+import static net.osmand.plus.settings.fragments.DataStorageMemoryItem.Directory;
+import static net.osmand.plus.settings.fragments.DataStorageMemoryItem.EXTENSIONS;
+import static net.osmand.plus.settings.fragments.DataStorageMemoryItem.PREFIX;
 
 public class DataStorageHelper {
 	public final static String INTERNAL_STORAGE = "internal_storage";
diff --git a/OsmAnd/src/net/osmand/plus/settings/DataStorageMemoryItem.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMemoryItem.java
similarity index 98%
rename from OsmAnd/src/net/osmand/plus/settings/DataStorageMemoryItem.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMemoryItem.java
index 3fcf9b3069..f7f955f89a 100644
--- a/OsmAnd/src/net/osmand/plus/settings/DataStorageMemoryItem.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMemoryItem.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 public class DataStorageMemoryItem {
 	public final static int EXTENSIONS = 0;
diff --git a/OsmAnd/src/net/osmand/plus/settings/DataStorageMenuItem.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMenuItem.java
similarity index 98%
rename from OsmAnd/src/net/osmand/plus/settings/DataStorageMenuItem.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMenuItem.java
index 630529164f..f965b95fb1 100644
--- a/OsmAnd/src/net/osmand/plus/settings/DataStorageMenuItem.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMenuItem.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/OsmAnd/src/net/osmand/plus/settings/DialogsAndNotificationsSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DialogsAndNotificationsSettingsFragment.java
similarity index 97%
rename from OsmAnd/src/net/osmand/plus/settings/DialogsAndNotificationsSettingsFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/DialogsAndNotificationsSettingsFragment.java
index e6309bb14a..5fc75b9685 100644
--- a/OsmAnd/src/net/osmand/plus/settings/DialogsAndNotificationsSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DialogsAndNotificationsSettingsFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java
index d3aed385f0..09ebbf1fba 100644
--- a/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportImportSettingsAdapter.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/ExportImportSettingsAdapter.java
index a9394e6808..c9cabba67d 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportImportSettingsAdapter.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.content.res.ColorStateList;
 import android.view.LayoutInflater;
diff --git a/OsmAnd/src/net/osmand/plus/settings/ExportProfileBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportProfileBottomSheet.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/ExportProfileBottomSheet.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/ExportProfileBottomSheet.java
index 5ec9fdc822..b8ff7fe426 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ExportProfileBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportProfileBottomSheet.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -42,7 +42,7 @@ import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
 import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.plus.quickaction.QuickAction;
 import net.osmand.plus.quickaction.QuickActionRegistry;
-import net.osmand.plus.settings.ExportImportSettingsAdapter.Type;
+import net.osmand.plus.settings.fragments.ExportImportSettingsAdapter.Type;
 import net.osmand.plus.settings.bottomsheets.BasePreferenceBottomSheet;
 
 import org.apache.commons.logging.Log;
diff --git a/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java
index 6360aeccac..57950c5cac 100644
--- a/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.content.Context;
 import android.content.DialogInterface;
diff --git a/OsmAnd/src/net/osmand/plus/settings/GlobalSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/GlobalSettingsFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java
index 102616c8f1..94a2ef6289 100644
--- a/OsmAnd/src/net/osmand/plus/settings/GlobalSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportCompleteFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportCompleteFragment.java
similarity index 95%
rename from OsmAnd/src/net/osmand/plus/settings/ImportCompleteFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/ImportCompleteFragment.java
index e3779b707b..9931e76f26 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ImportCompleteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportCompleteFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.app.Activity;
 import android.graphics.Typeface;
@@ -30,13 +30,13 @@ import net.osmand.plus.dialogs.SelectMapStyleBottomSheetDialogFragment;
 import net.osmand.plus.quickaction.QuickActionListFragment;
 import net.osmand.plus.routepreparationmenu.AvoidRoadsBottomSheetDialogFragment;
 import net.osmand.plus.search.QuickSearchDialogFragment;
-import net.osmand.plus.settings.ExportImportSettingsAdapter.Type;
+import net.osmand.plus.settings.fragments.ExportImportSettingsAdapter.Type;
 
 import java.util.List;
 
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID;
-import static net.osmand.plus.settings.ImportSettingsFragment.IMPORT_SETTINGS_TAG;
-import static net.osmand.plus.settings.ImportSettingsFragment.getSettingsToOperate;
+import static net.osmand.plus.settings.fragments.ImportSettingsFragment.IMPORT_SETTINGS_TAG;
+import static net.osmand.plus.settings.fragments.ImportSettingsFragment.getSettingsToOperate;
 
 public class ImportCompleteFragment extends BaseOsmAndFragment {
 	public static final String TAG = ImportCompleteFragment.class.getSimpleName();
diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java
similarity index 98%
rename from OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java
index 9808881c46..c4c78b4a51 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.graphics.Typeface;
 import android.os.Build;
@@ -44,7 +44,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import static net.osmand.plus.settings.ImportSettingsFragment.IMPORT_SETTINGS_TAG;
+import static net.osmand.plus.settings.fragments.ImportSettingsFragment.IMPORT_SETTINGS_TAG;
 
 
 public class ImportDuplicatesFragment extends BaseOsmAndFragment implements View.OnClickListener {
diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java
index e859ae5927..5a3e78d9fc 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.app.Activity;
 import android.content.Context;
@@ -52,7 +52,7 @@ import net.osmand.plus.base.BaseOsmAndFragment;
 import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
 import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.plus.quickaction.QuickAction;
-import net.osmand.plus.settings.ExportImportSettingsAdapter.Type;
+import net.osmand.plus.settings.fragments.ExportImportSettingsAdapter.Type;
 import net.osmand.plus.widgets.TextViewEx;
 
 import org.apache.commons.logging.Log;
diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportedSettingsItemsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportedSettingsItemsAdapter.java
similarity index 97%
rename from OsmAnd/src/net/osmand/plus/settings/ImportedSettingsItemsAdapter.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/ImportedSettingsItemsAdapter.java
index 3059f6d01d..996716c4af 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ImportedSettingsItemsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportedSettingsItemsAdapter.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.graphics.Typeface;
 import android.view.LayoutInflater;
@@ -14,7 +14,7 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.helpers.FontCache;
-import net.osmand.plus.settings.ExportImportSettingsAdapter.Type;
+import net.osmand.plus.settings.fragments.ExportImportSettingsAdapter.Type;
 
 
 import java.util.ArrayList;
diff --git a/OsmAnd/src/net/osmand/plus/settings/LiveMonitoringFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/LiveMonitoringFragment.java
similarity index 96%
rename from OsmAnd/src/net/osmand/plus/settings/LiveMonitoringFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/LiveMonitoringFragment.java
index 4c6ead83e3..6483f2ad00 100644
--- a/OsmAnd/src/net/osmand/plus/settings/LiveMonitoringFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/LiveMonitoringFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -8,20 +8,15 @@ import android.widget.TextView;
 
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.core.content.ContextCompat;
-import androidx.fragment.app.FragmentManager;
 import androidx.preference.Preference;
 
 import net.osmand.AndroidUtils;
 import net.osmand.plus.ApplicationMode;
-import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
-import net.osmand.plus.settings.bottomsheets.ChangeGeneralProfilesPrefBottomSheet;
 import net.osmand.plus.settings.preferences.EditTextPreferenceEx;
 import net.osmand.plus.settings.preferences.ListPreferenceEx;
 
-import java.io.Serializable;
-
 import static net.osmand.plus.UiUtilities.CompoundButtonType.TOOLBAR;
 import static net.osmand.plus.monitoring.OsmandMonitoringPlugin.MAX_INTERVAL_TO_SEND_MINUTES;
 import static net.osmand.plus.monitoring.OsmandMonitoringPlugin.MINUTES;
diff --git a/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java
index 0bf4a223ba..9aa456b3f2 100644
--- a/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
diff --git a/OsmAnd/src/net/osmand/plus/settings/MapDuringNavigationFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/MapDuringNavigationFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/MapDuringNavigationFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/MapDuringNavigationFragment.java
index 94e1afd4c9..201407aaa0 100644
--- a/OsmAnd/src/net/osmand/plus/settings/MapDuringNavigationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/MapDuringNavigationFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import androidx.preference.Preference;
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/NavigationFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/NavigationFragment.java
index ba5f216c6b..692c228c85 100644
--- a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/NavigationFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
diff --git a/OsmAnd/src/net/osmand/plus/settings/OnConfirmPreferenceChange.java b/OsmAnd/src/net/osmand/plus/settings/fragments/OnConfirmPreferenceChange.java
similarity index 77%
rename from OsmAnd/src/net/osmand/plus/settings/OnConfirmPreferenceChange.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/OnConfirmPreferenceChange.java
index ff377f4a23..5f87d8cb3d 100644
--- a/OsmAnd/src/net/osmand/plus/settings/OnConfirmPreferenceChange.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/OnConfirmPreferenceChange.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 public interface OnConfirmPreferenceChange {
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/OnPreferenceChanged.java b/OsmAnd/src/net/osmand/plus/settings/fragments/OnPreferenceChanged.java
similarity index 66%
rename from OsmAnd/src/net/osmand/plus/settings/OnPreferenceChanged.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/OnPreferenceChanged.java
index a3552b80ab..8edb28af74 100644
--- a/OsmAnd/src/net/osmand/plus/settings/OnPreferenceChanged.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/OnPreferenceChanged.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 public interface OnPreferenceChanged {
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java
index 5473eeecd6..6f9ea0d2d7 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
diff --git a/OsmAnd/src/net/osmand/plus/settings/ProxySettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ProxySettingsFragment.java
similarity index 98%
rename from OsmAnd/src/net/osmand/plus/settings/ProxySettingsFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/ProxySettingsFragment.java
index ef48ee3019..2210042b05 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ProxySettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ProxySettingsFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
diff --git a/OsmAnd/src/net/osmand/plus/settings/RearrangeMenuItemsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/fragments/RearrangeMenuItemsAdapter.java
similarity index 97%
rename from OsmAnd/src/net/osmand/plus/settings/RearrangeMenuItemsAdapter.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/RearrangeMenuItemsAdapter.java
index 52a2e4f3ea..b56aa69ce2 100644
--- a/OsmAnd/src/net/osmand/plus/settings/RearrangeMenuItemsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/RearrangeMenuItemsAdapter.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.annotation.SuppressLint;
 import android.graphics.drawable.Drawable;
@@ -25,14 +25,13 @@ import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.helpers.FontCache;
 import net.osmand.plus.views.controls.ReorderItemTouchHelperCallback;
-import net.osmand.plus.settings.ConfigureMenuRootFragment.ScreenType;
+import net.osmand.plus.settings.fragments.ConfigureMenuRootFragment.ScreenType;
 
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static net.osmand.aidl.ConnectedApp.AIDL_LAYERS_PREFIX;
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.CONTOUR_LINES;
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_BUILDS_ID;
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_DIVIDER_ID;
@@ -55,12 +54,10 @@ import static net.osmand.aidlapi.OsmAndCustomizationConstants.OSM_EDITS;
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.OSM_NOTES;
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.OVERLAY_MAP;
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.RECORDING_LAYER;
-import static net.osmand.aidlapi.OsmAndCustomizationConstants.RENDERING_ITEMS_ID_SCHEME;
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.SHOW_CATEGORY_ID;
-import static net.osmand.aidlapi.OsmAndCustomizationConstants.SHOW_ITEMS_ID_SCHEME;
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.TERRAIN;
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.UNDERLAY_MAP;
-import static net.osmand.plus.settings.ConfigureMenuItemsFragment.MAIN_BUTTONS_QUANTITY;
+import static net.osmand.plus.settings.fragments.ConfigureMenuItemsFragment.MAIN_BUTTONS_QUANTITY;
 
 public class RearrangeMenuItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		implements ReorderItemTouchHelperCallback.OnItemMoveCallback {
diff --git a/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
index 799bb38de9..e515c9be16 100644
--- a/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/OsmAnd/src/net/osmand/plus/settings/ScreenAlertsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ScreenAlertsFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/ScreenAlertsFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/ScreenAlertsFragment.java
index 5a9047f3b7..9e99073fd7 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ScreenAlertsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ScreenAlertsFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
diff --git a/OsmAnd/src/net/osmand/plus/settings/TurnScreenOnFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/TurnScreenOnFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/TurnScreenOnFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/TurnScreenOnFragment.java
index f497904d49..9f5e1ed24b 100644
--- a/OsmAnd/src/net/osmand/plus/settings/TurnScreenOnFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/TurnScreenOnFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.graphics.drawable.ColorDrawable;
 import android.view.LayoutInflater;
diff --git a/OsmAnd/src/net/osmand/plus/settings/VehicleParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/VehicleParametersFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java
index 93e91d73b4..efe0027620 100644
--- a/OsmAnd/src/net/osmand/plus/settings/VehicleParametersFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/OsmAnd/src/net/osmand/plus/settings/VoiceAnnouncesFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java
similarity index 99%
rename from OsmAnd/src/net/osmand/plus/settings/VoiceAnnouncesFragment.java
rename to OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java
index fb02fc5160..7df29977b0 100644
--- a/OsmAnd/src/net/osmand/plus/settings/VoiceAnnouncesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.settings;
+package net.osmand.plus.settings.fragments;
 
 import android.app.Activity;
 import android.content.Context;