diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 11cf3fb70fe..ed19890456f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -686,7 +686,7 @@
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                        android:value="true" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.network.telephony.SatelliteSetting" />
+                       android:value="com.android.settings.network.telephony.satellite.SatelliteSetting" />
             <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
                        android:value="@string/menu_key_network"/>
         </activity>
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index ce71f540989..a0da44051c6 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -205,7 +205,7 @@
         <PreferenceCategory
             android:key="telephony_satellite_settings_category_key"
             android:title="@string/category_title_satellite_connectivity"
-            settings:controller="com.android.settings.network.telephony.SatelliteSettingsPreferenceCategoryController">
+            settings:controller="com.android.settings.network.telephony.satellite.SatelliteSettingsPreferenceCategoryController">
 
             <com.android.settingslib.RestrictedPreference
                 android:key="telephony_satellite_setting_key"
@@ -213,7 +213,7 @@
                 android:title="@string/satellite_setting_title"
                 settings:keywords="@string/keywords_satellite_setting"
                 settings:controller=
-                    "com.android.settings.network.telephony.SatelliteSettingPreferenceController"/>
+                    "com.android.settings.network.telephony.satellite.SatelliteSettingPreferenceController"/>
 
         </PreferenceCategory>
 
diff --git a/res/xml/satellite_setting.xml b/res/xml/satellite_setting.xml
index 21743f3f9d5..e299951092d 100644
--- a/res/xml/satellite_setting.xml
+++ b/res/xml/satellite_setting.xml
@@ -66,7 +66,7 @@
         android:key="key_category_satellite_apps"
         android:title="@string/category_title_satellite_supported_apps"
         settings:isPreferenceVisible="false"
-        settings:controller="com.android.settings.network.telephony.SatelliteAppListCategoryController"
+        settings:controller="com.android.settings.network.telephony.satellite.SatelliteAppListCategoryController"
         settings:searchable="false">
 
         <!-- See all satellite apps -->
@@ -74,7 +74,7 @@
             android:key="key_see_all_satellite_apps"
             android:title="@string/title_satellite_supported_app_list_entry"
             android:icon="@drawable/ic_chevron_right_24dp"
-            android:fragment="com.android.settings.network.telephony.SatelliteAppListFragment"
+            android:fragment="com.android.settings.network.telephony.satellite.SatelliteAppListFragment"
             android:order="5"
             settings:searchable="false"/>
     </PreferenceCategory>
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index a26bd142149..23ecc19fe7d 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -153,7 +153,7 @@ import com.android.settings.network.apn.ApnSettings;
 import com.android.settings.network.telephony.CellularSecuritySettingsFragment;
 import com.android.settings.network.telephony.MobileNetworkSettings;
 import com.android.settings.network.telephony.NetworkSelectSettings;
-import com.android.settings.network.telephony.SatelliteSetting;
+import com.android.settings.network.telephony.satellite.SatelliteSetting;
 import com.android.settings.network.tether.TetherSettings;
 import com.android.settings.nfc.PaymentSettings;
 import com.android.settings.notification.ConfigureNotificationSettings;
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index e1272a8b82a..ba4b22b1e0c 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -58,6 +58,8 @@ import com.android.settings.network.telephony.cdma.CdmaSubscriptionPreferenceCon
 import com.android.settings.network.telephony.cdma.CdmaSystemSelectPreferenceController;
 import com.android.settings.network.telephony.gsm.AutoSelectPreferenceController;
 import com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController;
+import com.android.settings.network.telephony.satellite.SatelliteSettingPreferenceController;
+import com.android.settings.network.telephony.satellite.SatelliteSettingsPreferenceCategoryController;
 import com.android.settings.network.telephony.wificalling.CrossSimCallingViewModel;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.wifi.WifiPickerTrackerHelper;
diff --git a/src/com/android/settings/network/telephony/SatelliteAppListCategoryController.java b/src/com/android/settings/network/telephony/satellite/SatelliteAppListCategoryController.java
similarity index 98%
rename from src/com/android/settings/network/telephony/SatelliteAppListCategoryController.java
rename to src/com/android/settings/network/telephony/satellite/SatelliteAppListCategoryController.java
index 4afa7f245ff..a29a388579a 100644
--- a/src/com/android/settings/network/telephony/SatelliteAppListCategoryController.java
+++ b/src/com/android/settings/network/telephony/satellite/SatelliteAppListCategoryController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.network.telephony;
+package com.android.settings.network.telephony.satellite;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
diff --git a/src/com/android/settings/network/telephony/SatelliteAppListFragment.java b/src/com/android/settings/network/telephony/satellite/SatelliteAppListFragment.java
similarity index 96%
rename from src/com/android/settings/network/telephony/SatelliteAppListFragment.java
rename to src/com/android/settings/network/telephony/satellite/SatelliteAppListFragment.java
index 97f70bb2652..c4428e929ad 100644
--- a/src/com/android/settings/network/telephony/SatelliteAppListFragment.java
+++ b/src/com/android/settings/network/telephony/satellite/SatelliteAppListFragment.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.settings.network.telephony;
+package com.android.settings.network.telephony.satellite;
 
-import static com.android.settings.network.telephony.SatelliteAppListCategoryController.getApplicationInfo;
+import static com.android.settings.network.telephony.satellite.SatelliteAppListCategoryController.getApplicationInfo;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/network/telephony/SatelliteSetting.java b/src/com/android/settings/network/telephony/satellite/SatelliteSetting.java
similarity index 99%
rename from src/com/android/settings/network/telephony/SatelliteSetting.java
rename to src/com/android/settings/network/telephony/satellite/SatelliteSetting.java
index 88e89d479b8..97bf6944555 100644
--- a/src/com/android/settings/network/telephony/SatelliteSetting.java
+++ b/src/com/android/settings/network/telephony/satellite/SatelliteSetting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 The Android Open Source Project
+ * Copyright (C) 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.network.telephony;
+package com.android.settings.network.telephony.satellite;
 
 import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
 import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_MANUAL;
diff --git a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java
similarity index 98%
rename from src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
rename to src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java
index c81129708ec..18217fd5d62 100644
--- a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 The Android Open Source Project
+ * Copyright (C) 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.network.telephony;
+package com.android.settings.network.telephony.satellite;
 
 import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
 import static android.telephony.CarrierConfigManager.KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT;
@@ -44,6 +44,7 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.network.CarrierConfigCache;
+import com.android.settings.network.telephony.TelephonyBasePreferenceController;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java b/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryController.java
similarity index 97%
rename from src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java
rename to src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryController.java
index 38285d454be..f2fb347852c 100644
--- a/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java
+++ b/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 The Android Open Source Project
+ * Copyright (C) 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.network.telephony;
+package com.android.settings.network.telephony.satellite;
 
 import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
 import static android.telephony.CarrierConfigManager.KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT;
@@ -39,6 +39,7 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.flags.Flags;
 import com.android.settings.network.CarrierConfigCache;
+import com.android.settings.network.telephony.TelephonyBasePreferenceController;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/tests/unit/src/com/android/settings/network/telephony/SatelliteAppListCategoryControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/satellite/SatelliteAppListCategoryControllerTest.java
similarity index 96%
rename from tests/unit/src/com/android/settings/network/telephony/SatelliteAppListCategoryControllerTest.java
rename to tests/unit/src/com/android/settings/network/telephony/satellite/SatelliteAppListCategoryControllerTest.java
index 74797ae69d3..56d4b9fe183 100644
--- a/tests/unit/src/com/android/settings/network/telephony/SatelliteAppListCategoryControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/satellite/SatelliteAppListCategoryControllerTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.settings.network.telephony;
+package com.android.settings.network.telephony.satellite;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-import static com.android.settings.network.telephony.SatelliteAppListCategoryController.MAXIMUM_OF_PREFERENCE_AMOUNT;
+import static com.android.settings.network.telephony.satellite.SatelliteAppListCategoryController.MAXIMUM_OF_PREFERENCE_AMOUNT;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/unit/src/com/android/settings/network/telephony/SatelliteAppListFragmentTest.java b/tests/unit/src/com/android/settings/network/telephony/satellite/SatelliteAppListFragmentTest.java
similarity index 98%
rename from tests/unit/src/com/android/settings/network/telephony/SatelliteAppListFragmentTest.java
rename to tests/unit/src/com/android/settings/network/telephony/satellite/SatelliteAppListFragmentTest.java
index ba91d179f99..7ed0f72acfc 100644
--- a/tests/unit/src/com/android/settings/network/telephony/SatelliteAppListFragmentTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/satellite/SatelliteAppListFragmentTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.network.telephony;
+package com.android.settings.network.telephony.satellite;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryControllerTest.java
similarity index 98%
rename from tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java
rename to tests/unit/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryControllerTest.java
index f9c0f16ac9f..ef44b928afe 100644
--- a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 The Android Open Source Project
+ * Copyright (C) 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.network.telephony;
+package com.android.settings.network.telephony.satellite;
 
 import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
 import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_MANUAL;
diff --git a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceControllerTest.java
similarity index 99%
rename from tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java
rename to tests/unit/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceControllerTest.java
index 16a22cdb937..c67f0aca6a1 100644
--- a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 The Android Open Source Project
+ * Copyright (C) 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.network.telephony;
+package com.android.settings.network.telephony.satellite;
 
 import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
 import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_MANUAL;