diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 17bb5ff4ab3..644356924b9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -388,7 +388,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.ApnSettings" />
+                       android:value="com.android.settings.network.ApnSettings" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -1903,7 +1903,7 @@
                 <data android:mimeType="vnd.android.cursor.dir/telephony-carrier" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.ApnEditor" />
+                       android:value="com.android.settings.network.ApnEditor" />
         </activity>
 
         <activity
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index a1c0e2a72f3..fdec66206ea 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -46,6 +46,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
+import com.android.settings.network.ApnSettings;
 import com.android.settingslib.RestrictedLockUtils;
 
 /**
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index c3317fe2379..7842dbf3c95 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.core.gateway;
 
-import com.android.settings.ApnEditor;
-import com.android.settings.ApnSettings;
 import com.android.settings.DateTimeSettings;
 import com.android.settings.DeviceAdminSettings;
 import com.android.settings.DisplaySettings;
@@ -91,6 +89,8 @@ import com.android.settings.inputmethod.UserDictionarySettings;
 import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.localepicker.LocaleListEditor;
 import com.android.settings.location.LocationSettings;
+import com.android.settings.network.ApnEditor;
+import com.android.settings.network.ApnSettings;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.nfc.AndroidBeam;
 import com.android.settings.nfc.PaymentSettings;
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
similarity index 99%
rename from src/com/android/settings/ApnEditor.java
rename to src/com/android/settings/network/ApnEditor.java
index 15edbf4ccf8..61f12438262 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.network;
+
+import static android.content.Context.TELEPHONY_SERVICE;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -47,9 +49,11 @@ import android.view.View.OnKeyListener;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.util.ArrayUtils;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.Arrays;
@@ -57,11 +61,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import static android.content.Context.TELEPHONY_SERVICE;
-
-/**
- * TODO(b/77339683): After loading all changes, please move this to network package.
- */
 public class ApnEditor extends SettingsPreferenceFragment
         implements OnPreferenceChangeListener, OnKeyListener {
 
diff --git a/src/com/android/settings/ApnPreference.java b/src/com/android/settings/network/ApnPreference.java
similarity index 98%
rename from src/com/android/settings/ApnPreference.java
rename to src/com/android/settings/network/ApnPreference.java
index 0111b26194c..412c2881aa5 100755
--- a/src/com/android/settings/ApnPreference.java
+++ b/src/com/android/settings/network/ApnPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.network;
 
 import android.content.ContentUris;
 import android.content.Context;
@@ -32,6 +32,8 @@ import android.widget.CompoundButton;
 import android.widget.RadioButton;
 import android.widget.RelativeLayout;
 
+import com.android.settings.R;
+
 public class ApnPreference extends Preference implements
         CompoundButton.OnCheckedChangeListener, OnClickListener {
     final static String TAG = "ApnPreference";
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java
similarity index 99%
rename from src/com/android/settings/ApnSettings.java
rename to src/com/android/settings/network/ApnSettings.java
index d554301063c..bbbcdbcbb63 100755
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/network/ApnSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.network;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -39,7 +39,6 @@ import android.os.UserManager;
 import android.provider.Telephony;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -50,7 +49,6 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.MotionEvent;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -59,6 +57,8 @@ import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.dataconnection.ApnSetting;
 import com.android.internal.telephony.uicc.IccRecords;
 import com.android.internal.telephony.uicc.UiccController;
+import com.android.settings.R;
+import com.android.settings.RestrictedSettingsFragment;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 import java.util.ArrayList;
diff --git a/tests/robotests/src/com/android/settings/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
similarity index 99%
rename from tests/robotests/src/com/android/settings/ApnEditorTest.java
rename to tests/robotests/src/com/android/settings/network/ApnEditorTest.java
index aca460f89ae..f3315e5153a 100644
--- a/tests/robotests/src/com/android/settings/ApnEditorTest.java
+++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.network;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -40,7 +40,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
-import com.android.settings.ApnEditor.ApnData;
+import com.android.settings.R;
+import com.android.settings.network.ApnEditor.ApnData;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -52,7 +53,6 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 public class ApnEditorTest {