diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3f66cb8d2d4..5a1b915db27 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -745,13 +745,13 @@
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.ZenModeSettings" />
+                android:value="com.android.settings.notification.zen.ZenModeSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
         <activity
-            android:name=".notification.ZenSuggestionActivity"
+            android:name=".notification.zen.ZenSuggestionActivity"
             android:label="@string/zen_mode_settings_title"
             android:icon="@drawable/ic_suggestion_dnd"
             android:theme="@android:style/Theme.NoDisplay">
@@ -773,7 +773,7 @@
         </activity>
 
         <activity
-            android:name=".notification.ZenOnboardingActivity"
+            android:name=".notification.zen.ZenOnboardingActivity"
             android:label="@string/zen_onboarding_dnd_visual_disturbances_header"
             android:icon="@drawable/ic_notifications"
             android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
@@ -797,7 +797,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.notification.ZenModeAutomationSettings" />
+                       android:value="com.android.settings.notification.zen.ZenModeAutomationSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                        android:value="true" />
         </activity>
@@ -860,7 +860,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.ZenModeScheduleRuleSettings" />
+                android:value="com.android.settings.notification.zen.ZenModeScheduleRuleSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -873,7 +873,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.ZenModeEventRuleSettings" />
+                android:value="com.android.settings.notification.zen.ZenModeEventRuleSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1169,10 +1169,10 @@
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.NotificationStation" />
+                android:value="com.android.settings.notification.history.NotificationStation" />
         </activity>
 
-        <activity android:name=".notification.ZenModeVoiceActivity"
+        <activity android:name=".notification.zen.ZenModeVoiceActivity"
                 android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
                 android:label="@string/zen_mode_settings_title">
             <intent-filter>
@@ -2434,7 +2434,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.notification.ZenAccessSettings" />
+                       android:value="com.android.settings.notification.zen.ZenAccessSettings" />
         </activity>
 
         <activity
@@ -2463,7 +2463,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.notification.AppBubbleNotificationSettings" />
+                       android:value="com.android.settings.notification.app.AppBubbleNotificationSettings" />
         </activity>
 
         <activity
@@ -2508,7 +2508,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.AppNotificationSettings" />
+                android:value="com.android.settings.notification.app.AppNotificationSettings" />
         </activity>
 
         <!-- Show channel-level notification settings (channel passed in as extras) -->
@@ -2520,7 +2520,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.notification.ChannelNotificationSettings" />
+                       android:value="com.android.settings.notification.app.ChannelNotificationSettings" />
         </activity>
 
         <!-- Show Manual (from settings item) -->
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index 7330f8d38c3..d6122af9573 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -26,7 +26,7 @@
         android:key="block"
         android:layout="@layout/styled_switch_bar" />
 
-    <com.android.settings.notification.NotificationFooterPreference
+    <com.android.settings.notification.app.NotificationFooterPreference
         android:key="block_desc" />
 
     <!-- Channels/Channel groups added here -->
@@ -76,11 +76,11 @@
 
     </PreferenceCategory>
 
-    <com.android.settings.notification.NotificationFooterPreference
+    <com.android.settings.notification.app.NotificationFooterPreference
         android:key="desc"
         android:order="5000" />
 
-    <com.android.settings.notification.NotificationFooterPreference
+    <com.android.settings.notification.app.NotificationFooterPreference
         android:key="deleted"
         android:order="8000" />
 
diff --git a/res/xml/channel_notification_settings.xml b/res/xml/channel_notification_settings.xml
index 267281f28cb..2ecbec4f7e4 100644
--- a/res/xml/channel_notification_settings.xml
+++ b/res/xml/channel_notification_settings.xml
@@ -38,7 +38,7 @@
         android:summary="@string/allow_interruption_summary" />
 
     <!-- Importance -->
-    <com.android.settings.notification.ImportancePreference
+    <com.android.settings.notification.app.ImportancePreference
         android:key="importance"
         android:order="4"
         android:title="@string/notification_importance_title"
@@ -64,7 +64,7 @@
         settings:initialExpandedChildrenCount="0">
 
         <!-- Default ringtone -->
-        <com.android.settings.notification.NotificationSoundPreference
+        <com.android.settings.notification.app.NotificationSoundPreference
             android:key="ringtone"
             android:title="@string/notification_channel_sound_title"
             android:dialogTitle="@string/notification_channel_sound_title"
@@ -121,11 +121,11 @@
             settings:allowDividerAbove="true"/>
     </PreferenceCategory>
 
-    <com.android.settings.notification.NotificationFooterPreference
+    <com.android.settings.notification.app.NotificationFooterPreference
         android:key="desc"
         android:order="100"/>
 
-    <com.android.settings.notification.NotificationFooterPreference
+    <com.android.settings.notification.app.NotificationFooterPreference
         android:key="block_desc"
         android:order="110"
         settings:allowDividerAbove="false"/>
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index 76e1555fcef..fdfde67f846 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -128,8 +128,8 @@
             android:key="zen_mode_notifications"
             android:title="@string/zen_mode_settings_title"
             settings:useAdminDisabledSummary="true"
-            android:fragment="com.android.settings.notification.ZenModeSettings"
-            settings:controller="com.android.settings.notification.ZenModePreferenceController"
+            android:fragment="com.android.settings.notification.zen.ZenModeSettings"
+            settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
             settings:allowDividerAbove="false"/>
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index d99cc00c8d3..d82a3242f79 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -98,12 +98,12 @@
     <com.android.settingslib.RestrictedPreference
         android:key="zen_mode"
         android:title="@string/zen_mode_settings_title"
-        android:fragment="com.android.settings.notification.ZenModeSettings"
+        android:fragment="com.android.settings.notification.zen.ZenModeSettings"
         android:order="-120"
         settings:useAdminDisabledSummary="true"
         settings:keywords="@string/keywords_sounds_and_notifications_interruptions"
         settings:allowDividerAbove="true"
-        settings:controller="com.android.settings.notification.ZenModePreferenceController"/>
+        settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"/>
 
     <Preference
         android:key="gesture_prevent_ringing_sound"
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index b0d962a843f..25422bf1805 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -52,7 +52,7 @@
     <Preference
         android:key="zen_access"
         android:title="@string/manage_zen_access_title"
-        android:fragment="com.android.settings.notification.ZenAccessSettings"
+        android:fragment="com.android.settings.notification.zen.ZenAccessSettings"
         settings:controller="com.android.settings.applications.specialaccess.zenaccess.ZenAccessController" />
 
     <Preference
diff --git a/res/xml/zen_mode_custom_rule_settings.xml b/res/xml/zen_mode_custom_rule_settings.xml
index 7aedd2c5e01..169a94f4216 100644
--- a/res/xml/zen_mode_custom_rule_settings.xml
+++ b/res/xml/zen_mode_custom_rule_settings.xml
@@ -22,11 +22,11 @@
 
     <PreferenceCategory
         android:key="zen_custom_rule_category">
-        <com.android.settings.notification.ZenCustomRadioButtonPreference
+        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
             android:key="zen_custom_rule_setting_default"
             android:title="@string/zen_mode_custom_behavior_summary_default"/>
 
-        <com.android.settings.notification.ZenCustomRadioButtonPreference
+        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
             android:key="zen_custom_rule_setting"
             android:title="@string/zen_mode_custom_behavior_summary" />
     </PreferenceCategory>
diff --git a/res/xml/zen_mode_restrict_notifications_settings.xml b/res/xml/zen_mode_restrict_notifications_settings.xml
index e024ab9d974..b0705cbd106 100644
--- a/res/xml/zen_mode_restrict_notifications_settings.xml
+++ b/res/xml/zen_mode_restrict_notifications_settings.xml
@@ -23,17 +23,17 @@
     <PreferenceCategory
         android:key="restrict_category"
         android:title="@string/zen_mode_settings_category">
-        <com.android.settings.notification.ZenCustomRadioButtonPreference
+        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
             android:key="zen_mute_notifications"
             android:title="@string/zen_mode_restrict_notifications_mute"
             android:summary="@string/zen_mode_restrict_notifications_mute_summary"/>
 
-        <com.android.settings.notification.ZenCustomRadioButtonPreference
+        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
             android:key="zen_hide_notifications"
             android:title="@string/zen_mode_restrict_notifications_hide"
             android:summary="@string/zen_mode_restrict_notifications_hide_summary"/>
 
-        <com.android.settings.notification.ZenCustomRadioButtonPreference
+        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
             android:key="zen_custom"
             android:title="@string/zen_mode_restrict_notifications_custom" />
 
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 320a37c3da8..b72c7842372 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -29,19 +29,19 @@
         <Preference
             android:key="zen_mode_behavior_calls"
             android:title="@string/zen_mode_calls_title"
-            android:fragment="com.android.settings.notification.ZenModeCallsSettings" />
+            android:fragment="com.android.settings.notification.zen.ZenModeCallsSettings" />
 
         <!-- Messages -->
         <Preference
             android:key="zen_mode_behavior_messages"
             android:title="@string/zen_mode_messages_title"
-            android:fragment="com.android.settings.notification.ZenModeMessagesSettings" />
+            android:fragment="com.android.settings.notification.zen.ZenModeMessagesSettings" />
 
         <!-- All sounds -->
         <Preference
             android:key="zen_sound_vibration_settings"
             android:title="@string/zen_sound_title"
-            android:fragment="com.android.settings.notification.ZenModeSoundVibrationSettings"
+            android:fragment="com.android.settings.notification.zen.ZenModeSoundVibrationSettings"
             android:icon="@drawable/ic_chevron_right_24dp"/>
     </PreferenceCategory>
 
@@ -49,11 +49,11 @@
     <Preference
         android:key="zen_mode_block_effects_settings"
         android:title="@string/zen_mode_restrict_notifications_title"
-        android:fragment="com.android.settings.notification.ZenModeRestrictNotificationsSettings"
+        android:fragment="com.android.settings.notification.zen.ZenModeRestrictNotificationsSettings"
         settings:allowDividerAbove="true"/>
 
     <!-- DND duration settings -->
-    <com.android.settings.notification.ZenDurationDialogPreference
+    <com.android.settings.notification.zen.ZenDurationDialogPreference
         android:key="zen_mode_duration_settings"
         android:title="@string/zen_mode_duration_settings_title"
         android:widgetLayout="@null"/>
@@ -62,7 +62,7 @@
     <Preference
         android:key="zen_mode_automation_settings"
         android:title="@string/zen_mode_automation_settings_title"
-        android:fragment="com.android.settings.notification.ZenModeAutomationSettings"/>
+        android:fragment="com.android.settings.notification.zen.ZenModeAutomationSettings"/>
 
     <!-- Turn on DND button -->
     <com.android.settingslib.widget.LayoutPreference
diff --git a/res/xml/zen_mode_sound_vibration_settings.xml b/res/xml/zen_mode_sound_vibration_settings.xml
index 73b5b0548ea..b43bdcccae7 100644
--- a/res/xml/zen_mode_sound_vibration_settings.xml
+++ b/res/xml/zen_mode_sound_vibration_settings.xml
@@ -28,13 +28,13 @@
         <Preference
             android:key="zen_mode_calls_settings"
             android:title="@string/zen_mode_calls"
-            android:fragment="com.android.settings.notification.ZenModeCallsSettings" />
+            android:fragment="com.android.settings.notification.zen.ZenModeCallsSettings" />
 
         <!-- Messages -->
         <Preference
             android:key="zen_mode_messages_settings"
             android:title="@string/zen_mode_messages"
-            android:fragment="com.android.settings.notification.ZenModeMessagesSettings" />
+            android:fragment="com.android.settings.notification.zen.ZenModeMessagesSettings" />
 
         <!-- Alarms -->
         <SwitchPreference
@@ -65,7 +65,7 @@
         <Preference
             android:key="zen_mode_bypassing_apps"
             android:title="@string/zen_mode_bypassing_apps"
-            android:fragment="com.android.settings.notification.ZenModeBypassingAppsSettings"/>
+            android:fragment="com.android.settings.notification.zen.ZenModeBypassingAppsSettings"/>
 
     </PreferenceCategory>
 
diff --git a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
index 07e14d4b1aa..eab9a562872 100644
--- a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.notification.AppNotificationSettings;
+import com.android.settings.notification.app.AppNotificationSettings;
 import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.applications.ApplicationsState;
 
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index 1906a2da1ea..4ce8fa40e29 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -102,7 +102,7 @@ import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
 import com.android.settings.fuelgauge.HighPowerDetail;
-import com.android.settings.notification.AppNotificationSettings;
+import com.android.settings.notification.app.AppNotificationSettings;
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.NotificationBackend;
 import com.android.settings.widget.LoadingViewController;
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 98c6b87ba3c..92dc74f512f 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -105,20 +105,20 @@ import com.android.settings.network.MobileNetworkListFragment;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.nfc.AndroidBeam;
 import com.android.settings.nfc.PaymentSettings;
-import com.android.settings.notification.AppBubbleNotificationSettings;
-import com.android.settings.notification.AppNotificationSettings;
-import com.android.settings.notification.ChannelNotificationSettings;
+import com.android.settings.notification.app.AppBubbleNotificationSettings;
+import com.android.settings.notification.app.AppNotificationSettings;
+import com.android.settings.notification.app.ChannelNotificationSettings;
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.NotificationAccessSettings;
 import com.android.settings.notification.NotificationAssistantPicker;
-import com.android.settings.notification.NotificationStation;
+import com.android.settings.notification.history.NotificationStation;
 import com.android.settings.notification.SoundSettings;
-import com.android.settings.notification.ZenAccessSettings;
-import com.android.settings.notification.ZenModeAutomationSettings;
-import com.android.settings.notification.ZenModeBlockedEffectsSettings;
-import com.android.settings.notification.ZenModeEventRuleSettings;
-import com.android.settings.notification.ZenModeScheduleRuleSettings;
-import com.android.settings.notification.ZenModeSettings;
+import com.android.settings.notification.zen.ZenAccessSettings;
+import com.android.settings.notification.zen.ZenModeAutomationSettings;
+import com.android.settings.notification.zen.ZenModeBlockedEffectsSettings;
+import com.android.settings.notification.zen.ZenModeEventRuleSettings;
+import com.android.settings.notification.zen.ZenModeScheduleRuleSettings;
+import com.android.settings.notification.zen.ZenModeSettings;
 import com.android.settings.password.ChooseLockPassword;
 import com.android.settings.password.ChooseLockPattern;
 import com.android.settings.print.PrintJobSettingsFragment;
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index b499b59d7e7..f5cbf188ee1 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -38,7 +38,7 @@ import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.SoundSettings;
-import com.android.settings.notification.ZenModeSettings;
+import com.android.settings.notification.zen.ZenModeSettings;
 import com.android.settings.privacy.PrivacyDashboardFragment;
 import com.android.settings.security.LockscreenDashboardFragment;
 import com.android.settings.security.SecuritySettings;
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index 35905546a03..60a8c54d1d2 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -27,8 +27,8 @@ import com.android.settings.Settings.NightDisplaySuggestionActivity;
 import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity;
 import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity;
 import com.android.settings.display.NightDisplayPreferenceController;
-import com.android.settings.notification.ZenOnboardingActivity;
-import com.android.settings.notification.ZenSuggestionActivity;
+import com.android.settings.notification.zen.ZenOnboardingActivity;
+import com.android.settings.notification.zen.ZenSuggestionActivity;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.password.ScreenLockSuggestionActivity;
 import com.android.settings.wallpaper.StyleSuggestionActivity;
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java b/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
index 5f95de4bfce..4d79a013f7f 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
@@ -30,7 +30,7 @@ import androidx.annotation.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.homepage.contextualcards.ContextualCard;
-import com.android.settings.notification.ZenModeSettings;
+import com.android.settings.notification.zen.ZenModeSettings;
 
 import java.util.Objects;
 
diff --git a/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java b/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java
index bdf97a802a0..5ac407d46e8 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java
@@ -49,10 +49,11 @@ import com.android.settings.Utils;
 import com.android.settings.applications.AppAndNotificationDashboardFragment;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.notification.AppNotificationSettings;
-import com.android.settings.notification.ChannelNotificationSettings;
+import com.android.settings.notification.app.AppNotificationSettings;
+import com.android.settings.notification.app.ChannelNotificationSettings;
 import com.android.settings.notification.NotificationBackend;
 import com.android.settings.notification.NotificationBackend.NotificationsSentState;
+import com.android.settings.notification.app.ChannelListPreferenceController;
 import com.android.settings.slices.CustomSliceRegistry;
 import com.android.settings.slices.CustomSliceable;
 import com.android.settings.slices.SliceBroadcastReceiver;
@@ -107,7 +108,7 @@ public class NotificationChannelSlice implements CustomSliceable {
      *
      * Note:
      * When the sent count of notification channels is the same, follow the sorting mechanism from
-     * {@link com.android.settings.notification.ChannelListPreferenceController}.
+     * {@link ChannelListPreferenceController}.
      * Since slice view only shows displayable notification channels, so those deleted ones are
      * excluded from the comparison here.
      */
diff --git a/src/com/android/settings/notification/NotificationSwitchBarPreference.java b/src/com/android/settings/notification/NotificationSwitchBarPreference.java
deleted file mode 100644
index 01c4f6ab468..00000000000
--- a/src/com/android/settings/notification/NotificationSwitchBarPreference.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * 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.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.widget.ToggleSwitch;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.widget.LayoutPreference;
-
-public class NotificationSwitchBarPreference extends LayoutPreference {
-    private ToggleSwitch mSwitch;
-    private boolean mChecked;
-    private boolean mEnableSwitch = true;
-
-    public NotificationSwitchBarPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-        mSwitch = (ToggleSwitch) holder.findViewById(android.R.id.switch_widget);
-        if (mSwitch != null) {
-            mSwitch.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (!mSwitch.isEnabled()) {
-                        return;
-                    }
-                    mChecked = !mChecked;
-                    setChecked(mChecked);
-                    if (!callChangeListener(mChecked)) {
-                        setChecked(!mChecked);
-                    }
-                }
-            });
-            mSwitch.setChecked(mChecked);
-            mSwitch.setEnabled(mEnableSwitch);
-        }
-    }
-
-    public boolean isChecked() {
-        return mSwitch != null && mSwitch.isEnabled() && mChecked;
-    }
-
-    public void setChecked(boolean checked) {
-        mChecked = checked;
-        if (mSwitch != null) {
-            mSwitch.setChecked(checked);
-        }
-    }
-
-    public void setSwitchEnabled(boolean enabled) {
-        mEnableSwitch = enabled;
-        if (mSwitch != null) {
-            mSwitch.setEnabled(enabled);
-        }
-    }
-
-    public void setDisabledByAdmin(RestrictedLockUtils.EnforcedAdmin admin) {
-        setSwitchEnabled(admin == null);
-    }
-}
diff --git a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
index 9efe34e4e1c..8998d650969 100644
--- a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
+++ b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
@@ -21,7 +21,6 @@ import android.app.settings.SettingsEnums;
 import android.app.usage.IUsageStatsManager;
 import android.app.usage.UsageEvents;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.RemoteException;
@@ -32,15 +31,15 @@ import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.IconDrawableFactory;
-import android.util.Log;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.notification.app.AppNotificationSettings;
+import com.android.settings.notification.app.NotificationAppPreference;
 import com.android.settingslib.TwoTargetPreference;
-import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.utils.StringUtil;
diff --git a/src/com/android/settings/notification/AllowSoundPreferenceController.java b/src/com/android/settings/notification/app/AllowSoundPreferenceController.java
similarity index 96%
rename from src/com/android/settings/notification/AllowSoundPreferenceController.java
rename to src/com/android/settings/notification/app/AllowSoundPreferenceController.java
index dcf4779e232..0439aabc6f5 100644
--- a/src/com/android/settings/notification/AllowSoundPreferenceController.java
+++ b/src/com/android/settings/notification/app/AllowSoundPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
 import static android.app.NotificationManager.IMPORTANCE_LOW;
@@ -27,6 +27,7 @@ import android.util.Log;
 import androidx.preference.Preference;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 public class AllowSoundPreferenceController extends NotificationPreferenceController
diff --git a/src/com/android/settings/notification/AppBubbleNotificationSettings.java b/src/com/android/settings/notification/app/AppBubbleNotificationSettings.java
similarity index 97%
rename from src/com/android/settings/notification/AppBubbleNotificationSettings.java
rename to src/com/android/settings/notification/app/AppBubbleNotificationSettings.java
index 860c44566a7..fdb257e130c 100644
--- a/src/com/android/settings/notification/AppBubbleNotificationSettings.java
+++ b/src/com/android/settings/notification/app/AppBubbleNotificationSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -22,6 +22,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.settings.R;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.search.SearchIndexable;
diff --git a/src/com/android/settings/notification/AppLinkPreferenceController.java b/src/com/android/settings/notification/app/AppLinkPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/AppLinkPreferenceController.java
rename to src/com/android/settings/notification/app/AppLinkPreferenceController.java
index c696e8ef8a4..23ccbf0c075 100644
--- a/src/com/android/settings/notification/AppLinkPreferenceController.java
+++ b/src/com/android/settings/notification/app/AppLinkPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.Context;
 
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/app/AppNotificationSettings.java
similarity index 99%
rename from src/com/android/settings/notification/AppNotificationSettings.java
rename to src/com/android/settings/notification/app/AppNotificationSettings.java
index 24f38b1b71a..7f6c4ab9fa8 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/app/AppNotificationSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/BadgePreferenceController.java b/src/com/android/settings/notification/app/BadgePreferenceController.java
similarity index 96%
rename from src/com/android/settings/notification/BadgePreferenceController.java
rename to src/com/android/settings/notification/app/BadgePreferenceController.java
index e40324e4f84..9f8608e63c8 100644
--- a/src/com/android/settings/notification/BadgePreferenceController.java
+++ b/src/com/android/settings/notification/app/BadgePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
 
@@ -24,6 +24,7 @@ import android.provider.Settings;
 import androidx.preference.Preference;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 public class BadgePreferenceController extends NotificationPreferenceController
diff --git a/src/com/android/settings/notification/BlockPreferenceController.java b/src/com/android/settings/notification/app/BlockPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/BlockPreferenceController.java
rename to src/com/android/settings/notification/app/BlockPreferenceController.java
index 0dfd38b1420..7f90979b15d 100644
--- a/src/com/android/settings/notification/BlockPreferenceController.java
+++ b/src/com/android/settings/notification/app/BlockPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
 import static android.app.NotificationManager.IMPORTANCE_NONE;
@@ -28,6 +28,7 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.widget.LayoutPreference;
 
diff --git a/src/com/android/settings/notification/BubblePreferenceController.java b/src/com/android/settings/notification/app/BubblePreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/BubblePreferenceController.java
rename to src/com/android/settings/notification/app/BubblePreferenceController.java
index b57a91100a4..930bab3ab5b 100644
--- a/src/com/android/settings/notification/BubblePreferenceController.java
+++ b/src/com/android/settings/notification/app/BubblePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
 
@@ -24,6 +24,7 @@ import android.provider.Settings;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import androidx.annotation.VisibleForTesting;
diff --git a/src/com/android/settings/notification/BubbleSummaryPreferenceController.java b/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java
similarity index 96%
rename from src/com/android/settings/notification/BubbleSummaryPreferenceController.java
rename to src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java
index cc687cf107c..f13613c4daf 100644
--- a/src/com/android/settings/notification/BubbleSummaryPreferenceController.java
+++ b/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
 
@@ -26,6 +26,7 @@ import android.provider.Settings;
 import com.android.settings.R;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.notification.NotificationBackend;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
diff --git a/src/com/android/settings/notification/BubbleWarningDialogFragment.java b/src/com/android/settings/notification/app/BubbleWarningDialogFragment.java
similarity index 98%
rename from src/com/android/settings/notification/BubbleWarningDialogFragment.java
rename to src/com/android/settings/notification/app/BubbleWarningDialogFragment.java
index 5086fb044a5..d3aa7585260 100644
--- a/src/com/android/settings/notification/BubbleWarningDialogFragment.java
+++ b/src/com/android/settings/notification/app/BubbleWarningDialogFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/notification/ChannelListPreferenceController.java b/src/com/android/settings/notification/app/ChannelListPreferenceController.java
similarity index 99%
rename from src/com/android/settings/notification/ChannelListPreferenceController.java
rename to src/com/android/settings/notification/app/ChannelListPreferenceController.java
index 7ea33393c60..7cf836ab0c5 100644
--- a/src/com/android/settings/notification/ChannelListPreferenceController.java
+++ b/src/com/android/settings/notification/app/ChannelListPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationManager.IMPORTANCE_LOW;
 import static android.app.NotificationManager.IMPORTANCE_NONE;
@@ -36,6 +36,7 @@ import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settingslib.RestrictedSwitchPreference;
 
diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/app/ChannelNotificationSettings.java
similarity index 96%
rename from src/com/android/settings/notification/ChannelNotificationSettings.java
rename to src/com/android/settings/notification/app/ChannelNotificationSettings.java
index ff3eebcfe83..b4d67b97dcb 100644
--- a/src/com/android/settings/notification/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/app/ChannelNotificationSettings.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
-import static com.android.settings.notification.ChannelListPreferenceController.ARG_FROM_SETTINGS;
+import static com.android.settings.notification.app.ChannelListPreferenceController.ARG_FROM_SETTINGS;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/DeletedChannelsPreferenceController.java b/src/com/android/settings/notification/app/DeletedChannelsPreferenceController.java
similarity index 94%
rename from src/com/android/settings/notification/DeletedChannelsPreferenceController.java
rename to src/com/android/settings/notification/app/DeletedChannelsPreferenceController.java
index 14e0c84e2f8..5a60f3f4473 100644
--- a/src/com/android/settings/notification/DeletedChannelsPreferenceController.java
+++ b/src/com/android/settings/notification/app/DeletedChannelsPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.Context;
 
@@ -22,6 +22,7 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 
 public class DeletedChannelsPreferenceController extends NotificationPreferenceController
         implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/notification/DescriptionPreferenceController.java b/src/com/android/settings/notification/app/DescriptionPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/DescriptionPreferenceController.java
rename to src/com/android/settings/notification/app/DescriptionPreferenceController.java
index 1e996463aa0..f4ad6a32704 100644
--- a/src/com/android/settings/notification/DescriptionPreferenceController.java
+++ b/src/com/android/settings/notification/app/DescriptionPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.Context;
 import android.text.TextUtils;
diff --git a/src/com/android/settings/notification/DndPreferenceController.java b/src/com/android/settings/notification/app/DndPreferenceController.java
similarity index 95%
rename from src/com/android/settings/notification/DndPreferenceController.java
rename to src/com/android/settings/notification/app/DndPreferenceController.java
index 4ec76f1c6d6..90e6b250991 100644
--- a/src/com/android/settings/notification/DndPreferenceController.java
+++ b/src/com/android/settings/notification/app/DndPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.app.NotificationChannel;
 import android.content.Context;
@@ -22,6 +22,7 @@ import android.content.Context;
 import androidx.preference.Preference;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 public class DndPreferenceController extends NotificationPreferenceController
diff --git a/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java b/src/com/android/settings/notification/app/GlobalBubblePermissionObserverMixin.java
similarity index 97%
rename from src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java
rename to src/com/android/settings/notification/app/GlobalBubblePermissionObserverMixin.java
index 0118a95deb2..bed0f3d3ad8 100644
--- a/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java
+++ b/src/com/android/settings/notification/app/GlobalBubblePermissionObserverMixin.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.Context;
 import android.database.ContentObserver;
diff --git a/src/com/android/settings/notification/HeaderPreferenceController.java b/src/com/android/settings/notification/app/HeaderPreferenceController.java
similarity index 99%
rename from src/com/android/settings/notification/HeaderPreferenceController.java
rename to src/com/android/settings/notification/app/HeaderPreferenceController.java
index be5f45eacca..809871466ea 100644
--- a/src/com/android/settings/notification/HeaderPreferenceController.java
+++ b/src/com/android/settings/notification/app/HeaderPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static com.android.settings.widget.EntityHeaderController.PREF_KEY_APP_HEADER;
 
diff --git a/src/com/android/settings/notification/HighImportancePreferenceController.java b/src/com/android/settings/notification/app/HighImportancePreferenceController.java
similarity index 96%
rename from src/com/android/settings/notification/HighImportancePreferenceController.java
rename to src/com/android/settings/notification/app/HighImportancePreferenceController.java
index 6c8c354755d..16cbf012f81 100644
--- a/src/com/android/settings/notification/HighImportancePreferenceController.java
+++ b/src/com/android/settings/notification/app/HighImportancePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
 import static android.app.NotificationManager.IMPORTANCE_HIGH;
@@ -23,6 +23,7 @@ import android.app.NotificationChannel;
 import android.content.Context;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import androidx.preference.Preference;
diff --git a/src/com/android/settings/notification/ImportancePreference.java b/src/com/android/settings/notification/app/ImportancePreference.java
similarity index 99%
rename from src/com/android/settings/notification/ImportancePreference.java
rename to src/com/android/settings/notification/app/ImportancePreference.java
index b059f9165e7..d3cd0131081 100644
--- a/src/com/android/settings/notification/ImportancePreference.java
+++ b/src/com/android/settings/notification/app/ImportancePreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
 import static android.app.NotificationManager.IMPORTANCE_HIGH;
diff --git a/src/com/android/settings/notification/ImportancePreferenceController.java b/src/com/android/settings/notification/app/ImportancePreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/ImportancePreferenceController.java
rename to src/com/android/settings/notification/app/ImportancePreferenceController.java
index a9bd182cbe6..cf0dc27d671 100644
--- a/src/com/android/settings/notification/ImportancePreferenceController.java
+++ b/src/com/android/settings/notification/app/ImportancePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationChannel.USER_LOCKED_SOUND;
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
@@ -25,6 +25,7 @@ import android.media.RingtoneManager;
 import android.provider.Settings;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 
 import androidx.preference.Preference;
 
diff --git a/src/com/android/settings/notification/LightsPreferenceController.java b/src/com/android/settings/notification/app/LightsPreferenceController.java
similarity index 96%
rename from src/com/android/settings/notification/LightsPreferenceController.java
rename to src/com/android/settings/notification/app/LightsPreferenceController.java
index 21dabbf74a9..fc9f34cdc8e 100644
--- a/src/com/android/settings/notification/LightsPreferenceController.java
+++ b/src/com/android/settings/notification/app/LightsPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.app.NotificationManager;
 import android.content.Context;
@@ -23,6 +23,7 @@ import android.provider.Settings;
 import androidx.preference.Preference;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 public class LightsPreferenceController extends NotificationPreferenceController
diff --git a/src/com/android/settings/notification/MinImportancePreferenceController.java b/src/com/android/settings/notification/app/MinImportancePreferenceController.java
similarity index 96%
rename from src/com/android/settings/notification/MinImportancePreferenceController.java
rename to src/com/android/settings/notification/app/MinImportancePreferenceController.java
index 19d950cb3bd..4adb81733bb 100644
--- a/src/com/android/settings/notification/MinImportancePreferenceController.java
+++ b/src/com/android/settings/notification/app/MinImportancePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationManager.IMPORTANCE_LOW;
 import static android.app.NotificationManager.IMPORTANCE_MIN;
@@ -23,6 +23,7 @@ import android.app.NotificationChannel;
 import android.content.Context;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import androidx.preference.Preference;
diff --git a/src/com/android/settings/notification/NotificationAppPreference.java b/src/com/android/settings/notification/app/NotificationAppPreference.java
similarity index 98%
rename from src/com/android/settings/notification/NotificationAppPreference.java
rename to src/com/android/settings/notification/app/NotificationAppPreference.java
index dfa3e36800b..4180a80ea51 100644
--- a/src/com/android/settings/notification/NotificationAppPreference.java
+++ b/src/com/android/settings/notification/app/NotificationAppPreference.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/settings/notification/NotificationFooterPreference.java b/src/com/android/settings/notification/app/NotificationFooterPreference.java
similarity index 97%
rename from src/com/android/settings/notification/NotificationFooterPreference.java
rename to src/com/android/settings/notification/app/NotificationFooterPreference.java
index abaffc85941..6f34cdd5c90 100644
--- a/src/com/android/settings/notification/NotificationFooterPreference.java
+++ b/src/com/android/settings/notification/app/NotificationFooterPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.Context;
 import android.text.method.LinkMovementMethod;
diff --git a/src/com/android/settings/notification/NotificationPreferenceController.java b/src/com/android/settings/notification/app/NotificationPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/NotificationPreferenceController.java
rename to src/com/android/settings/notification/app/NotificationPreferenceController.java
index b5acd2db993..e82f420766c 100644
--- a/src/com/android/settings/notification/NotificationPreferenceController.java
+++ b/src/com/android/settings/notification/app/NotificationPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationManager.IMPORTANCE_NONE;
 
@@ -29,6 +29,7 @@ import android.util.Log;
 
 import androidx.preference.Preference;
 
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.core.AbstractPreferenceController;
 
diff --git a/src/com/android/settings/notification/NotificationSettings.java b/src/com/android/settings/notification/app/NotificationSettings.java
similarity index 94%
rename from src/com/android/settings/notification/NotificationSettings.java
rename to src/com/android/settings/notification/app/NotificationSettings.java
index 938a7baf13f..79b256721fc 100644
--- a/src/com/android/settings/notification/NotificationSettings.java
+++ b/src/com/android/settings/notification/app/NotificationSettings.java
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
-
-import static android.app.NotificationManager.IMPORTANCE_LOW;
-import static android.app.NotificationManager.IMPORTANCE_NONE;
+package com.android.settings.notification.app;
 
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
@@ -35,11 +32,6 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
-import android.graphics.BlendMode;
-import android.graphics.BlendModeColorFilter;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.GradientDrawable;
-import android.graphics.drawable.LayerDrawable;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.provider.Settings;
@@ -47,21 +39,18 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
-import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.HeaderPreferenceController;
+import com.android.settings.notification.app.NotificationPreferenceController;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 
 abstract public class NotificationSettings extends DashboardFragment {
diff --git a/src/com/android/settings/notification/NotificationSoundPreference.java b/src/com/android/settings/notification/app/NotificationSoundPreference.java
similarity index 98%
rename from src/com/android/settings/notification/NotificationSoundPreference.java
rename to src/com/android/settings/notification/app/NotificationSoundPreference.java
index 71684d5cf75..136b21ffd36 100644
--- a/src/com/android/settings/notification/NotificationSoundPreference.java
+++ b/src/com/android/settings/notification/app/NotificationSoundPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.ContentResolver;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/NotificationsOffPreferenceController.java b/src/com/android/settings/notification/app/NotificationsOffPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/NotificationsOffPreferenceController.java
rename to src/com/android/settings/notification/app/NotificationsOffPreferenceController.java
index 8762f91c271..0d998eb9061 100644
--- a/src/com/android/settings/notification/NotificationsOffPreferenceController.java
+++ b/src/com/android/settings/notification/app/NotificationsOffPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.Context;
 
diff --git a/src/com/android/settings/notification/SoundPreferenceController.java b/src/com/android/settings/notification/app/SoundPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/SoundPreferenceController.java
rename to src/com/android/settings/notification/app/SoundPreferenceController.java
index 8530de039f7..60dcf7f35f7 100644
--- a/src/com/android/settings/notification/SoundPreferenceController.java
+++ b/src/com/android/settings/notification/app/SoundPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.media.AudioAttributes.USAGE_ALARM;
 import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE;
@@ -32,6 +32,7 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 
 public class SoundPreferenceController extends NotificationPreferenceController
         implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
diff --git a/src/com/android/settings/notification/VibrationPreferenceController.java b/src/com/android/settings/notification/app/VibrationPreferenceController.java
similarity index 92%
rename from src/com/android/settings/notification/VibrationPreferenceController.java
rename to src/com/android/settings/notification/app/VibrationPreferenceController.java
index e6024d0ea9d..b22c4774456 100644
--- a/src/com/android/settings/notification/VibrationPreferenceController.java
+++ b/src/com/android/settings/notification/app/VibrationPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.app.NotificationManager;
 import android.content.Context;
@@ -23,6 +23,8 @@ import android.os.Vibrator;
 import androidx.preference.Preference;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.NotificationPreferenceController;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 public class VibrationPreferenceController extends NotificationPreferenceController
diff --git a/src/com/android/settings/notification/VisibilityPreferenceController.java b/src/com/android/settings/notification/app/VisibilityPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/VisibilityPreferenceController.java
rename to src/com/android/settings/notification/app/VisibilityPreferenceController.java
index fe036e91835..74e42b0e7b6 100644
--- a/src/com/android/settings/notification/VisibilityPreferenceController.java
+++ b/src/com/android/settings/notification/app/VisibilityPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -32,6 +32,8 @@ import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.RestrictedListPreference;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.NotificationPreferenceController;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/history/NotificationStation.java
similarity index 99%
rename from src/com/android/settings/notification/NotificationStation.java
rename to src/com/android/settings/notification/history/NotificationStation.java
index 754dfa29261..b147c087279 100644
--- a/src/com/android/settings/notification/NotificationStation.java
+++ b/src/com/android/settings/notification/history/NotificationStation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.history;
 
 import static android.provider.Settings.EXTRA_APP_PACKAGE;
 import static android.provider.Settings.EXTRA_CHANNEL_ID;
diff --git a/src/com/android/settings/notification/AbstractZenCustomRulePreferenceController.java b/src/com/android/settings/notification/zen/AbstractZenCustomRulePreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/AbstractZenCustomRulePreferenceController.java
rename to src/com/android/settings/notification/zen/AbstractZenCustomRulePreferenceController.java
index 409eec62ece..e8675563547 100644
--- a/src/com/android/settings/notification/AbstractZenCustomRulePreferenceController.java
+++ b/src/com/android/settings/notification/zen/AbstractZenCustomRulePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java b/src/com/android/settings/notification/zen/AbstractZenModeAutomaticRulePreferenceController.java
similarity index 99%
rename from src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
rename to src/com/android/settings/notification/zen/AbstractZenModeAutomaticRulePreferenceController.java
index f7b32221ea2..f6f183995ec 100644
--- a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
+++ b/src/com/android/settings/notification/zen/AbstractZenModeAutomaticRulePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.app.NotificationManager;
diff --git a/src/com/android/settings/notification/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java
similarity index 99%
rename from src/com/android/settings/notification/AbstractZenModePreferenceController.java
rename to src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java
index 0e45e58c62d..6fa446bab8e 100644
--- a/src/com/android/settings/notification/AbstractZenModePreferenceController.java
+++ b/src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.ActivityManager;
 import android.app.AlarmManager;
diff --git a/src/com/android/settings/notification/SettingsZenDurationDialog.java b/src/com/android/settings/notification/zen/SettingsZenDurationDialog.java
similarity index 96%
rename from src/com/android/settings/notification/SettingsZenDurationDialog.java
rename to src/com/android/settings/notification/zen/SettingsZenDurationDialog.java
index 355d4836b0b..c8d6eb9735a 100644
--- a/src/com/android/settings/notification/SettingsZenDurationDialog.java
+++ b/src/com/android/settings/notification/zen/SettingsZenDurationDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/zen/ZenAccessSettings.java
similarity index 99%
rename from src/com/android/settings/notification/ZenAccessSettings.java
rename to src/com/android/settings/notification/zen/ZenAccessSettings.java
index d9c57c71dff..3379b9e3b2f 100644
--- a/src/com/android/settings/notification/ZenAccessSettings.java
+++ b/src/com/android/settings/notification/zen/ZenAccessSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.annotation.Nullable;
 import android.app.ActivityManager;
diff --git a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java b/src/com/android/settings/notification/zen/ZenAutomaticRuleHeaderPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenAutomaticRuleHeaderPreferenceController.java
index 73a03cbb3c5..4f6717b4611 100644
--- a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenAutomaticRuleHeaderPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static com.android.settings.widget.EntityHeaderController.PREF_KEY_APP_HEADER;
 
diff --git a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java b/src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java
index b9ed734680d..cafb0d10bc7 100644
--- a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java b/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreference.java
similarity index 98%
rename from src/com/android/settings/notification/ZenCustomRadioButtonPreference.java
rename to src/com/android/settings/notification/zen/ZenCustomRadioButtonPreference.java
index 000a7563206..57f48918995 100644
--- a/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java
+++ b/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/settings/notification/ZenCustomRuleBlockedEffectsSettings.java b/src/com/android/settings/notification/zen/ZenCustomRuleBlockedEffectsSettings.java
similarity index 98%
rename from src/com/android/settings/notification/ZenCustomRuleBlockedEffectsSettings.java
rename to src/com/android/settings/notification/zen/ZenCustomRuleBlockedEffectsSettings.java
index bb48c264735..0d6cf55a3d0 100644
--- a/src/com/android/settings/notification/ZenCustomRuleBlockedEffectsSettings.java
+++ b/src/com/android/settings/notification/zen/ZenCustomRuleBlockedEffectsSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenCustomRuleCallsSettings.java b/src/com/android/settings/notification/zen/ZenCustomRuleCallsSettings.java
similarity index 98%
rename from src/com/android/settings/notification/ZenCustomRuleCallsSettings.java
rename to src/com/android/settings/notification/zen/ZenCustomRuleCallsSettings.java
index 42e62c34db3..37cd5587672 100644
--- a/src/com/android/settings/notification/ZenCustomRuleCallsSettings.java
+++ b/src/com/android/settings/notification/zen/ZenCustomRuleCallsSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenCustomRuleConfigSettings.java b/src/com/android/settings/notification/zen/ZenCustomRuleConfigSettings.java
similarity index 99%
rename from src/com/android/settings/notification/ZenCustomRuleConfigSettings.java
rename to src/com/android/settings/notification/zen/ZenCustomRuleConfigSettings.java
index c39b4d500a0..7e31599050c 100644
--- a/src/com/android/settings/notification/ZenCustomRuleConfigSettings.java
+++ b/src/com/android/settings/notification/zen/ZenCustomRuleConfigSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager;
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/notification/ZenCustomRuleMessagesSettings.java b/src/com/android/settings/notification/zen/ZenCustomRuleMessagesSettings.java
similarity index 98%
rename from src/com/android/settings/notification/ZenCustomRuleMessagesSettings.java
rename to src/com/android/settings/notification/zen/ZenCustomRuleMessagesSettings.java
index 746dff3fab1..e592e75150f 100644
--- a/src/com/android/settings/notification/ZenCustomRuleMessagesSettings.java
+++ b/src/com/android/settings/notification/zen/ZenCustomRuleMessagesSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenCustomRuleNotificationsSettings.java b/src/com/android/settings/notification/zen/ZenCustomRuleNotificationsSettings.java
similarity index 98%
rename from src/com/android/settings/notification/ZenCustomRuleNotificationsSettings.java
rename to src/com/android/settings/notification/zen/ZenCustomRuleNotificationsSettings.java
index 9d7d5a3e750..e688e879444 100644
--- a/src/com/android/settings/notification/ZenCustomRuleNotificationsSettings.java
+++ b/src/com/android/settings/notification/zen/ZenCustomRuleNotificationsSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenCustomRuleSettings.java b/src/com/android/settings/notification/zen/ZenCustomRuleSettings.java
similarity index 97%
rename from src/com/android/settings/notification/ZenCustomRuleSettings.java
rename to src/com/android/settings/notification/zen/ZenCustomRuleSettings.java
index d7ca8c01e15..6ca18a0e362 100644
--- a/src/com/android/settings/notification/ZenCustomRuleSettings.java
+++ b/src/com/android/settings/notification/zen/ZenCustomRuleSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenCustomRuleSettingsBase.java b/src/com/android/settings/notification/zen/ZenCustomRuleSettingsBase.java
similarity index 98%
rename from src/com/android/settings/notification/ZenCustomRuleSettingsBase.java
rename to src/com/android/settings/notification/zen/ZenCustomRuleSettingsBase.java
index 94b0b7b9903..28a3046b608 100644
--- a/src/com/android/settings/notification/ZenCustomRuleSettingsBase.java
+++ b/src/com/android/settings/notification/zen/ZenCustomRuleSettingsBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenDeleteRuleDialog.java b/src/com/android/settings/notification/zen/ZenDeleteRuleDialog.java
similarity index 98%
rename from src/com/android/settings/notification/ZenDeleteRuleDialog.java
rename to src/com/android/settings/notification/zen/ZenDeleteRuleDialog.java
index 694fcbac0a2..057baa0a946 100644
--- a/src/com/android/settings/notification/ZenDeleteRuleDialog.java
+++ b/src/com/android/settings/notification/zen/ZenDeleteRuleDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/notification/ZenDurationDialogPreference.java b/src/com/android/settings/notification/zen/ZenDurationDialogPreference.java
similarity index 97%
rename from src/com/android/settings/notification/ZenDurationDialogPreference.java
rename to src/com/android/settings/notification/zen/ZenDurationDialogPreference.java
index 6d6d085cf99..2eee7b136e6 100644
--- a/src/com/android/settings/notification/ZenDurationDialogPreference.java
+++ b/src/com/android/settings/notification/zen/ZenDurationDialogPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 import android.content.DialogInterface;
diff --git a/src/com/android/settings/notification/ZenFooterPreferenceController.java b/src/com/android/settings/notification/zen/ZenFooterPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/ZenFooterPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenFooterPreferenceController.java
index 15a2252397c..3de76b7b77a 100644
--- a/src/com/android/settings/notification/ZenFooterPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenFooterPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager.Policy;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java b/src/com/android/settings/notification/zen/ZenModeAddAutomaticRulePreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeAddAutomaticRulePreferenceController.java
index c5ddf485816..34a42d6bc9f 100644
--- a/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeAddAutomaticRulePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeAlarmsPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeAlarmsPreferenceController.java
index 00e97364990..3d2a1b73893 100644
--- a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeAlarmsPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager.Policy;
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java
index ee7868cfe5e..6000eadc4b4 100644
--- a/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.Application;
 import android.app.NotificationChannel;
@@ -33,6 +33,8 @@ import com.android.settings.R;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.notification.app.ChannelNotificationSettings;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.widget.apppreference.AppPreference;
diff --git a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceController.java
index 2f62f4539bd..c6d735c1d16 100644
--- a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeAutomationPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/ZenModeAutomationPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeAutomationPreferenceController.java
index 4220a42c7fd..2c6c1a37be8 100644
--- a/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeAutomationPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 
diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/zen/ZenModeAutomationSettings.java
similarity index 99%
rename from src/com/android/settings/notification/ZenModeAutomationSettings.java
rename to src/com/android/settings/notification/zen/ZenModeAutomationSettings.java
index 283a9299ecc..31a4ba78550 100644
--- a/src/com/android/settings/notification/ZenModeAutomationSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeAutomationSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AlertDialog;
 import android.app.AutomaticZenRule;
diff --git a/src/com/android/settings/notification/ZenModeBackend.java b/src/com/android/settings/notification/zen/ZenModeBackend.java
similarity index 99%
rename from src/com/android/settings/notification/ZenModeBackend.java
rename to src/com/android/settings/notification/zen/ZenModeBackend.java
index fe9df18e9e5..1f512db44ee 100644
--- a/src/com/android/settings/notification/ZenModeBackend.java
+++ b/src/com/android/settings/notification/zen/ZenModeBackend.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF;
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;
diff --git a/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceController.java
index e9f74d2880c..9332c9b0c2b 100644
--- a/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.ComponentName;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeBlockedEffectsPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeBlockedEffectsPreferenceController.java
index 08c4ca7975b..38676c5de25 100644
--- a/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeBlockedEffectsPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 
diff --git a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java b/src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java
rename to src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java
index 61d41f9db8e..c2962dc83bc 100644
--- a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT;
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
diff --git a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/ZenModeButtonPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
index a8d03ea4394..270fb73dd05 100644
--- a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -27,6 +27,7 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.SettingsEnableZenModeDialog;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.widget.LayoutPreference;
 
diff --git a/src/com/android/settings/notification/ZenModeBypassingAppsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java
similarity index 90%
rename from src/com/android/settings/notification/ZenModeBypassingAppsPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java
index 33e03d954d0..9ef9380a745 100644
--- a/src/com/android/settings/notification/ZenModeBypassingAppsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java
@@ -1,9 +1,10 @@
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 import android.os.UserHandle;
 
 import com.android.settings.R;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class ZenModeBypassingAppsPreferenceController extends AbstractZenModePreferenceController {
diff --git a/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java b/src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeBypassingAppsSettings.java
rename to src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java
index 1518ba88a49..bd1a041d040 100644
--- a/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.Activity;
 import android.app.Application;
diff --git a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeCallsPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/ZenModeCallsPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeCallsPreferenceController.java
index d931f6c6fe2..5f3944931f8 100644
--- a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeCallsPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenModeCallsSettings.java b/src/com/android/settings/notification/zen/ZenModeCallsSettings.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeCallsSettings.java
rename to src/com/android/settings/notification/zen/ZenModeCallsSettings.java
index 9211f1992b5..d2f1c04661c 100644
--- a/src/com/android/settings/notification/ZenModeCallsSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeCallsSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS;
 
diff --git a/src/com/android/settings/notification/ZenModeDurationPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/ZenModeDurationPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java
index 3972bb106df..f5d21a2edc7 100644
--- a/src/com/android/settings/notification/ZenModeDurationPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 
diff --git a/src/com/android/settings/notification/ZenModeEventRuleSettings.java b/src/com/android/settings/notification/zen/ZenModeEventRuleSettings.java
similarity index 99%
rename from src/com/android/settings/notification/ZenModeEventRuleSettings.java
rename to src/com/android/settings/notification/zen/ZenModeEventRuleSettings.java
index 4a1a34290b1..3c4930184fe 100644
--- a/src/com/android/settings/notification/ZenModeEventRuleSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeEventRuleSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeEventsPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeEventsPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeEventsPreferenceController.java
index 9a45a903474..080c31f5ca2 100644
--- a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeEventsPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager.Policy;
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/notification/ZenModeMediaPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeMediaPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeMediaPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeMediaPreferenceController.java
index 2bec84f9c75..51bceb178c0 100644
--- a/src/com/android/settings/notification/ZenModeMediaPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeMediaPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager.Policy;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeMessagesPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/ZenModeMessagesPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeMessagesPreferenceController.java
index d51be27a206..ba91f560dcc 100644
--- a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeMessagesPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenModeMessagesSettings.java b/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeMessagesSettings.java
rename to src/com/android/settings/notification/zen/ZenModeMessagesSettings.java
index f995bb09949..04e83101691 100644
--- a/src/com/android/settings/notification/ZenModeMessagesSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
 
diff --git a/src/com/android/settings/notification/ZenModePreferenceController.java b/src/com/android/settings/notification/zen/ZenModePreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModePreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModePreferenceController.java
index 44ad2ffb6d1..24cf158c966 100644
--- a/src/com/android/settings/notification/ZenModePreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.ContentResolver;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenModePriorityCallsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModePriorityCallsPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModePriorityCallsPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModePriorityCallsPreferenceController.java
index cec97f5c5d2..780cf840b1b 100644
--- a/src/com/android/settings/notification/ZenModePriorityCallsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModePriorityCallsPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceController.java b/src/com/android/settings/notification/zen/ZenModePriorityMessagesPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModePriorityMessagesPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModePriorityMessagesPreferenceController.java
index 752edf2f699..f54179e7575 100644
--- a/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModePriorityMessagesPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeRemindersPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeRemindersPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeRemindersPreferenceController.java
index 8e64be3d4d6..fede486a02e 100644
--- a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeRemindersPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager;
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceController.java
index d658d5fbb37..c015ed64fec 100644
--- a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager.Policy;
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java b/src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java
similarity index 97%
rename from src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java
rename to src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java
index 2d58ed9c6ae..f121430738a 100644
--- a/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.os.Bundle;
-import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/zen/ZenModeRuleSettingsBase.java
similarity index 99%
rename from src/com/android/settings/notification/ZenModeRuleSettingsBase.java
rename to src/com/android/settings/notification/zen/ZenModeRuleSettingsBase.java
index 46162a8f170..d2310c3c2e0 100644
--- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
+++ b/src/com/android/settings/notification/zen/ZenModeRuleSettingsBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.app.NotificationManager;
diff --git a/src/com/android/settings/notification/ZenModeScheduleDaysSelection.java b/src/com/android/settings/notification/zen/ZenModeScheduleDaysSelection.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeScheduleDaysSelection.java
rename to src/com/android/settings/notification/zen/ZenModeScheduleDaysSelection.java
index fdf47070c5c..98dfd379a30 100644
--- a/src/com/android/settings/notification/ZenModeScheduleDaysSelection.java
+++ b/src/com/android/settings/notification/zen/ZenModeScheduleDaysSelection.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 import android.util.SparseBooleanArray;
diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java
similarity index 99%
rename from src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
rename to src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java
index e879ece78bf..5b02b3b0c18 100644
--- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.app.Dialog;
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/zen/ZenModeSettings.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeSettings.java
rename to src/com/android/settings/notification/zen/ZenModeSettings.java
index 46e029a0095..cdcb55861c6 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS;
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS;
@@ -30,7 +30,6 @@ import android.app.NotificationManager;
 import android.app.NotificationManager.Policy;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.service.notification.ZenModeConfig;
 
@@ -39,13 +38,11 @@ import androidx.fragment.app.FragmentManager;
 
 import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.Indexable;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
diff --git a/src/com/android/settings/notification/ZenModeSettingsBase.java b/src/com/android/settings/notification/zen/ZenModeSettingsBase.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeSettingsBase.java
rename to src/com/android/settings/notification/zen/ZenModeSettingsBase.java
index 3f538794836..705e827035b 100644
--- a/src/com/android/settings/notification/ZenModeSettingsBase.java
+++ b/src/com/android/settings/notification/zen/ZenModeSettingsBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 import android.database.ContentObserver;
diff --git a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceController.java
similarity index 99%
rename from src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceController.java
index e7ce1ddddf5..ca6eb42e562 100644
--- a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.Dialog;
 import android.app.NotificationManager;
diff --git a/src/com/android/settings/notification/ZenModeSliceBuilder.java b/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
similarity index 99%
rename from src/com/android/settings/notification/ZenModeSliceBuilder.java
rename to src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
index 11094042848..fe1e20461e9 100644
--- a/src/com/android/settings/notification/ZenModeSliceBuilder.java
+++ b/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
 
diff --git a/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java b/src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java
similarity index 97%
rename from src/com/android/settings/notification/ZenModeSoundVibrationSettings.java
rename to src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java
index 4e8dcd8cd8d..3d4f3c2206f 100644
--- a/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeStarredContactsPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeStarredContactsPreferenceController.java
index 05b1474f854..80fae970138 100644
--- a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeStarredContactsPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS;
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
diff --git a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeSystemPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeSystemPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeSystemPreferenceController.java
index c2f40602862..a170a782880 100644
--- a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeSystemPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager.Policy;
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeVisEffectPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeVisEffectPreferenceController.java
index e3098f0e22f..86d812873bb 100644
--- a/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeVisEffectPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java
index 14285d664a8..f729be8bed3 100644
--- a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager.Policy;
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java
index 837f999bd8c..a772eb5e734 100644
--- a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager;
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java
rename to src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java
index 4a58c6241e5..84037b9952f 100644
--- a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager.Policy;
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/notification/ZenModeVoiceActivity.java b/src/com/android/settings/notification/zen/ZenModeVoiceActivity.java
similarity index 99%
rename from src/com/android/settings/notification/ZenModeVoiceActivity.java
rename to src/com/android/settings/notification/zen/ZenModeVoiceActivity.java
index 0a52c3da0b4..e107fdc3e75 100644
--- a/src/com/android/settings/notification/ZenModeVoiceActivity.java
+++ b/src/com/android/settings/notification/zen/ZenModeVoiceActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_ENABLED;
 import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_MINUTES;
diff --git a/src/com/android/settings/notification/ZenOnboardingActivity.java b/src/com/android/settings/notification/zen/ZenOnboardingActivity.java
similarity index 99%
rename from src/com/android/settings/notification/ZenOnboardingActivity.java
rename to src/com/android/settings/notification/zen/ZenOnboardingActivity.java
index 87411c2b9ab..20cd1434086 100644
--- a/src/com/android/settings/notification/ZenOnboardingActivity.java
+++ b/src/com/android/settings/notification/zen/ZenOnboardingActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.Activity;
 import android.app.NotificationManager;
diff --git a/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleButtonsPreferenceController.java
similarity index 99%
rename from src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenRuleButtonsPreferenceController.java
index a014ec90683..1b57fed4e6e 100644
--- a/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleButtonsPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/notification/ZenRuleCallsPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleCallsPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenRuleCallsPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenRuleCallsPreferenceController.java
index 87f2db2e2c2..ace985fe36f 100644
--- a/src/com/android/settings/notification/ZenRuleCallsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleCallsPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenRuleCustomPolicyPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenRuleCustomPolicyPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java
index 527803df477..56b98ff2256 100644
--- a/src/com/android/settings/notification/ZenRuleCustomPolicyPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenRuleCustomSwitchPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleCustomSwitchPreferenceController.java
similarity index 96%
rename from src/com/android/settings/notification/ZenRuleCustomSwitchPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenRuleCustomSwitchPreferenceController.java
index 69aa81e5a67..e54a61495fb 100644
--- a/src/com/android/settings/notification/ZenRuleCustomSwitchPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleCustomSwitchPreferenceController.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
-import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.service.notification.ZenPolicy;
 import android.util.Log;
diff --git a/src/com/android/settings/notification/ZenRuleDefaultPolicyPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/ZenRuleDefaultPolicyPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java
index b4036fad52a..268156b5167 100644
--- a/src/com/android/settings/notification/ZenRuleDefaultPolicyPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenRuleInfo.java b/src/com/android/settings/notification/zen/ZenRuleInfo.java
similarity index 97%
rename from src/com/android/settings/notification/ZenRuleInfo.java
rename to src/com/android/settings/notification/zen/ZenRuleInfo.java
index 1a1539b6a3d..a4c4de097cb 100644
--- a/src/com/android/settings/notification/ZenRuleInfo.java
+++ b/src/com/android/settings/notification/zen/ZenRuleInfo.java
@@ -1,4 +1,4 @@
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.ComponentName;
 import android.net.Uri;
diff --git a/src/com/android/settings/notification/ZenRuleMessagesPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleMessagesPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenRuleMessagesPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenRuleMessagesPreferenceController.java
index 59ad3a89eba..43820942a57 100644
--- a/src/com/android/settings/notification/ZenRuleMessagesPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleMessagesPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenRuleNameDialog.java b/src/com/android/settings/notification/zen/ZenRuleNameDialog.java
similarity index 99%
rename from src/com/android/settings/notification/ZenRuleNameDialog.java
rename to src/com/android/settings/notification/zen/ZenRuleNameDialog.java
index edb303535f4..222e1440e5a 100644
--- a/src/com/android/settings/notification/ZenRuleNameDialog.java
+++ b/src/com/android/settings/notification/zen/ZenRuleNameDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/notification/ZenRuleNotifFooterPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleNotifFooterPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/ZenRuleNotifFooterPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenRuleNotifFooterPreferenceController.java
index 678bf90edaf..2364327da00 100644
--- a/src/com/android/settings/notification/ZenRuleNotifFooterPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleNotifFooterPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 
diff --git a/src/com/android/settings/notification/ZenRulePreference.java b/src/com/android/settings/notification/zen/ZenRulePreference.java
similarity index 99%
rename from src/com/android/settings/notification/ZenRulePreference.java
rename to src/com/android/settings/notification/zen/ZenRulePreference.java
index d282f893ebd..1f1283d90c9 100644
--- a/src/com/android/settings/notification/ZenRulePreference.java
+++ b/src/com/android/settings/notification/zen/ZenRulePreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.content.ComponentName;
diff --git a/src/com/android/settings/notification/ZenRuleRepeatCallersPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleRepeatCallersPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenRuleRepeatCallersPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenRuleRepeatCallersPreferenceController.java
index 7f3b0638de0..b4eabbb949b 100644
--- a/src/com/android/settings/notification/ZenRuleRepeatCallersPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleRepeatCallersPreferenceController.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenRuleSelectionDialog.java b/src/com/android/settings/notification/zen/ZenRuleSelectionDialog.java
similarity index 99%
rename from src/com/android/settings/notification/ZenRuleSelectionDialog.java
rename to src/com/android/settings/notification/zen/ZenRuleSelectionDialog.java
index 5b4b35ba743..b159a015d6e 100644
--- a/src/com/android/settings/notification/ZenRuleSelectionDialog.java
+++ b/src/com/android/settings/notification/zen/ZenRuleSelectionDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.Dialog;
 import android.app.NotificationManager;
diff --git a/src/com/android/settings/notification/ZenRuleStarredContactsPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenRuleStarredContactsPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceController.java
index 4a6c1c2688c..a6de68c2546 100644
--- a/src/com/android/settings/notification/ZenRuleStarredContactsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/com/android/settings/notification/ZenRuleVisEffectPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleVisEffectPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/ZenRuleVisEffectPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenRuleVisEffectPreferenceController.java
index f5791510b65..1fc43c2fa1a 100644
--- a/src/com/android/settings/notification/ZenRuleVisEffectPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleVisEffectPreferenceController.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
-import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.service.notification.ZenPolicy;
 import android.util.Pair;
diff --git a/src/com/android/settings/notification/ZenRuleVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/ZenRuleVisEffectsAllPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java
index 7b7eae2b2ae..fb46209e913 100644
--- a/src/com/android/settings/notification/ZenRuleVisEffectsAllPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenRuleVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java
similarity index 98%
rename from src/com/android/settings/notification/ZenRuleVisEffectsCustomPreferenceController.java
rename to src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java
index 2314c5ab8f2..68ab818620f 100644
--- a/src/com/android/settings/notification/ZenRuleVisEffectsCustomPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenRuleVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java
similarity index 97%
rename from src/com/android/settings/notification/ZenRuleVisEffectsNonePreferenceController.java
rename to src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java
index 875fb43e0bd..cb3e690fcd0 100644
--- a/src/com/android/settings/notification/ZenRuleVisEffectsNonePreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/notification/ZenSuggestionActivity.java b/src/com/android/settings/notification/zen/ZenSuggestionActivity.java
similarity index 93%
rename from src/com/android/settings/notification/ZenSuggestionActivity.java
rename to src/com/android/settings/notification/zen/ZenSuggestionActivity.java
index 9d2148c7e50..728b1717f06 100644
--- a/src/com/android/settings/notification/ZenSuggestionActivity.java
+++ b/src/com/android/settings/notification/zen/ZenSuggestionActivity.java
@@ -1,4 +1,4 @@
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/src/com/android/settings/slices/CustomSliceRegistry.java b/src/com/android/settings/slices/CustomSliceRegistry.java
index a019687011b..66cc600f1e2 100644
--- a/src/com/android/settings/slices/CustomSliceRegistry.java
+++ b/src/com/android/settings/slices/CustomSliceRegistry.java
@@ -45,7 +45,7 @@ import com.android.settings.location.LocationSlice;
 import com.android.settings.media.MediaOutputIndicatorSlice;
 import com.android.settings.media.MediaOutputSlice;
 import com.android.settings.network.telephony.MobileDataSlice;
-import com.android.settings.notification.ZenModeButtonPreferenceController;
+import com.android.settings.notification.zen.ZenModeButtonPreferenceController;
 import com.android.settings.wifi.calling.WifiCallingSliceHelper;
 import com.android.settings.wifi.slice.ContextualWifiSlice;
 import com.android.settings.wifi.slice.WifiSlice;
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index d9088811ff9..bed0532f89e 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -46,7 +46,7 @@ import androidx.slice.SliceProvider;
 import com.android.settings.R;
 import com.android.settings.bluetooth.BluetoothSliceBuilder;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.notification.ZenModeSliceBuilder;
+import com.android.settings.notification.zen.ZenModeSliceBuilder;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.SliceBroadcastRelay;
 import com.android.settingslib.utils.ThreadUtils;
diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java
index b44bc228d47..92e373fb0df 100644
--- a/src/com/android/settings/slices/SliceBroadcastReceiver.java
+++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java
@@ -18,7 +18,7 @@ package com.android.settings.slices;
 
 import static com.android.settings.bluetooth.BluetoothSliceBuilder.ACTION_BLUETOOTH_SLICE_CHANGED;
 import static com.android.settings.network.telephony.Enhanced4gLteSliceHelper.ACTION_ENHANCED_4G_LTE_CHANGED;
-import static com.android.settings.notification.ZenModeSliceBuilder.ACTION_ZEN_MODE_SLICE_CHANGED;
+import static com.android.settings.notification.zen.ZenModeSliceBuilder.ACTION_ZEN_MODE_SLICE_CHANGED;
 import static com.android.settings.slices.SettingsSliceProvider.ACTION_COPY;
 import static com.android.settings.slices.SettingsSliceProvider.ACTION_SLIDER_CHANGED;
 import static com.android.settings.slices.SettingsSliceProvider.ACTION_TOGGLE_CHANGED;
@@ -41,7 +41,7 @@ import com.android.settings.bluetooth.BluetoothSliceBuilder;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.SliderPreferenceController;
 import com.android.settings.core.TogglePreferenceController;
-import com.android.settings.notification.ZenModeSliceBuilder;
+import com.android.settings.notification.zen.ZenModeSliceBuilder;
 import com.android.settings.overlay.FeatureFactory;
 
 /**
diff --git a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
index cf8688a983a..ce036d25d8f 100644
--- a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
+++ b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
@@ -23,7 +23,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.settings.bluetooth.BluetoothSliceBuilder;
-import com.android.settings.notification.ZenModeSliceBuilder;
+import com.android.settings.notification.zen.ZenModeSliceBuilder;
 
 public class SliceDeepLinkSpringBoard extends Activity {
 
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
index b14fdac292c..31f22fd3ef5 100644
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ b/tests/robotests/assets/grandfather_not_implementing_index_provider
@@ -57,18 +57,18 @@ com.android.settings.localepicker.LocaleListEditor
 com.android.settings.network.ApnEditor
 com.android.settings.network.ApnSettings
 com.android.settings.network.telephony.NetworkSelectSettings
-com.android.settings.notification.AppNotificationSettings
-com.android.settings.notification.ChannelNotificationSettings
-com.android.settings.notification.NotificationStation
+com.android.settings.notification.app.AppNotificationSettings
+com.android.settings.notification.app.ChannelNotificationSettings
+com.android.settings.notification.history.NotificationStation
 com.android.settings.notification.RedactionInterstitial$RedactionInterstitialFragment
-com.android.settings.notification.ZenModeEventRuleSettings
-com.android.settings.notification.ZenModeScheduleRuleSettings
-com.android.settings.notification.ZenCustomRuleNotificationsSettings
-com.android.settings.notification.ZenCustomRuleCallsSettings
-com.android.settings.notification.ZenCustomRuleConfigSettings
-com.android.settings.notification.ZenCustomRuleSettings
-com.android.settings.notification.ZenCustomRuleBlockedEffectsSettings
-com.android.settings.notification.ZenCustomRuleMessagesSettings
+com.android.settings.notification.zen.ZenModeEventRuleSettings
+com.android.settings.notification.zen.ZenModeScheduleRuleSettings
+com.android.settings.notification.zen.ZenCustomRuleNotificationsSettings
+com.android.settings.notification.zen.ZenCustomRuleCallsSettings
+com.android.settings.notification.zen.ZenCustomRuleConfigSettings
+com.android.settings.notification.zen.ZenCustomRuleSettings
+com.android.settings.notification.zen.ZenCustomRuleBlockedEffectsSettings
+com.android.settings.notification.zen.ZenCustomRuleMessagesSettings
 com.android.settings.password.ChooseLockGeneric$ChooseLockGenericFragment
 com.android.settings.password.SetupChooseLockGeneric$InternalActivity$InternalSetupChooseLockGenericFragment
 com.android.settings.password.SetupChooseLockGeneric$SetupChooseLockGenericFragment
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java
index 5e88aafa7f8..71ba7535089 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java
@@ -35,7 +35,7 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.notification.AppNotificationSettings;
+import com.android.settings.notification.app.AppNotificationSettings;
 import com.android.settingslib.applications.ApplicationsState;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
index 60352ae545c..3b366ca8fa1 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
@@ -35,7 +35,7 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.notification.AppNotificationSettings;
+import com.android.settings.notification.app.AppNotificationSettings;
 import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.applications.ApplicationsState;
 
diff --git a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/AllowSoundPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/AllowSoundPreferenceControllerTest.java
index f59ef850eaf..d8292862cde 100644
--- a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/AllowSoundPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
 import static android.app.NotificationManager.IMPORTANCE_HIGH;
@@ -40,6 +40,7 @@ import android.os.UserManager;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 
diff --git a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/AppLinkPreferenceControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/AppLinkPreferenceControllerTest.java
index 9cc1c072938..c48f142bfeb 100644
--- a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/AppLinkPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
 import static android.app.NotificationManager.IMPORTANCE_LOW;
@@ -35,6 +35,9 @@ import android.os.UserManager;
 
 import androidx.preference.Preference;
 
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.AppLinkPreferenceController;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BadgePreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/BadgePreferenceControllerTest.java
index 6de55652c77..5dfd393095b 100644
--- a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/BadgePreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
 import static android.app.NotificationManager.IMPORTANCE_HIGH;
@@ -43,6 +43,8 @@ import android.provider.Settings;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.BadgePreferenceController;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 
diff --git a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java
index 4c22a6d4cf8..d819a186de1 100644
--- a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
@@ -44,6 +44,9 @@ import android.content.Context;
 import android.os.UserManager;
 
 import com.android.settings.R;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.BlockPreferenceController;
+import com.android.settings.notification.app.NotificationSettings;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.widget.LayoutPreference;
 
diff --git a/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java
index 470cc27e6f2..5fd51235a91 100644
--- a/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
 import static android.app.NotificationManager.IMPORTANCE_HIGH;
@@ -22,8 +22,8 @@ import static android.app.NotificationManager.IMPORTANCE_LOW;
 import static android.app.NotificationManager.IMPORTANCE_NONE;
 import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
 
-import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_OFF;
-import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_ON;
+import static com.android.settings.notification.app.BubblePreferenceController.SYSTEM_WIDE_OFF;
+import static com.android.settings.notification.app.BubblePreferenceController.SYSTEM_WIDE_ON;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -44,6 +44,8 @@ import android.content.Context;
 import android.os.UserManager;
 import android.provider.Settings;
 
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.BubblePreferenceController;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 
diff --git a/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java
similarity index 88%
rename from tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java
index 2710203c143..1bd960009f8 100644
--- a/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java
@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
 import static android.app.NotificationManager.IMPORTANCE_HIGH;
-import static android.app.NotificationManager.IMPORTANCE_LOW;
-import static android.app.NotificationManager.IMPORTANCE_NONE;
 import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
 
-import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_OFF;
-import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_ON;
+import static com.android.settings.notification.app.BubbleSummaryPreferenceController.SYSTEM_WIDE_OFF;
+import static com.android.settings.notification.app.BubbleSummaryPreferenceController.SYSTEM_WIDE_ON;
 
 import static junit.framework.TestCase.assertEquals;
 
@@ -31,27 +29,22 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.app.NotificationChannel;
-import android.app.NotificationManager;
 import android.content.Context;
-import android.os.UserManager;
 import android.provider.Settings;
 
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.BubbleSummaryPreferenceController;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -59,7 +52,6 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.shadows.ShadowApplication;
 
 import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
 
 @RunWith(RobolectricTestRunner.class)
 public class BubbleSummaryPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/DeletedChannelsPreferenceControllerTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/DeletedChannelsPreferenceControllerTest.java
index d9929c430de..c2868cee697 100644
--- a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/DeletedChannelsPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -34,6 +34,9 @@ import android.os.UserManager;
 
 import androidx.preference.Preference;
 
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.DeletedChannelsPreferenceController;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/DescriptionPreferenceControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/DescriptionPreferenceControllerTest.java
index ff6ff91eaee..e078e58ef07 100644
--- a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/DescriptionPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationManager.IMPORTANCE_LOW;
 import static android.app.NotificationManager.IMPORTANCE_NONE;
@@ -34,6 +34,9 @@ import android.os.UserManager;
 
 import androidx.preference.Preference;
 
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.DescriptionPreferenceController;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/DndPreferenceControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/DndPreferenceControllerTest.java
index f6636301ece..2f1b913cadd 100644
--- a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/DndPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
 import static android.app.NotificationManager.IMPORTANCE_HIGH;
@@ -40,6 +40,8 @@ import android.os.UserManager;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.DndPreferenceController;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 
diff --git a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/HeaderPreferenceControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/HeaderPreferenceControllerTest.java
index 7f6ecaefc67..7b8ad48b615 100644
--- a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/HeaderPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationManager.IMPORTANCE_NONE;
 
@@ -36,6 +36,8 @@ import android.view.View;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.HeaderPreferenceController;
 import com.android.settingslib.widget.LayoutPreference;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/HighImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/HighImportancePreferenceControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/notification/HighImportancePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/HighImportancePreferenceControllerTest.java
index db2eca0afab..bed6ccc2c7e 100644
--- a/tests/robotests/src/com/android/settings/notification/HighImportancePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/HighImportancePreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
@@ -35,6 +35,9 @@ import android.app.NotificationManager;
 import android.content.Context;
 import android.os.UserManager;
 
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.HighImportancePreferenceController;
+import com.android.settings.notification.app.NotificationSettings;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 
diff --git a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceControllerTest.java
index 9b91a07b837..b8fc6c40b94 100644
--- a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
@@ -45,6 +45,10 @@ import android.os.UserManager;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.ImportancePreference;
+import com.android.settings.notification.app.ImportancePreferenceController;
+import com.android.settings.notification.app.NotificationSettings;
 import com.android.settingslib.RestrictedLockUtils;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceTest.java b/tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/ImportancePreferenceTest.java
rename to tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceTest.java
index 75b369a6e2b..39a5714f224 100644
--- a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
 import static android.app.NotificationManager.IMPORTANCE_LOW;
@@ -31,12 +31,10 @@ import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.android.settings.R;
+import com.android.settings.notification.app.ImportancePreference;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/LightsPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/LightsPreferenceControllerTest.java
index ac9cdf1644d..547880e15c1 100644
--- a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/LightsPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
@@ -41,6 +41,8 @@ import android.provider.Settings;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.LightsPreferenceController;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
diff --git a/tests/robotests/src/com/android/settings/notification/MinImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/MinImportancePreferenceControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/notification/MinImportancePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/MinImportancePreferenceControllerTest.java
index abed4aa8dae..2a06fa80c40 100644
--- a/tests/robotests/src/com/android/settings/notification/MinImportancePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/MinImportancePreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
 import static android.app.NotificationManager.IMPORTANCE_LOW;
@@ -35,6 +35,9 @@ import android.app.NotificationManager;
 import android.content.Context;
 import android.os.UserManager;
 
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.MinImportancePreferenceController;
+import com.android.settings.notification.app.NotificationSettings;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/app/NotificationAppPreferenceTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java
rename to tests/robotests/src/com/android/settings/notification/app/NotificationAppPreferenceTest.java
index 4b2c74e8d7d..c8c73964116 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/NotificationAppPreferenceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -31,6 +31,7 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
+import com.android.settings.notification.app.NotificationAppPreference;
 import com.android.settingslib.RestrictedLockUtils;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java
index b024cee3632..6a6818f34ff 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
 import static android.app.NotificationManager.IMPORTANCE_HIGH;
@@ -41,6 +41,8 @@ import android.os.UserManager;
 
 import androidx.preference.Preference;
 
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.NotificationPreferenceController;
 import com.android.settingslib.RestrictedLockUtils;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/NotificationsOffPreferenceControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/NotificationsOffPreferenceControllerTest.java
index 1f317d974e1..6dd71a3162b 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/NotificationsOffPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationManager.IMPORTANCE_NONE;
 
@@ -32,6 +32,9 @@ import android.os.UserManager;
 
 import androidx.preference.Preference;
 
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.NotificationsOffPreferenceController;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/SoundPreferenceControllerTest.java
similarity index 99%
rename from tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/SoundPreferenceControllerTest.java
index 3e727e9199f..ba4b5f0e1c4 100644
--- a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/SoundPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
@@ -50,6 +50,7 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedLockUtils;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/VibrationPreferenceControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/VibrationPreferenceControllerTest.java
index 786b713b272..38d4dce0210 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/VibrationPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
@@ -41,6 +41,8 @@ import android.os.Vibrator;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.VibrationPreferenceController;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 
diff --git a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/VisibilityPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/app/VisibilityPreferenceControllerTest.java
index 20454009c66..9de12ceb3ec 100644
--- a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/VisibilityPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.Notification.VISIBILITY_PRIVATE;
 import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
@@ -47,6 +47,8 @@ import android.provider.Settings;
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.RestrictedListPreference;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.VisibilityPreferenceController;
 import com.android.settings.testutils.shadow.ShadowRestrictionUtils;
 import com.android.settingslib.RestrictedLockUtils;
 
diff --git a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreferenceTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreferenceTest.java
index 8e53aa66191..f6e51cd8664 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreferenceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -29,6 +29,7 @@ import android.widget.RadioButton;
 import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
+import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenFooterPreferenceControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenFooterPreferenceControllerTest.java
index a6288b3fd41..90f56f4c273 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenFooterPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT;
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
@@ -38,6 +38,8 @@ import android.content.Context;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settings.notification.zen.ZenFooterPreferenceController;
+import com.android.settings.notification.zen.ZenModeBackend;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.widget.FooterPreference;
 
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAlarmsPreferenceControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeAlarmsPreferenceControllerTest.java
index cfeae7da978..7289a5af801 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAlarmsPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.provider.Settings.Global.ZEN_MODE;
 import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -30,6 +30,8 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.provider.Settings;
 
+import com.android.settings.notification.zen.ZenModeAlarmsPreferenceController;
+import com.android.settings.notification.zen.ZenModeBackend;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceControllerTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceControllerTest.java
index bf3057e45e6..c2d54f4c8c1 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -30,6 +30,8 @@ import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ParceledListSlice;
 
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.zen.ZenModeAllBypassingAppsPreferenceController;
 import com.android.settingslib.applications.ApplicationsState;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java
index 41227c5349e..b2a54ca4455 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -34,6 +34,10 @@ import androidx.fragment.app.Fragment;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.notification.zen.ZenModeAutomaticRulesPreferenceController;
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenRulePreference;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBackendTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBackendTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/ZenModeBackendTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeBackendTest.java
index 6cf19a629a5..c4ece5ad0c7 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeBackendTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBackendTest.java
@@ -1,4 +1,4 @@
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -15,6 +15,8 @@ import android.database.Cursor;
 import android.provider.Settings;
 import android.service.notification.ZenModeConfig;
 
+import com.android.settings.notification.zen.ZenModeBackend;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java
index 2c78f2d3bf4..c9af06db438 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.provider.Settings.Global.ZEN_MODE;
 import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -42,7 +42,8 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper;
+import com.android.settings.notification.zen.AbstractZenModePreferenceController.ZenModeConfigWrapper;
+import com.android.settings.notification.zen.ZenModeBehaviorFooterPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBlockedEffectsPreferenceControllerTest.java
similarity index 92%
rename from tests/robotests/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeBlockedEffectsPreferenceControllerTest.java
index 448800f1af1..b4829b33bc3 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBlockedEffectsPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -24,6 +24,8 @@ import static org.mockito.Mockito.when;
 import android.app.NotificationManager;
 import android.content.Context;
 
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModeBlockedEffectsPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeButtonPreferenceControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeButtonPreferenceControllerTest.java
index 1071b4847f0..12004026078 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeButtonPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.provider.Settings.Global.ZEN_MODE;
 import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -37,6 +37,8 @@ import androidx.fragment.app.FragmentManager;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModeButtonPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBypassingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java
similarity index 91%
rename from tests/robotests/src/com/android/settings/notification/ZenModeBypassingAppsPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java
index 9c27356fa19..8760d4ce180 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeBypassingAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -24,6 +24,8 @@ import static org.mockito.Mockito.when;
 
 import android.content.Context;
 
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.zen.ZenModeBypassingAppsPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeCallsPreferenceControllerTest.java
similarity index 93%
rename from tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeCallsPreferenceControllerTest.java
index a25a3937b8c..25e9747a395 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeCallsPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -25,6 +25,8 @@ import static org.mockito.Mockito.when;
 import android.app.NotificationManager;
 import android.content.Context;
 
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModeCallsPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java
similarity index 94%
rename from tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java
index 1488d7998d1..a8e583fcaf6 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
@@ -26,6 +26,8 @@ import android.content.Context;
 import android.provider.Settings;
 
 import com.android.settings.R;
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModeDurationPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeEventRuleSettingsTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeEventRuleSettingsTest.java
index 502992303ea..0c49850f5b6 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeEventRuleSettingsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -32,6 +32,7 @@ import android.content.res.Resources;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
+import com.android.settings.notification.zen.ZenModeEventRuleSettings;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeEventsPreferenceControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeEventsPreferenceControllerTest.java
index 2e54d08b27c..026976e7ae3 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeEventsPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.provider.Settings.Global.ZEN_MODE;
 import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -33,6 +33,8 @@ import android.provider.Settings;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
 
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModeEventsPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeMediaPreferenceControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeMediaPreferenceControllerTest.java
index 2489d174624..b1e369f3129 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeMediaPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.provider.Settings.Global.ZEN_MODE;
 import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -33,6 +33,8 @@ import android.provider.Settings;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
 
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModeMediaPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeMessagesPreferenceControllerTest.java
similarity index 93%
rename from tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeMessagesPreferenceControllerTest.java
index 808766da22e..82a582b5125 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeMessagesPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -27,6 +27,8 @@ import android.content.Context;
 
 import androidx.preference.Preference;
 
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModeMessagesPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java
index adecd98eafb..ef2040610f4 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
 
@@ -34,6 +34,8 @@ import android.content.Context;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.notification.zen.ZenModePreferenceController;
+import com.android.settings.notification.zen.ZenModeSettings;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePriorityCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityCallsPreferenceControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/notification/ZenModePriorityCallsPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityCallsPreferenceControllerTest.java
index 6b9f643e610..e4490d53a99 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModePriorityCallsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityCallsPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.provider.Settings.Global.ZEN_MODE;
 import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -34,6 +34,8 @@ import androidx.preference.ListPreference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModePriorityCallsPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -46,9 +48,6 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
 @RunWith(RobolectricTestRunner.class)
 public class ZenModePriorityCallsPreferenceControllerTest {
 
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityMessagesPreferenceControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityMessagesPreferenceControllerTest.java
index 83bf3e4d1f4..3ecd22acef3 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityMessagesPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.provider.Settings.Global.ZEN_MODE;
 import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -34,6 +34,8 @@ import androidx.preference.ListPreference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModePriorityMessagesPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -46,9 +48,6 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
 @RunWith(RobolectricTestRunner.class)
 public class ZenModePriorityMessagesPreferenceControllerTest {
 
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeRemindersPreferenceControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeRemindersPreferenceControllerTest.java
index 12e6dfdaf9b..213c360b0a1 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeRemindersPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.provider.Settings.Global.ZEN_MODE;
 import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -33,6 +33,8 @@ import android.provider.Settings;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
 
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModeRemindersPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceControllerTest.java
index 6c2ffacda39..59cfb47f28e 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.provider.Settings.Global.ZEN_MODE;
 import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -33,6 +33,8 @@ import android.provider.Settings;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
 
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModeRepeatCallersPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettingsTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettingsTest.java
index 46f3019b4c7..a556dbfaa88 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettingsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -32,6 +32,7 @@ import android.content.res.Resources;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
+import com.android.settings.notification.zen.ZenModeScheduleRuleSettings;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceControllerTest.java
index 345186852c2..efa2f558b5f 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.provider.Settings.Global.ZEN_MODE;
 import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -43,7 +43,8 @@ import androidx.fragment.app.FragmentManager;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper;
+import com.android.settings.notification.zen.AbstractZenModePreferenceController.ZenModeConfigWrapper;
+import com.android.settings.notification.zen.ZenModeSettingsFooterPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java
index f899a98cb9e..da185adedb0 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -26,6 +26,7 @@ import android.content.Context;
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
+import com.android.settings.notification.zen.ZenModeSettings;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeSliceBuilderTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeSliceBuilderTest.java
index ac185acc418..400543cb724 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeSliceBuilderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
 
@@ -32,6 +32,7 @@ import androidx.slice.core.SliceAction;
 import androidx.slice.widget.SliceLiveData;
 
 import com.android.settings.R;
+import com.android.settings.notification.zen.ZenModeSliceBuilder;
 import com.android.settings.testutils.shadow.ShadowNotificationManager;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeStarredContactsPreferenceControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeStarredContactsPreferenceControllerTest.java
index fd6e63943ca..f27367a985d 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeStarredContactsPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS;
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
@@ -22,7 +22,6 @@ import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -34,6 +33,8 @@ import android.content.Intent;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModeStarredContactsPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -41,8 +42,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.shadows.ShadowApplication;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeSystemPreferenceControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeSystemPreferenceControllerTest.java
index 0b57b8186ef..6a4ad2ace7a 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeSystemPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.provider.Settings.Global.ZEN_MODE;
 import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -33,6 +33,8 @@ import android.provider.Settings;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
 
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModeSystemPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectPreferenceControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectPreferenceControllerTest.java
index 0e523dfd29b..c1b38c53a47 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS;
@@ -37,6 +37,8 @@ import android.content.res.Resources;
 
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModeVisEffectPreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.widget.DisabledCheckBoxPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java
index 9d89a9e92d7..05537f3798d 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT;
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
@@ -40,6 +40,9 @@ import android.content.Context;
 
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModeVisEffectsAllPreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java
index 6afd339bd42..baea9ef3626 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT;
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
@@ -38,6 +38,9 @@ import android.content.Context;
 
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModeVisEffectsCustomPreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java
similarity index 94%
rename from tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java
index e856cca11ce..aacb1093be8 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT;
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
@@ -40,6 +40,9 @@ import android.content.Context;
 
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
+import com.android.settings.notification.zen.ZenModeBackend;
+import com.android.settings.notification.zen.ZenModeVisEffectsNonePreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
diff --git a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenOnboardingActivityTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenOnboardingActivityTest.java
index 6cd9430e78e..257eaaf3a8e 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenOnboardingActivityTest.java
@@ -14,16 +14,16 @@
  * limitations under the License
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS;
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS;
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;
 
-import static com.android.settings.notification.ZenOnboardingActivity.ALWAYS_SHOW_THRESHOLD;
-import static com.android.settings.notification.ZenOnboardingActivity
+import static com.android.settings.notification.zen.ZenOnboardingActivity.ALWAYS_SHOW_THRESHOLD;
+import static com.android.settings.notification.zen.ZenOnboardingActivity
         .PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME;
-import static com.android.settings.notification.ZenOnboardingActivity.isSuggestionComplete;
+import static com.android.settings.notification.zen.ZenOnboardingActivity.isSuggestionComplete;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -40,6 +40,7 @@ import android.provider.Settings;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.notification.zen.ZenOnboardingActivity;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenRuleCustomPolicyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/ZenRuleCustomPolicyPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java
index 5d3a6017c9e..f6fa5b702c1 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenRuleCustomPolicyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenRuleCustomPrefContrTestBase.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPrefContrTestBase.java
similarity index 91%
rename from tests/robotests/src/com/android/settings/notification/ZenRuleCustomPrefContrTestBase.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPrefContrTestBase.java
index 10472a5b695..8c9cfc0d91f 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenRuleCustomPrefContrTestBase.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPrefContrTestBase.java
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.app.NotificationManager;
 import android.service.notification.ZenPolicy;
 
+import com.android.settings.notification.zen.AbstractZenCustomRulePreferenceController;
+
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
diff --git a/tests/robotests/src/com/android/settings/notification/ZenRuleCustomSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomSwitchPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/ZenRuleCustomSwitchPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomSwitchPreferenceControllerTest.java
index e15eb605936..9da849343f2 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenRuleCustomSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomSwitchPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenRuleDefaultPolicyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/ZenRuleDefaultPolicyPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java
index e350793b0e3..7091cebc39c 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenRuleDefaultPolicyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenRulePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java
similarity index 91%
rename from tests/robotests/src/com/android/settings/notification/ZenRulePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java
index 5d070e56699..13963db08c9 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenRulePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static junit.framework.Assert.assertEquals;
 
@@ -28,6 +28,9 @@ import android.content.Context;
 
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.notification.zen.AbstractZenCustomRulePreferenceController;
+import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
+import com.android.settings.notification.zen.ZenModeBackend;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenRuleRepeatCallersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleRepeatCallersPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/ZenRuleRepeatCallersPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenRuleRepeatCallersPreferenceControllerTest.java
index 45062d4f456..da716196f57 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenRuleRepeatCallersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleRepeatCallersPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenRuleStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java
similarity index 99%
rename from tests/robotests/src/com/android/settings/notification/ZenRuleStarredContactsPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java
index 6c422eb2412..2f7dfe7f9b8 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenRuleStarredContactsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectPreferenceControllerTest.java
similarity index 99%
rename from tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectPreferenceControllerTest.java
index c99d20724a9..7b0aa371ee2 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectsAllPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java
index 5ef6194e56f..f30587f338d 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectsAllPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectsCustomPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java
index 79ef8d2da5b..99b76cebcdf 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectsCustomPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectsNonePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java
index d66433eea62..510da5f0696 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectsNonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
index 0c4ad7c5c70..d686f50b9c3 100644
--- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
+++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
@@ -29,7 +29,7 @@ import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity;
 import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity;
-import com.android.settings.notification.ZenSuggestionActivity;
+import com.android.settings.notification.zen.ZenSuggestionActivity;
 import com.android.settings.wallpaper.WallpaperSuggestionActivity;
 import com.android.settings.wifi.calling.WifiCallingSuggestionActivity;