diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 7939d9c5..08f7dd97 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -12,7 +12,7 @@ import android.os.IBinder;
 import com.termux.R;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.data.IntentUtils;
-import com.termux.shared.file.TermuxFileUtils;
+import com.termux.shared.termux.file.TermuxFileUtils;
 import com.termux.shared.file.filesystem.FileType;
 import com.termux.shared.models.errors.Errno;
 import com.termux.shared.models.errors.Error;
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 7a554892..524cc931 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -40,14 +40,14 @@ import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.app.activities.HelpActivity;
 import com.termux.app.activities.SettingsActivity;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.app.terminal.TermuxSessionsListViewController;
 import com.termux.app.terminal.io.TerminalToolbarViewPager;
 import com.termux.app.terminal.TermuxTerminalSessionClient;
 import com.termux.app.terminal.TermuxTerminalViewClient;
-import com.termux.shared.terminal.io.extrakeys.ExtraKeysView;
+import com.termux.shared.termux.extrakeys.ExtraKeysView;
 import com.termux.app.settings.properties.TermuxAppSharedProperties;
-import com.termux.shared.interact.TextInputDialogUtils;
+import com.termux.shared.termux.interact.TextInputDialogUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.view.ViewUtils;
diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index b7f28980..83a84861 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -2,8 +2,8 @@ package com.termux.app;
 
 import android.app.Application;
 
-import com.termux.shared.crash.TermuxCrashUtils;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.crash.TermuxCrashUtils;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.logger.Logger;
 
 
diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 1c0688d9..6b3b8f0a 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -12,7 +12,7 @@ import android.view.WindowManager;
 import com.termux.R;
 import com.termux.app.utils.CrashUtils;
 import com.termux.shared.file.FileUtils;
-import com.termux.shared.file.TermuxFileUtils;
+import com.termux.shared.termux.file.TermuxFileUtils;
 import com.termux.shared.interact.MessageDialogUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index f7034e28..0b3baaa6 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -28,14 +28,14 @@ import com.termux.app.utils.PluginUtils;
 import com.termux.shared.data.IntentUtils;
 import com.termux.shared.models.errors.Errno;
 import com.termux.shared.shell.ShellUtils;
-import com.termux.shared.shell.TermuxShellEnvironmentClient;
-import com.termux.shared.shell.TermuxShellUtils;
+import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
+import com.termux.shared.termux.shell.TermuxShellUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.shared.shell.TermuxSession;
-import com.termux.shared.terminal.TermuxTerminalSessionClientBase;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.shell.TermuxSession;
+import com.termux.shared.termux.terminal.TermuxTerminalSessionClientBase;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.shared.packages.PermissionUtils;
diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 70b0b44a..05b402c7 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -17,11 +17,11 @@ import com.termux.shared.models.ReportInfo;
 import com.termux.app.models.UserAction;
 import com.termux.shared.interact.ShareUtils;
 import com.termux.shared.packages.PackageUtils;
-import com.termux.shared.settings.preferences.TermuxAPIAppSharedPreferences;
-import com.termux.shared.settings.preferences.TermuxFloatAppSharedPreferences;
-import com.termux.shared.settings.preferences.TermuxTaskerAppSharedPreferences;
-import com.termux.shared.settings.preferences.TermuxWidgetAppSharedPreferences;
-import com.termux.shared.termux.AndroidUtils;
+import com.termux.shared.termux.settings.preferences.TermuxAPIAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxFloatAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxTaskerAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxWidgetAppSharedPreferences;
+import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
 
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxAPIPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxAPIPreferencesFragment.java
index de8508e9..8f4a1714 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TermuxAPIPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxAPIPreferencesFragment.java
@@ -9,7 +9,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAPIAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxAPIAppSharedPreferences;
 
 @Keep
 public class TermuxAPIPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxFloatPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxFloatPreferencesFragment.java
index ee0bacb4..a6f25c83 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TermuxFloatPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxFloatPreferencesFragment.java
@@ -9,7 +9,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxFloatAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxFloatAppSharedPreferences;
 
 @Keep
 public class TermuxFloatPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java
index 273fa0f5..448b9c7b 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java
@@ -9,7 +9,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 
 @Keep
 public class TermuxPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxTaskerPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxTaskerPreferencesFragment.java
index b86685b6..1e028807 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TermuxTaskerPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxTaskerPreferencesFragment.java
@@ -9,7 +9,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxTaskerAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxTaskerAppSharedPreferences;
 
 @Keep
 public class TermuxTaskerPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxWidgetPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxWidgetPreferencesFragment.java
index b87e93e5..ded9c701 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TermuxWidgetPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxWidgetPreferencesFragment.java
@@ -9,7 +9,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxWidgetAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxWidgetAppSharedPreferences;
 
 @Keep
 public class TermuxWidgetPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
index 72ced348..059dccbe 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
@@ -13,7 +13,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.logger.Logger;
 
 @Keep
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java
index 46e75049..f8504f43 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java
@@ -9,7 +9,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 
 @Keep
 public class TerminalIOPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalViewPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalViewPreferencesFragment.java
index ed10d18a..ff033fd3 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalViewPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalViewPreferencesFragment.java
@@ -9,7 +9,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 
 @Keep
 public class TerminalViewPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java
index 6d09eae1..908c6ebd 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java
@@ -13,7 +13,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAPIAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxAPIAppSharedPreferences;
 
 @Keep
 public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux_float/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux_float/DebuggingPreferencesFragment.java
index a52f7857..1d815aa0 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux_float/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux_float/DebuggingPreferencesFragment.java
@@ -13,7 +13,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxFloatAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxFloatAppSharedPreferences;
 
 @Keep
 public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux_tasker/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux_tasker/DebuggingPreferencesFragment.java
index a6670814..7e291839 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux_tasker/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux_tasker/DebuggingPreferencesFragment.java
@@ -13,7 +13,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxTaskerAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxTaskerAppSharedPreferences;
 
 @Keep
 public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux_widget/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux_widget/DebuggingPreferencesFragment.java
index 919f159e..50823d54 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux_widget/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux_widget/DebuggingPreferencesFragment.java
@@ -13,7 +13,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxWidgetAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxWidgetAppSharedPreferences;
 
 @Keep
 public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
index 7dbf2e1c..d48d6405 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
@@ -5,12 +5,12 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 
 import com.termux.app.terminal.io.KeyboardShortcut;
-import com.termux.shared.terminal.io.extrakeys.ExtraKeysConstants;
-import com.termux.shared.terminal.io.extrakeys.ExtraKeysConstants.EXTRA_KEY_DISPLAY_MAPS;
-import com.termux.shared.terminal.io.extrakeys.ExtraKeysInfo;
+import com.termux.shared.termux.extrakeys.ExtraKeysConstants;
+import com.termux.shared.termux.extrakeys.ExtraKeysConstants.EXTRA_KEY_DISPLAY_MAPS;
+import com.termux.shared.termux.extrakeys.ExtraKeysInfo;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.settings.properties.TermuxPropertyConstants;
-import com.termux.shared.settings.properties.TermuxSharedProperties;
+import com.termux.shared.termux.settings.properties.TermuxPropertyConstants;
+import com.termux.shared.termux.settings.properties.TermuxSharedProperties;
 import com.termux.shared.termux.TermuxConstants;
 
 import org.json.JSONException;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
index 76c79309..61e07ec1 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
@@ -20,7 +20,7 @@ import androidx.core.content.ContextCompat;
 
 import com.termux.R;
 import com.termux.app.TermuxActivity;
-import com.termux.shared.shell.TermuxSession;
+import com.termux.shared.termux.shell.TermuxSession;
 import com.termux.terminal.TerminalSession;
 
 import java.util.List;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 78d25fe3..5c83c66f 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -13,14 +13,14 @@ import android.text.TextUtils;
 import android.widget.ListView;
 
 import com.termux.R;
-import com.termux.shared.shell.TermuxSession;
-import com.termux.shared.interact.TextInputDialogUtils;
+import com.termux.shared.termux.shell.TermuxSession;
+import com.termux.shared.termux.interact.TextInputDialogUtils;
 import com.termux.app.TermuxActivity;
-import com.termux.shared.terminal.TermuxTerminalSessionClientBase;
+import com.termux.shared.termux.terminal.TermuxTerminalSessionClientBase;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.app.TermuxService;
-import com.termux.shared.settings.properties.TermuxPropertyConstants;
-import com.termux.shared.terminal.io.BellHandler;
+import com.termux.shared.termux.settings.properties.TermuxPropertyConstants;
+import com.termux.shared.termux.terminal.io.BellHandler;
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalColors;
 import com.termux.terminal.TerminalSession;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index f520a1d4..248ae17e 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -24,15 +24,15 @@ import com.termux.shared.file.FileUtils;
 import com.termux.shared.interact.MessageDialogUtils;
 import com.termux.shared.interact.ShareUtils;
 import com.termux.shared.shell.ShellUtils;
-import com.termux.shared.terminal.TermuxTerminalViewClientBase;
-import com.termux.shared.terminal.io.extrakeys.SpecialButton;
-import com.termux.shared.termux.AndroidUtils;
+import com.termux.shared.termux.terminal.TermuxTerminalViewClientBase;
+import com.termux.shared.termux.extrakeys.SpecialButton;
+import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.activities.ReportActivity;
 import com.termux.shared.models.ReportInfo;
 import com.termux.app.models.UserAction;
 import com.termux.app.terminal.io.KeyboardShortcut;
-import com.termux.shared.settings.properties.TermuxPropertyConstants;
+import com.termux.shared.termux.settings.properties.TermuxPropertyConstants;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
diff --git a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
index de49b3cd..7a3f945e 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
@@ -11,7 +11,7 @@ import androidx.viewpager.widget.ViewPager;
 
 import com.termux.R;
 import com.termux.app.TermuxActivity;
-import com.termux.shared.terminal.io.extrakeys.ExtraKeysView;
+import com.termux.shared.termux.extrakeys.ExtraKeysView;
 import com.termux.terminal.TerminalSession;
 
 public class TerminalToolbarViewPager {
diff --git a/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java b/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
index 8eed5179..030f852f 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
@@ -9,7 +9,7 @@ import androidx.drawerlayout.widget.DrawerLayout;
 
 import com.termux.app.terminal.TermuxTerminalSessionClient;
 import com.termux.app.terminal.TermuxTerminalViewClient;
-import com.termux.shared.terminal.io.TerminalExtraKeys;
+import com.termux.shared.termux.terminal.io.TerminalExtraKeys;
 import com.termux.view.TerminalView;
 
 public class TermuxTerminalExtraKeys extends TerminalExtraKeys {
diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index 2a079b34..eec5fd04 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -16,12 +16,12 @@ import com.termux.shared.notification.NotificationUtils;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.models.ReportInfo;
 import com.termux.app.models.UserAction;
-import com.termux.shared.notification.TermuxNotificationUtils;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants;
+import com.termux.shared.termux.notification.TermuxNotificationUtils;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.termux.AndroidUtils;
+import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxUtils;
 
 import com.termux.shared.termux.TermuxConstants;
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 4dfc5c6c..94591e63 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -4,7 +4,6 @@ import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.os.Environment;
 
 import androidx.annotation.Nullable;
 
@@ -17,19 +16,19 @@ import com.termux.shared.models.ResultData;
 import com.termux.shared.models.errors.Errno;
 import com.termux.shared.models.errors.Error;
 import com.termux.shared.notification.NotificationUtils;
-import com.termux.shared.notification.TermuxNotificationUtils;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants;
+import com.termux.shared.termux.notification.TermuxNotificationUtils;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants;
 import com.termux.shared.shell.ResultSender;
 import com.termux.shared.shell.ShellUtils;
-import com.termux.shared.termux.AndroidUtils;
+import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
 import com.termux.shared.settings.properties.SharedProperties;
-import com.termux.shared.settings.properties.TermuxPropertyConstants;
 import com.termux.shared.models.ReportInfo;
+import com.termux.shared.termux.settings.properties.TermuxPropertyConstants;
 import com.termux.shared.models.ExecutionCommand;
 import com.termux.app.models.UserAction;
 import com.termux.shared.data.DataUtils;
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index 2dae7436..17244e41 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -11,7 +11,7 @@ import com.termux.R;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.data.IntentUtils;
 import com.termux.shared.interact.MessageDialogUtils;
-import com.termux.shared.interact.TextInputDialogUtils;
+import com.termux.shared.termux.interact.TextInputDialogUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.TermuxService;
diff --git a/app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml b/app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml
index 21a25c81..7dbd46fd 100644
--- a/app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml
+++ b/app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.termux.shared.terminal.io.extrakeys.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.termux.shared.termux.extrakeys.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/terminal_toolbar_extra_keys"
     style="?android:attr/buttonBarStyle"
     android:layout_width="match_parent"
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
rename to termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
index 4a5dd59d..b40d0cde 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
@@ -1,4 +1,4 @@
-package com.termux.shared.termux;
+package com.termux.shared.android;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
index 7b920f75..4691d548 100644
--- a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
+++ b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
@@ -8,7 +8,7 @@ import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.models.errors.Error;
-import com.termux.shared.termux.AndroidUtils;
+import com.termux.shared.android.AndroidUtils;
 
 import java.nio.charset.Charset;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java b/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
index 20b384e3..be7db2ec 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
@@ -16,7 +16,7 @@ import com.termux.shared.models.ResultConfig;
 import com.termux.shared.models.ResultData;
 import com.termux.shared.models.errors.FunctionErrno;
 import com.termux.shared.models.errors.ResultSenderErrno;
-import com.termux.shared.termux.AndroidUtils;
+import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants.RESULT_SENDER;
 
 public class ResultSender {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 3ea4d1d9..b2e40b94 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -11,15 +11,16 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.termux.shared.R;
+import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.file.FileUtils;
-import com.termux.shared.file.TermuxFileUtils;
+import com.termux.shared.termux.file.TermuxFileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.models.ExecutionCommand;
 import com.termux.shared.models.errors.Error;
 import com.termux.shared.packages.PackageUtils;
-import com.termux.shared.shell.TermuxShellEnvironmentClient;
+import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
 import com.termux.shared.shell.TermuxTask;
 
 import org.apache.commons.io.IOUtils;
diff --git a/termux-shared/src/main/java/com/termux/shared/crash/TermuxCrashUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
similarity index 91%
rename from termux-shared/src/main/java/com/termux/shared/crash/TermuxCrashUtils.java
rename to termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
index d8b877fe..e7bc7100 100644
--- a/termux-shared/src/main/java/com/termux/shared/crash/TermuxCrashUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
@@ -1,9 +1,10 @@
-package com.termux.shared.crash;
+package com.termux.shared.termux.crash;
 
 import android.content.Context;
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.crash.CrashHandler;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeyButton.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeyButton.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeyButton.java
rename to termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeyButton.java
index e2287985..bcec59da 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeyButton.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeyButton.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal.io.extrakeys;
+package com.termux.shared.termux.extrakeys;
 
 import android.text.TextUtils;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysConstants.java
rename to termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java
index f05ea481..f67a127a 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal.io.extrakeys;
+package com.termux.shared.termux.extrakeys;
 
 import android.view.KeyEvent;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysInfo.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysInfo.java
similarity index 97%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysInfo.java
rename to termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysInfo.java
index 7bf47d7d..9140c13e 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysInfo.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysInfo.java
@@ -1,11 +1,12 @@
-package com.termux.shared.terminal.io.extrakeys;
+package com.termux.shared.termux.extrakeys;
 
 import android.view.View;
 import android.widget.Button;
 
 import androidx.annotation.NonNull;
 
-import com.termux.shared.terminal.io.extrakeys.ExtraKeysConstants.EXTRA_KEY_DISPLAY_MAPS;
+import com.termux.shared.termux.extrakeys.ExtraKeysConstants.EXTRA_KEY_DISPLAY_MAPS;
+import com.termux.shared.termux.terminal.io.TerminalExtraKeys;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -68,7 +69,7 @@ import org.json.JSONObject;
  * Its up to the {@link ExtraKeysView.IExtraKeysView} client on how to handle individual key values
  * of an {@link ExtraKeyButton}. They are sent as is via
  * {@link ExtraKeysView.IExtraKeysView#onExtraKeyButtonClick(View, ExtraKeyButton, Button)}. The
- * {@link com.termux.shared.terminal.io.TerminalExtraKeys} which is an implementation of the interface,
+ * {@link TerminalExtraKeys} which is an implementation of the interface,
  * checks if the key is one of {@link ExtraKeysConstants#PRIMARY_KEY_CODES_FOR_STRINGS} and generates
  * a {@link android.view.KeyEvent} for it, and if its not, then converts the key to code points by
  * calling {@link CharSequence#codePoints()} and passes them to the terminal as literal strings.
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysView.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
similarity index 98%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysView.java
rename to termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
index e149e36d..c20edeb6 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysView.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal.io.extrakeys;
+package com.termux.shared.termux.extrakeys;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -32,6 +32,8 @@ import android.widget.PopupWindow;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.termux.shared.termux.terminal.io.TerminalExtraKeys;
+
 /**
  * A {@link View} showing extra keys (such as Escape, Ctrl, Alt) not normally available on an Android soft
  * keyboards.
@@ -40,7 +42,7 @@ import androidx.annotation.Nullable;
  * it with a {@link androidx.viewpager.widget.ViewPager}.:
  * {@code
  * <?xml version="1.0" encoding="utf-8"?>
- * <com.termux.shared.terminal.io.extrakeys.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
+ * <com.termux.shared.termux.extrakeys.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
  *     android:id="@+id/extra_keys"
  *     style="?android:attr/buttonBarStyle"
  *     android:layout_width="match_parent"
@@ -66,7 +68,7 @@ import androidx.annotation.Nullable;
  * The {@link ExtraKeysInfo} is created by TermuxAppSharedProperties.setExtraKeys().
  * Then its got and the view height is adjusted in TermuxActivity.setTerminalToolbarHeight().
  * The client used is TermuxTerminalExtraKeys, which extends
- * {@link com.termux.shared.terminal.io.TerminalExtraKeys} to handle Termux app specific logic and
+ * {@link TerminalExtraKeys } to handle Termux app specific logic and
  * leave the rest to the super class.
  */
 public final class ExtraKeysView extends GridLayout {
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButton.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButton.java
similarity index 96%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButton.java
rename to termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButton.java
index 34dc258b..382377b4 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButton.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButton.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal.io.extrakeys;
+package com.termux.shared.termux.extrakeys;
 
 import androidx.annotation.NonNull;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButtonState.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java
similarity index 96%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButtonState.java
rename to termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java
index 0af0359a..381e4c51 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButtonState.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal.io.extrakeys;
+package com.termux.shared.termux.extrakeys;
 
 import android.widget.Button;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
rename to termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
index 5bb1252e..704c93e3 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
@@ -1,18 +1,19 @@
-package com.termux.shared.file;
+package com.termux.shared.termux.file;
 
 import android.content.Context;
 import android.os.Environment;
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.models.ExecutionCommand;
 import com.termux.shared.models.errors.Error;
 import com.termux.shared.models.errors.FileUtilsErrno;
-import com.termux.shared.shell.TermuxShellEnvironmentClient;
+import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
 import com.termux.shared.shell.TermuxTask;
-import com.termux.shared.termux.AndroidUtils;
+import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/TextInputDialogUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/interact/TextInputDialogUtils.java
similarity index 94%
rename from termux-shared/src/main/java/com/termux/shared/interact/TextInputDialogUtils.java
rename to termux-shared/src/main/java/com/termux/shared/termux/interact/TextInputDialogUtils.java
index 7d111d06..d644af72 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/TextInputDialogUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/interact/TextInputDialogUtils.java
@@ -1,20 +1,14 @@
-package com.termux.shared.interact;
+package com.termux.shared.termux.interact;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.text.Selection;
 import android.util.TypedValue;
 import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.termux.shared.R;
 
 public final class TextInputDialogUtils {
 
diff --git a/termux-shared/src/main/java/com/termux/shared/notification/TermuxNotificationUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/notification/TermuxNotificationUtils.java
similarity index 88%
rename from termux-shared/src/main/java/com/termux/shared/notification/TermuxNotificationUtils.java
rename to termux-shared/src/main/java/com/termux/shared/termux/notification/TermuxNotificationUtils.java
index 585cd605..eb0b5062 100644
--- a/termux-shared/src/main/java/com/termux/shared/notification/TermuxNotificationUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/notification/TermuxNotificationUtils.java
@@ -1,9 +1,9 @@
-package com.termux.shared.notification;
+package com.termux.shared.termux.notification;
 
 import android.content.Context;
 
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants;
 import com.termux.shared.termux.TermuxConstants;
 
 public class TermuxNotificationUtils {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
similarity index 94%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
index 7ed02e09..1bc0171d 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,7 +9,8 @@ import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_API_APP;
+import com.termux.shared.settings.preferences.SharedPreferenceUtils;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_API_APP;
 import com.termux.shared.termux.TermuxConstants;
 
 public class TermuxAPIAppSharedPreferences {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
similarity index 97%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
index 934ed021..b2f986ec 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,10 +9,11 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.data.DataUtils;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
 
 public class TermuxAppSharedPreferences {
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
similarity index 94%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
index b8a5aa1a..85bd822d 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,7 +9,8 @@ import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_BOOT_APP;
+import com.termux.shared.settings.preferences.SharedPreferenceUtils;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_BOOT_APP;
 import com.termux.shared.termux.TermuxConstants;
 
 public class TermuxBootAppSharedPreferences {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
similarity index 96%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
index 42f21f2c..0e0a8620 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 import android.app.Activity;
 import android.content.Context;
@@ -10,7 +10,8 @@ import androidx.annotation.Nullable;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_FLOAT_APP;
+import com.termux.shared.settings.preferences.SharedPreferenceUtils;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_FLOAT_APP;
 import com.termux.shared.termux.TermuxConstants;
 
 public class TermuxFloatAppSharedPreferences {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java
index 5d3d06e1..b03f19d0 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 /*
  * Version: v0.15.0
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
similarity index 94%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
index 85432c7d..10bbb677 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,7 +9,8 @@ import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_STYLING_APP;
+import com.termux.shared.settings.preferences.SharedPreferenceUtils;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_STYLING_APP;
 import com.termux.shared.termux.TermuxConstants;
 
 public class TermuxStylingAppSharedPreferences {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
similarity index 95%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
index 87205f43..0945a33b 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 import android.app.Activity;
 import android.content.Context;
@@ -8,8 +8,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.TermuxConstants;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_TASKER_APP;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_TASKER_APP;
 import com.termux.shared.logger.Logger;
 
 public class TermuxTaskerAppSharedPreferences {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
similarity index 95%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
index df667e3d..a6e181cd 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,7 +9,8 @@ import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_WIDGET_APP;
+import com.termux.shared.settings.preferences.SharedPreferenceUtils;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_WIDGET_APP;
 import com.termux.shared.termux.TermuxConstants;
 
 import java.util.UUID;
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
index 638ff18f..81871048 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
@@ -1,8 +1,9 @@
-package com.termux.shared.settings.properties;
+package com.termux.shared.termux.settings.properties;
 
 import com.google.common.collect.ImmutableBiMap;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.file.filesystem.FileType;
+import com.termux.shared.settings.properties.SharedProperties;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalEmulator;
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
index d883884e..2d760ff5 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
@@ -1,12 +1,13 @@
-package com.termux.shared.settings.properties;
+package com.termux.shared.termux.settings.properties;
 
 import android.content.Context;
-import android.content.res.Configuration;
 
 import androidx.annotation.NonNull;
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.data.DataUtils;
+import com.termux.shared.settings.properties.SharedProperties;
+import com.termux.shared.settings.properties.SharedPropertiesParser;
 
 import java.io.File;
 import java.util.HashMap;
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxSession.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
rename to termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxSession.java
index b69e36da..ce13ea87 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxSession.java
@@ -1,4 +1,4 @@
-package com.termux.shared.shell;
+package com.termux.shared.termux.shell;
 
 import android.content.Context;
 import android.system.OsConstants;
@@ -10,6 +10,8 @@ import com.termux.shared.models.ExecutionCommand;
 import com.termux.shared.models.ResultData;
 import com.termux.shared.models.errors.Errno;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.shell.ShellEnvironmentClient;
+import com.termux.shared.shell.ShellUtils;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellEnvironmentClient.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellEnvironmentClient.java
similarity index 90%
rename from termux-shared/src/main/java/com/termux/shared/shell/TermuxShellEnvironmentClient.java
rename to termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellEnvironmentClient.java
index a2cb80c6..3d94a65c 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellEnvironmentClient.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellEnvironmentClient.java
@@ -1,9 +1,11 @@
-package com.termux.shared.shell;
+package com.termux.shared.termux.shell;
 
 import android.content.Context;
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.shell.ShellEnvironmentClient;
+
 public class TermuxShellEnvironmentClient implements ShellEnvironmentClient {
 
     @NonNull
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
rename to termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
index 18dcc549..aad62427 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
@@ -1,4 +1,4 @@
-package com.termux.shared.shell;
+package com.termux.shared.termux.shell;
 
 import android.content.Context;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java b/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java
similarity index 97%
rename from termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
rename to termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java
index df6eb5fe..6764d5a9 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal;
+package com.termux.shared.termux.terminal;
 
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalSession;
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java b/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalViewClientBase.java
similarity index 98%
rename from termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
rename to termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalViewClientBase.java
index 167ec6bc..a4d30726 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalViewClientBase.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal;
+package com.termux.shared.termux.terminal;
 
 import android.view.KeyEvent;
 import android.view.MotionEvent;
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/BellHandler.java b/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/BellHandler.java
similarity index 98%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/BellHandler.java
rename to termux-shared/src/main/java/com/termux/shared/termux/terminal/io/BellHandler.java
index fbaeaba5..1ec7b181 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/BellHandler.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/BellHandler.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal.io;
+package com.termux.shared.termux.terminal.io;
 
 import android.content.Context;
 import android.os.Build;
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/TerminalExtraKeys.java b/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
similarity index 89%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/TerminalExtraKeys.java
rename to termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
index faac4977..f8d8ceba 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/TerminalExtraKeys.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal.io;
+package com.termux.shared.termux.terminal.io;
 
 import android.view.KeyEvent;
 import android.view.View;
@@ -6,12 +6,12 @@ import android.widget.Button;
 
 import androidx.annotation.NonNull;
 
-import com.termux.shared.terminal.io.extrakeys.ExtraKeyButton;
-import com.termux.shared.terminal.io.extrakeys.ExtraKeysView;
-import com.termux.shared.terminal.io.extrakeys.SpecialButton;
+import com.termux.shared.termux.extrakeys.ExtraKeyButton;
+import com.termux.shared.termux.extrakeys.ExtraKeysView;
+import com.termux.shared.termux.extrakeys.SpecialButton;
 import com.termux.view.TerminalView;
 
-import static com.termux.shared.terminal.io.extrakeys.ExtraKeysConstants.PRIMARY_KEY_CODES_FOR_STRINGS;
+import static com.termux.shared.termux.extrakeys.ExtraKeysConstants.PRIMARY_KEY_CODES_FOR_STRINGS;
 
 
 public class TerminalExtraKeys implements ExtraKeysView.IExtraKeysView {