diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index eae5eaac7e7..7094d8ef485 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1382,7 +1382,7 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.DeviceAdminSettings" />
+                android:value="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -1391,10 +1391,10 @@
                 android:exported="true"
                 android:targetActivity="Settings$DeviceAdminSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.DeviceAdminSettings" />
+                android:value="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings" />
         </activity-alias>
 
-        <activity android:name="DeviceAdminAdd"
+        <activity android:name=".applications.specialaccess.deviceadmin.DeviceAdminAdd"
                 android:label="@string/device_admin_add_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -1405,7 +1405,7 @@
 
         <activity-alias android:name="SetProfileOwner"
                         android:label="@string/profile_owner_add_title"
-                        android:targetActivity="DeviceAdminAdd">
+                        android:targetActivity=".applications.specialaccess.deviceadmin.DeviceAdminAdd">
             <intent-filter android:priority="1000">
                 <action android:name="android.app.action.SET_PROFILE_OWNER" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml
index 789932f8a43..af15c082ae2 100644
--- a/res/xml/security_dashboard_settings.xml
+++ b/res/xml/security_dashboard_settings.xml
@@ -112,7 +112,7 @@
             android:key="manage_device_admin"
             android:title="@string/manage_device_admin"
             android:summary="@string/summary_placeholder"
-            android:fragment="com.android.settings.DeviceAdminSettings" />
+            android:fragment="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings" />
 
         <Preference
             android:key="enterprise_privacy"
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 2c80e94065f..b7a8e5c2420 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -34,8 +34,8 @@
     <Preference
         android:key="device_administrators"
         android:title="@string/manage_device_admin"
-        android:fragment="com.android.settings.DeviceAdminSettings"
-        settings:controller="com.android.settings.applications.specialaccess.DeviceAdministratorsController" />
+        android:fragment="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings"
+        settings:controller="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdministratorsController" />
 
     <Preference
         android:key="system_alert_window"
diff --git a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
index dfbe064b832..a32a0d30a69 100644
--- a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
@@ -44,7 +44,7 @@ import android.view.View;
 import android.webkit.IWebViewUpdateService;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.DeviceAdminAdd;
+import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
similarity index 99%
rename from src/com/android/settings/DeviceAdminAdd.java
rename to src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
index 0ad882df9a2..787b1442d70 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.applications.specialaccess.deviceadmin;
 
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -59,6 +59,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.EventLogTags;
+import com.android.settings.R;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.users.UserDialogs;
 import com.android.settingslib.RestrictedLockUtils;
diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java
similarity index 99%
rename from src/com/android/settings/DeviceAdminSettings.java
rename to src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java
index bb53018dfd6..6e0f60c9d65 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.applications.specialaccess.deviceadmin;
 
 import android.app.Activity;
 import android.app.AppGlobals;
@@ -49,6 +49,8 @@ import android.widget.Switch;
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.Instrumentable;
 import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
diff --git a/src/com/android/settings/applications/specialaccess/DeviceAdministratorsController.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdministratorsController.java
similarity index 94%
rename from src/com/android/settings/applications/specialaccess/DeviceAdministratorsController.java
rename to src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdministratorsController.java
index bdb99ef113a..5b05b866ab5 100644
--- a/src/com/android/settings/applications/specialaccess/DeviceAdministratorsController.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdministratorsController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.applications.specialaccess;
+package com.android.settings.applications.specialaccess.deviceadmin;
 
 import android.content.Context;
 
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index a050628d31e..fbe7399662d 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -17,7 +17,7 @@
 package com.android.settings.core.gateway;
 
 import com.android.settings.DateTimeSettings;
-import com.android.settings.DeviceAdminSettings;
+import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings;
 import com.android.settings.DisplaySettings;
 import com.android.settings.IccLockSettings;
 import com.android.settings.MasterClear;
diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
index 026b79f0fd9..4f299401531 100644
--- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
+++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
@@ -34,7 +34,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.settings.DeviceAdminAdd;
+import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd;
 import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.Utils;
diff --git a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAddTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
rename to tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAddTest.java
index 1a4ce89fbcd..b2965c464d3 100644
--- a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAddTest.java
@@ -11,10 +11,10 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License
+ * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.applications.specialaccess.deviceadmin;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/DeviceAdministratorsControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdministratorsControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/applications/specialaccess/DeviceAdministratorsControllerTest.java
rename to tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdministratorsControllerTest.java
index efa784683f3..6e3ff2c857e 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/DeviceAdministratorsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdministratorsControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.applications.specialaccess;
+package com.android.settings.applications.specialaccess.deviceadmin;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
index ccd66e86bfc..8914b53daa1 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
@@ -32,7 +32,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import com.android.settings.DeviceAdminAdd;
+import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd;
 import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.testutils.CustomActivity;