From 139b4514f376971c7acfac7e83d7ce3df23224ec Mon Sep 17 00:00:00 2001
From: Tiger Oakes <toakes@mozilla.com>
Date: Fri, 13 Sep 2019 21:29:11 -0700
Subject: [PATCH] [fenix] Move settings classes to packages

---
 .../toolbar/BrowserToolbarController.kt       |  2 +-
 .../fenix/settings/SettingsFragment.kt        |  2 ++
 .../AccountAuthErrorPreference.kt             |  2 +-
 .../{ => account}/AccountPreference.kt        |  2 +-
 .../{ => account}/AccountProblemFragment.kt   |  2 +-
 .../settings/{ => account}/SignOutFragment.kt |  2 +-
 .../{ => account}/TurnOnSyncFragment.kt       |  2 +-
 .../deletebrowsingdata}/DeleteAndQuit.kt      |  5 +----
 .../DeleteBrowsingDataController.kt           |  2 +-
 .../DeleteBrowsingDataFragment.kt             |  4 ++--
 .../DeleteBrowsingDataItem.kt                 |  2 +-
 .../DeleteBrowsingDataOnQuitFragment.kt       |  3 ++-
 .../DeleteBrowsingDataOnQuitType.kt           |  2 +-
 .../RadioSearchEngineListPreference.kt        |  2 +-
 .../{ => search}/SearchEngineFragment.kt      |  3 ++-
 .../SearchEngineListPreference.kt             |  2 +-
 ...itePermissionsDetailsExceptionsFragment.kt |  3 ++-
 .../SitePermissionsExceptionsFragment.kt      |  2 +-
 .../SitePermissionsFragment.kt                |  6 +++--
 ...onsManageExceptionsPhoneFeatureFragment.kt |  5 ++++-
 ...tePermissionsManagePhoneFeatureFragment.kt |  5 ++++-
 .../java/org/mozilla/fenix/utils/Settings.kt  |  2 +-
 .../layout/fragment_delete_browsing_data.xml  | 12 +++++-----
 app/src/main/res/navigation/nav_graph.xml     | 22 +++++++++----------
 app/src/main/res/xml/preferences.xml          |  6 ++---
 .../res/xml/search_engine_preferences.xml     |  2 +-
 .../DefaultBrowserToolbarControllerTest.kt    |  4 ++--
 .../AccountSettingsFragmentStoreTest.kt       |  6 +----
 .../AccountSettingsInteractorTest.kt          |  6 +----
 ...DefaultDeleteBrowsingDataControllerTest.kt |  2 +-
 .../deletebrowsingdata}/DeleteAndQuitTest.kt  |  4 ++--
 .../org/mozilla/fenix/utils/SettingsTest.kt   |  2 +-
 32 files changed, 65 insertions(+), 63 deletions(-)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => account}/AccountAuthErrorPreference.kt (96%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => account}/AccountPreference.kt (97%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => account}/AccountProblemFragment.kt (98%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => account}/SignOutFragment.kt (98%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => account}/TurnOnSyncFragment.kt (98%)
 rename app/src/main/java/org/mozilla/fenix/{utils => settings/deletebrowsingdata}/DeleteAndQuit.kt (87%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => deletebrowsingdata}/DeleteBrowsingDataController.kt (98%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => deletebrowsingdata}/DeleteBrowsingDataFragment.kt (98%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => deletebrowsingdata}/DeleteBrowsingDataItem.kt (97%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => deletebrowsingdata}/DeleteBrowsingDataOnQuitFragment.kt (96%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => deletebrowsingdata}/DeleteBrowsingDataOnQuitType.kt (93%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => search}/RadioSearchEngineListPreference.kt (96%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => search}/SearchEngineFragment.kt (95%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => search}/SearchEngineListPreference.kt (99%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => sitepermissions}/SitePermissionsDetailsExceptionsFragment.kt (97%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => sitepermissions}/SitePermissionsExceptionsFragment.kt (99%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => sitepermissions}/SitePermissionsFragment.kt (92%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => sitepermissions}/SitePermissionsManageExceptionsPhoneFeatureFragment.kt (96%)
 rename app/src/main/java/org/mozilla/fenix/settings/{ => sitepermissions}/SitePermissionsManagePhoneFeatureFragment.kt (96%)
 rename app/src/test/java/org/mozilla/fenix/settings/{ => account}/AccountSettingsFragmentStoreTest.kt (84%)
 rename app/src/test/java/org/mozilla/fenix/settings/{ => account}/AccountSettingsInteractorTest.kt (84%)
 rename app/src/test/java/org/mozilla/fenix/settings/{ => deletebrowsingdata}/DefaultDeleteBrowsingDataControllerTest.kt (98%)
 rename app/src/test/java/org/mozilla/fenix/{utils => settings/deletebrowsingdata}/DeleteAndQuitTest.kt (97%)

diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
index 93c17c7fd8..e4f56d6844 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
@@ -30,7 +30,7 @@ import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.toTab
 import org.mozilla.fenix.lib.Do
 import org.mozilla.fenix.quickactionsheet.QuickActionSheetBehavior
-import org.mozilla.fenix.utils.deleteAndQuit
+import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
 
 /**
  * An interface that handles the view manipulation of the BrowserToolbar, triggered by the Interactor
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index 2fe58371d4..5a77370330 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -64,6 +64,8 @@ import org.mozilla.fenix.ext.getPreferenceKey
 import org.mozilla.fenix.ext.metrics
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.settings.account.AccountAuthErrorPreference
+import org.mozilla.fenix.settings.account.AccountPreference
 import org.mozilla.fenix.utils.ItsNotBrokenSnack
 
 @SuppressWarnings("TooManyFunctions", "LargeClass")
diff --git a/app/src/main/java/org/mozilla/fenix/settings/AccountAuthErrorPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountAuthErrorPreference.kt
similarity index 96%
rename from app/src/main/java/org/mozilla/fenix/settings/AccountAuthErrorPreference.kt
rename to app/src/main/java/org/mozilla/fenix/settings/account/AccountAuthErrorPreference.kt
index 33f298e108..d55fe2a8ea 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/AccountAuthErrorPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountAuthErrorPreference.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.account
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/org/mozilla/fenix/settings/AccountPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountPreference.kt
similarity index 97%
rename from app/src/main/java/org/mozilla/fenix/settings/AccountPreference.kt
rename to app/src/main/java/org/mozilla/fenix/settings/account/AccountPreference.kt
index 558a8e6c08..adc72c2db3 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/AccountPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountPreference.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.account
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/org/mozilla/fenix/settings/AccountProblemFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountProblemFragment.kt
similarity index 98%
rename from app/src/main/java/org/mozilla/fenix/settings/AccountProblemFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/account/AccountProblemFragment.kt
index b80b18433e..22fdc081d5 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/AccountProblemFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountProblemFragment.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.account
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SignOutFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt
similarity index 98%
rename from app/src/main/java/org/mozilla/fenix/settings/SignOutFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt
index 02206ba3a7..ae990de9ab 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SignOutFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.account
 
 import android.app.Dialog
 import android.os.Bundle
diff --git a/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/TurnOnSyncFragment.kt
similarity index 98%
rename from app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/account/TurnOnSyncFragment.kt
index a22e552bc0..99c74eb7aa 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/TurnOnSyncFragment.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.account
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/org/mozilla/fenix/utils/DeleteAndQuit.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuit.kt
similarity index 87%
rename from app/src/main/java/org/mozilla/fenix/utils/DeleteAndQuit.kt
rename to app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuit.kt
index b96021778a..a6eab0d4b7 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/DeleteAndQuit.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuit.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.utils
+package org.mozilla.fenix.settings.deletebrowsingdata
 
 import android.app.Activity
 import kotlinx.coroutines.CoroutineScope
@@ -11,9 +11,6 @@ import kotlinx.coroutines.joinAll
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.mozilla.fenix.ext.settings
-import org.mozilla.fenix.settings.DefaultDeleteBrowsingDataController
-import org.mozilla.fenix.settings.DeleteBrowsingDataController
-import org.mozilla.fenix.settings.DeleteBrowsingDataOnQuitType
 
 /**
  * Deletes selected browsing data and finishes the activity.
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataController.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataController.kt
similarity index 98%
rename from app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataController.kt
rename to app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataController.kt
index b7bf2b8c78..790aa31163 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataController.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataController.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.deletebrowsingdata
 
 import android.content.Context
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt
similarity index 98%
rename from app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt
index 2b15e61875..6f36b3d4c5 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.deletebrowsingdata
 
 import android.content.DialogInterface
 import android.os.Bundle
@@ -44,7 +44,7 @@ class DeleteBrowsingDataFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        controller = DefaultDeleteBrowsingDataController(context!!)
+        controller = DefaultDeleteBrowsingDataController(requireContext())
 
         sessionObserver = object : SessionManager.Observer {
             override fun onSessionAdded(session: Session) = updateTabCount()
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataItem.kt
similarity index 97%
rename from app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt
rename to app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataItem.kt
index 716afe38f7..47188ee0c1 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataItem.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.deletebrowsingdata
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataOnQuitFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitFragment.kt
similarity index 96%
rename from app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataOnQuitFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitFragment.kt
index 7d19ac1905..d86159f0ca 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataOnQuitFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitFragment.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.deletebrowsingdata
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
@@ -13,6 +13,7 @@ import androidx.preference.SwitchPreference
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.getPreferenceKey
 import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.settings.SharedPreferenceUpdater
 
 class DeleteBrowsingDataOnQuitFragment : PreferenceFragmentCompat() {
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataOnQuitType.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitType.kt
similarity index 93%
rename from app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataOnQuitType.kt
rename to app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitType.kt
index a6d53fe9ee..794d16a9d1 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataOnQuitType.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitType.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.deletebrowsingdata
 
 import android.content.Context
 import androidx.annotation.StringRes
diff --git a/app/src/main/java/org/mozilla/fenix/settings/RadioSearchEngineListPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/search/RadioSearchEngineListPreference.kt
similarity index 96%
rename from app/src/main/java/org/mozilla/fenix/settings/RadioSearchEngineListPreference.kt
rename to app/src/main/java/org/mozilla/fenix/settings/search/RadioSearchEngineListPreference.kt
index d9726cdce1..9caa2f2f9d 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/RadioSearchEngineListPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/search/RadioSearchEngineListPreference.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.search
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SearchEngineFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
similarity index 95%
rename from app/src/main/java/org/mozilla/fenix/settings/SearchEngineFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
index 7ca54b6b4d..445c582728 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SearchEngineFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.search
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
@@ -11,6 +11,7 @@ import androidx.preference.SwitchPreference
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.getPreferenceKey
 import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.settings.SharedPreferenceUpdater
 
 class SearchEngineFragment : PreferenceFragmentCompat() {
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SearchEngineListPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt
similarity index 99%
rename from app/src/main/java/org/mozilla/fenix/settings/SearchEngineListPreference.kt
rename to app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt
index 81ba56011a..9d685f8819 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SearchEngineListPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.search
 
 import android.content.Context
 import android.content.res.Resources
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsDetailsExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsDetailsExceptionsFragment.kt
similarity index 97%
rename from app/src/main/java/org/mozilla/fenix/settings/SitePermissionsDetailsExceptionsFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsDetailsExceptionsFragment.kt
index 3c8b5e3023..e3bf5ab956 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsDetailsExceptionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsDetailsExceptionsFragment.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.sitepermissions
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
@@ -20,6 +20,7 @@ import org.jetbrains.anko.yesButton
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.getPreferenceKey
+import org.mozilla.fenix.settings.PhoneFeature
 import org.mozilla.fenix.settings.PhoneFeature.CAMERA
 import org.mozilla.fenix.settings.PhoneFeature.LOCATION
 import org.mozilla.fenix.settings.PhoneFeature.MICROPHONE
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt
similarity index 99%
rename from app/src/main/java/org/mozilla/fenix/settings/SitePermissionsExceptionsFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt
index 0a54e89052..f00ccce7ae 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsExceptionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.sitepermissions
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt
similarity index 92%
rename from app/src/main/java/org/mozilla/fenix/settings/SitePermissionsFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt
index f0e974a449..024c754ce2 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.sitepermissions
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
@@ -13,6 +13,7 @@ import androidx.preference.PreferenceFragmentCompat
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.getPreferenceKey
 import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.settings.PhoneFeature
 
 @SuppressWarnings("TooManyFunctions")
 class SitePermissionsFragment : PreferenceFragmentCompat() {
@@ -69,7 +70,8 @@ class SitePermissionsFragment : PreferenceFragmentCompat() {
     }
 
     private fun navigateToPhoneFeature(phoneFeature: PhoneFeature) {
-        val directions = SitePermissionsFragmentDirections.actionSitePermissionsToManagePhoneFeatures(phoneFeature.id)
+        val directions = SitePermissionsFragmentDirections
+            .actionSitePermissionsToManagePhoneFeatures(phoneFeature.id)
         Navigation.findNavController(view!!).navigate(directions)
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsManageExceptionsPhoneFeatureFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragment.kt
similarity index 96%
rename from app/src/main/java/org/mozilla/fenix/settings/SitePermissionsManageExceptionsPhoneFeatureFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragment.kt
index 8a56ab1b3f..ab1810b397 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsManageExceptionsPhoneFeatureFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragment.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.sitepermissions
 
 import android.content.Intent
 import android.net.Uri
@@ -27,6 +27,9 @@ import org.jetbrains.anko.yesButton
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.settings.PhoneFeature
+import org.mozilla.fenix.settings.initBlockedByAndroidView
+import org.mozilla.fenix.settings.setStartCheckedIndicator
 
 @SuppressWarnings("TooManyFunctions")
 class SitePermissionsManageExceptionsPhoneFeatureFragment : Fragment() {
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsManagePhoneFeatureFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt
similarity index 96%
rename from app/src/main/java/org/mozilla/fenix/settings/SitePermissionsManagePhoneFeatureFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt
index c25c250d81..314fe6db80 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsManagePhoneFeatureFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.sitepermissions
 
 import android.content.Intent
 import android.graphics.Color
@@ -27,6 +27,9 @@ import mozilla.components.feature.sitepermissions.SitePermissionsRules.Action.BL
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.settings.PhoneFeature
+import org.mozilla.fenix.settings.initBlockedByAndroidView
+import org.mozilla.fenix.settings.setStartCheckedIndicator
 import org.mozilla.fenix.utils.Settings
 
 @SuppressWarnings("TooManyFunctions")
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index d29430b41a..026e82a092 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -22,7 +22,7 @@ import org.mozilla.fenix.Config
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.MozillaProductDetector
 import org.mozilla.fenix.ext.getPreferenceKey
-import org.mozilla.fenix.settings.DeleteBrowsingDataOnQuitType
+import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitType
 import org.mozilla.fenix.settings.PhoneFeature
 import java.security.InvalidParameterException
 
diff --git a/app/src/main/res/layout/fragment_delete_browsing_data.xml b/app/src/main/res/layout/fragment_delete_browsing_data.xml
index 780c4901dc..441dbab7ae 100644
--- a/app/src/main/res/layout/fragment_delete_browsing_data.xml
+++ b/app/src/main/res/layout/fragment_delete_browsing_data.xml
@@ -29,7 +29,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-            <org.mozilla.fenix.settings.DeleteBrowsingDataItem
+            <org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataItem
                 android:id="@+id/open_tabs_item"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -40,7 +40,7 @@
                 android:focusable="true"
                 app:deleteBrowsingDataItemTitle="@string/preferences_delete_browsing_data_tabs_title"
                 app:deleteBrowsingDataItemSubtitle="@string/preferences_delete_browsing_data_tabs_subtitle" />
-            <org.mozilla.fenix.settings.DeleteBrowsingDataItem
+            <org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataItem
                 android:id="@+id/browsing_data_item"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -51,7 +51,7 @@
                 android:focusable="true"
                 app:deleteBrowsingDataItemTitle="@string/preferences_delete_browsing_data_browsing_data_title"
                 app:deleteBrowsingDataItemSubtitle="@string/preferences_delete_browsing_data_browsing_data_subtitle" />
-            <org.mozilla.fenix.settings.DeleteBrowsingDataItem
+            <org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataItem
                 android:id="@+id/collections_item"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -62,7 +62,7 @@
                 android:focusable="true"
                 app:deleteBrowsingDataItemTitle="@string/preferences_delete_browsing_data_collections_title"
                 app:deleteBrowsingDataItemSubtitle="@string/preferences_delete_browsing_data_collections_subtitle" />
-            <org.mozilla.fenix.settings.DeleteBrowsingDataItem
+            <org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataItem
                 android:id="@+id/cookies_item"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -74,7 +74,7 @@
                 android:visibility="gone"
                 app:deleteBrowsingDataItemTitle="@string/preferences_delete_browsing_data_cookies"
                 app:deleteBrowsingDataItemSubtitle="@string/preferences_delete_browsing_data_cookies_subtitle" />
-            <org.mozilla.fenix.settings.DeleteBrowsingDataItem
+            <org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataItem
                 android:id="@+id/cached_files_item"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -86,7 +86,7 @@
                 android:visibility="gone"
                 app:deleteBrowsingDataItemTitle="@string/preferences_delete_browsing_data_cached_files"
                 app:deleteBrowsingDataItemSubtitle="@string/preferences_delete_browsing_data_cached_files_subtitle" />
-            <org.mozilla.fenix.settings.DeleteBrowsingDataItem
+            <org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataItem
                 android:id="@+id/site_permissions_item"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 36a70dae92..6525cd2ba9 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -115,7 +115,7 @@
 
     <fragment
         android:id="@+id/SitePermissionsManagePhoneFeature"
-        android:name="org.mozilla.fenix.settings.SitePermissionsManagePhoneFeatureFragment"
+        android:name="org.mozilla.fenix.settings.sitepermissions.SitePermissionsManagePhoneFeatureFragment"
         tools:layout="@layout/fragment_manage_site_permissions_feature_phone">
         <argument
             android:name="permission"
@@ -124,7 +124,7 @@
 
     <fragment
         android:id="@+id/sitePermissionsExceptionsFragment"
-        android:name="org.mozilla.fenix.settings.SitePermissionsExceptionsFragment"
+        android:name="org.mozilla.fenix.settings.sitepermissions.SitePermissionsExceptionsFragment"
         android:label="@string/preference_exceptions"
         tools:layout="@layout/fragment_site_permissions_exceptions">
         <action
@@ -135,7 +135,7 @@
 
     <fragment
         android:id="@+id/sitePermissionsDetailsExceptionsFragment"
-        android:name="org.mozilla.fenix.settings.SitePermissionsDetailsExceptionsFragment"
+        android:name="org.mozilla.fenix.settings.sitepermissions.SitePermissionsDetailsExceptionsFragment"
         tools:layout="@xml/site_permissions_details_exceptions_preferences">
         <action
             android:id="@+id/action_site_permissions_to_exceptions_to_manage_phone_feature"
@@ -148,7 +148,7 @@
 
     <fragment
         android:id="@+id/sitePermissionsManageExceptionsPhoneFeatureFragment"
-        android:name="org.mozilla.fenix.settings.SitePermissionsManageExceptionsPhoneFeatureFragment"
+        android:name="org.mozilla.fenix.settings.sitepermissions.SitePermissionsManageExceptionsPhoneFeatureFragment"
         tools:layout="@layout/fragment_manage_site_permissions_feature_phone">
         <argument
             android:name="phoneFeatureId"
@@ -372,7 +372,7 @@
         android:label="@string/preferences_data_choices" />
     <fragment
         android:id="@+id/sitePermissionsFragment"
-        android:name="org.mozilla.fenix.settings.SitePermissionsFragment"
+        android:name="org.mozilla.fenix.settings.sitepermissions.SitePermissionsFragment"
         android:label="@string/preferences_site_permissions">
         <action
             android:id="@+id/action_site_permissions_to_manage_phone_features"
@@ -398,12 +398,12 @@
     </fragment>
     <fragment
         android:id="@+id/searchEngineFragment"
-        android:name="org.mozilla.fenix.settings.SearchEngineFragment"
+        android:name="org.mozilla.fenix.settings.search.SearchEngineFragment"
         android:label="@string/preferences_search" />
 
     <fragment
         android:id="@+id/turnOnSyncFragment"
-        android:name="org.mozilla.fenix.settings.TurnOnSyncFragment"
+        android:name="org.mozilla.fenix.settings.account.TurnOnSyncFragment"
         android:label="@string/preferences_sync">
         <action
             android:id="@+id/action_turnOnSyncFragment_to_pairFragment"
@@ -455,7 +455,7 @@
     </fragment>
     <fragment
         android:id="@+id/deleteBrowsingDataFragment"
-        android:name="org.mozilla.fenix.settings.DeleteBrowsingDataFragment"
+        android:name="org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataFragment"
         android:label="@string/preferences_delete_browsing_data" />
     <fragment
         android:id="@+id/exceptionsFragment"
@@ -540,14 +540,14 @@
     </dialog>
     <fragment
         android:id="@+id/accountProblemFragment"
-        android:name="org.mozilla.fenix.settings.AccountProblemFragment">
+        android:name="org.mozilla.fenix.settings.account.AccountProblemFragment">
         <action
             android:id="@+id/action_accountProblemFragment_to_signOutFragment"
             app:destination="@id/signOutFragment" />
     </fragment>
     <dialog
         android:id="@+id/signOutFragment"
-        android:name="org.mozilla.fenix.settings.SignOutFragment" />
+        android:name="org.mozilla.fenix.settings.account.SignOutFragment" />
     <action
         android:id="@+id/action_global_shareFragment"
         app:destination="@id/shareFragment" />
@@ -582,7 +582,7 @@
     </fragment>
     <fragment
         android:id="@+id/deleteBrowsingDataOnQuitFragment"
-        android:name="org.mozilla.fenix.settings.DeleteBrowsingDataOnQuitFragment"
+        android:name="org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitFragment"
         android:label="DeleteBrowsingDataOnQuitFragment" />
 
     <fragment
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index f94db7b94e..dd122cced0 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -19,11 +19,11 @@
         app:iconSpaceReserved="false"
         app:isPreferenceVisible="false">
 
-        <org.mozilla.fenix.settings.AccountPreference
+        <org.mozilla.fenix.settings.account.AccountPreference
             android:icon="@drawable/ic_account"
             android:key="@string/pref_key_account" />
 
-        <org.mozilla.fenix.settings.AccountAuthErrorPreference
+        <org.mozilla.fenix.settings.account.AccountAuthErrorPreference
             android:icon="@drawable/ic_account_warning"
             android:key="@string/pref_key_account_auth_error"/>
     </androidx.preference.PreferenceCategory>
@@ -120,4 +120,4 @@
             android:key="@string/pref_key_about"
             android:title="@string/preferences_about" />
     </androidx.preference.PreferenceCategory>
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/search_engine_preferences.xml b/app/src/main/res/xml/search_engine_preferences.xml
index 4c3620010b..c6a947ae00 100644
--- a/app/src/main/res/xml/search_engine_preferences.xml
+++ b/app/src/main/res/xml/search_engine_preferences.xml
@@ -9,7 +9,7 @@
         android:title="@string/preferences_default_search_engine"
         android:selectable="false"
         app:iconSpaceReserved="false">
-        <org.mozilla.fenix.settings.RadioSearchEngineListPreference
+        <org.mozilla.fenix.settings.search.RadioSearchEngineListPreference
             android:selectable="false"/>
         <SwitchPreference
             android:defaultValue="true"
diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
index 4cc3720b6d..fa1a1fdb5b 100644
--- a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
@@ -47,7 +47,7 @@ import org.mozilla.fenix.ext.toTab
 import org.mozilla.fenix.home.sessioncontrol.Tab
 import org.mozilla.fenix.home.sessioncontrol.TabCollection
 import org.mozilla.fenix.quickactionsheet.QuickActionSheetBehavior
-import org.mozilla.fenix.utils.deleteAndQuit
+import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
 
 @ExperimentalCoroutinesApi
 @ObsoleteCoroutinesApi
@@ -98,7 +98,7 @@ class DefaultBrowserToolbarControllerTest {
         every { any<Session>().toTab(any()) } returns currentSessionAsTab
 
         mockkStatic(
-            "org.mozilla.fenix.utils.DeleteAndQuitKt"
+            "org.mozilla.fenix.settings.deletebrowsingdata.DeleteAndQuitKt"
         )
         every { deleteAndQuit(any(), any()) } just Runs
 
diff --git a/app/src/test/java/org/mozilla/fenix/settings/AccountSettingsFragmentStoreTest.kt b/app/src/test/java/org/mozilla/fenix/settings/account/AccountSettingsFragmentStoreTest.kt
similarity index 84%
rename from app/src/test/java/org/mozilla/fenix/settings/AccountSettingsFragmentStoreTest.kt
rename to app/src/test/java/org/mozilla/fenix/settings/account/AccountSettingsFragmentStoreTest.kt
index 4592302743..c751863e4e 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/AccountSettingsFragmentStoreTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/account/AccountSettingsFragmentStoreTest.kt
@@ -2,16 +2,12 @@
    License, v. 2.0. If a copy of the MPL was not distributed with this
    file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.account
 
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotSame
 import org.junit.Test
-import org.mozilla.fenix.settings.account.AccountSettingsFragmentAction
-import org.mozilla.fenix.settings.account.AccountSettingsFragmentState
-import org.mozilla.fenix.settings.account.AccountSettingsFragmentStore
-import org.mozilla.fenix.settings.account.LastSyncTime
 
 class AccountSettingsFragmentStoreTest {
 
diff --git a/app/src/test/java/org/mozilla/fenix/settings/AccountSettingsInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/settings/account/AccountSettingsInteractorTest.kt
similarity index 84%
rename from app/src/test/java/org/mozilla/fenix/settings/AccountSettingsInteractorTest.kt
rename to app/src/test/java/org/mozilla/fenix/settings/account/AccountSettingsInteractorTest.kt
index d418447871..f817975d95 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/AccountSettingsInteractorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/account/AccountSettingsInteractorTest.kt
@@ -2,7 +2,7 @@
    License, v. 2.0. If a copy of the MPL was not distributed with this
    file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.account
 
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
@@ -12,10 +12,6 @@ import io.mockk.verify
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.mozilla.fenix.R
-import org.mozilla.fenix.settings.account.AccountSettingsFragmentAction
-import org.mozilla.fenix.settings.account.AccountSettingsFragmentDirections
-import org.mozilla.fenix.settings.account.AccountSettingsInteractor
-import org.mozilla.fenix.settings.account.AccountSettingsFragmentStore
 
 class AccountSettingsInteractorTest {
 
diff --git a/app/src/test/java/org/mozilla/fenix/settings/DefaultDeleteBrowsingDataControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt
similarity index 98%
rename from app/src/test/java/org/mozilla/fenix/settings/DefaultDeleteBrowsingDataControllerTest.kt
rename to app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt
index 74494a221c..b13a4d5581 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/DefaultDeleteBrowsingDataControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt
@@ -2,7 +2,7 @@
  *  License, v. 2.0. If a copy of the MPL was not distributed with this
  *  file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.deletebrowsingdata
 
 import android.content.Context
 import androidx.test.ext.junit.runners.AndroidJUnit4
diff --git a/app/src/test/java/org/mozilla/fenix/utils/DeleteAndQuitTest.kt b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt
similarity index 97%
rename from app/src/test/java/org/mozilla/fenix/utils/DeleteAndQuitTest.kt
rename to app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt
index b55b8b3b85..d2e31280cd 100644
--- a/app/src/test/java/org/mozilla/fenix/utils/DeleteAndQuitTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt
@@ -4,7 +4,7 @@
 
 @file:Suppress("DEPRECATION")
 
-package org.mozilla.fenix.utils
+package org.mozilla.fenix.settings.deletebrowsingdata
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.mockk.every
@@ -30,7 +30,7 @@ import org.mozilla.fenix.TestApplication
 import org.mozilla.fenix.components.PermissionStorage
 import org.mozilla.fenix.ext.clearAndCommit
 import org.mozilla.fenix.ext.components
-import org.mozilla.fenix.settings.DeleteBrowsingDataOnQuitType
+import org.mozilla.fenix.utils.Settings
 import org.robolectric.annotation.Config
 
 @ObsoleteCoroutinesApi
diff --git a/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt b/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
index 9128542e8d..cd67c17667 100644
--- a/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
@@ -19,7 +19,7 @@ import org.junit.runner.RunWith
 import org.mozilla.fenix.TestApplication
 import org.mozilla.fenix.ext.clearAndCommit
 import org.mozilla.fenix.ext.settings
-import org.mozilla.fenix.settings.DeleteBrowsingDataOnQuitType
+import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitType
 import org.mozilla.fenix.settings.PhoneFeature
 import org.robolectric.annotation.Config