diff --git a/app/src/main/java/org/mozilla/fenix/components/AccountAbnormalities.kt b/app/src/main/java/org/mozilla/fenix/components/AccountAbnormalities.kt
index bd6c0196c..2941a8eb2 100644
--- a/app/src/main/java/org/mozilla/fenix/components/AccountAbnormalities.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/AccountAbnormalities.kt
@@ -16,7 +16,7 @@ import mozilla.components.concept.sync.OAuthAccount
 import mozilla.components.lib.crash.CrashReporter
 import mozilla.components.service.fxa.manager.FxaAccountManager
 import mozilla.components.support.base.log.logger.Logger
-import org.mozilla.fenix.StrictModeManager
+import org.mozilla.fenix.perf.StrictModeManager
 import kotlin.coroutines.CoroutineContext
 
 /**
diff --git a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
index 8736d38b5..602b1c175 100644
--- a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
@@ -36,7 +36,7 @@ import mozilla.components.service.sync.logins.SyncableLoginsStorage
 import mozilla.components.support.utils.RunWhenReadyQueue
 import org.mozilla.fenix.Config
 import org.mozilla.fenix.R
-import org.mozilla.fenix.StrictModeManager
+import org.mozilla.fenix.perf.StrictModeManager
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.components.metrics.MetricController
 import org.mozilla.fenix.ext.components
diff --git a/app/src/main/java/org/mozilla/fenix/components/Components.kt b/app/src/main/java/org/mozilla/fenix/components/Components.kt
index 0eb39edbb..38ee5d26c 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Components.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Components.kt
@@ -19,7 +19,7 @@ import mozilla.components.support.migration.state.MigrationStore
 import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.Config
 import org.mozilla.fenix.HomeActivity
-import org.mozilla.fenix.StrictModeManager
+import org.mozilla.fenix.perf.StrictModeManager
 import org.mozilla.fenix.components.metrics.AppStartupTelemetry
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.perf.lazyMonitored
diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt
index 33163d74f..7e7aee6ae 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -63,7 +63,7 @@ import org.mozilla.fenix.AppRequestInterceptor
 import org.mozilla.fenix.Config
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
-import org.mozilla.fenix.StrictModeManager
+import org.mozilla.fenix.perf.StrictModeManager
 import org.mozilla.fenix.TelemetryMiddleware
 import org.mozilla.fenix.downloads.DownloadService
 import org.mozilla.fenix.ext.components
diff --git a/app/src/main/java/org/mozilla/fenix/components/TabCollectionStorage.kt b/app/src/main/java/org/mozilla/fenix/components/TabCollectionStorage.kt
index 2ff36f047..e04bac803 100644
--- a/app/src/main/java/org/mozilla/fenix/components/TabCollectionStorage.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/TabCollectionStorage.kt
@@ -19,7 +19,7 @@ import mozilla.components.feature.tab.collections.TabCollection
 import mozilla.components.feature.tab.collections.TabCollectionStorage
 import mozilla.components.support.base.observer.Observable
 import mozilla.components.support.base.observer.ObserverRegistry
-import org.mozilla.fenix.StrictModeManager
+import org.mozilla.fenix.perf.StrictModeManager
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.toShortUrl
 import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder
diff --git a/app/src/main/java/org/mozilla/fenix/StrictModeManager.kt b/app/src/main/java/org/mozilla/fenix/perf/StrictModeManager.kt
similarity index 99%
rename from app/src/main/java/org/mozilla/fenix/StrictModeManager.kt
rename to app/src/main/java/org/mozilla/fenix/perf/StrictModeManager.kt
index 7a5f0d8fb..391051707 100644
--- a/app/src/main/java/org/mozilla/fenix/StrictModeManager.kt
+++ b/app/src/main/java/org/mozilla/fenix/perf/StrictModeManager.kt
@@ -7,7 +7,7 @@
 // methods so we suppress the check.
 @file:Suppress("MozillaStrictModeSuppression")
 
-package org.mozilla.fenix
+package org.mozilla.fenix.perf
 
 import android.os.Build
 import android.os.Looper
@@ -17,8 +17,8 @@ import androidx.annotation.VisibleForTesting.PRIVATE
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import mozilla.components.support.ktx.android.os.resetAfter
+import org.mozilla.fenix.Config
 import org.mozilla.fenix.components.Components
-import org.mozilla.fenix.perf.Performance
 import org.mozilla.fenix.utils.Mockable
 import java.util.concurrent.atomic.AtomicLong
 
diff --git a/app/src/test/java/org/mozilla/fenix/components/AccountAbnormalitiesTest.kt b/app/src/test/java/org/mozilla/fenix/components/AccountAbnormalitiesTest.kt
index 224496fd0..37ac4e8d6 100644
--- a/app/src/test/java/org/mozilla/fenix/components/AccountAbnormalitiesTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/AccountAbnormalitiesTest.kt
@@ -17,7 +17,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.fail
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mozilla.fenix.StrictModeManager
+import org.mozilla.fenix.perf.StrictModeManager
 import org.mozilla.fenix.helpers.TestStrictModeManager
 import kotlin.coroutines.CoroutineContext
 
diff --git a/app/src/test/java/org/mozilla/fenix/helpers/TestStrictModeManager.kt b/app/src/test/java/org/mozilla/fenix/helpers/TestStrictModeManager.kt
index 3f8d5f233..b846d10ee 100644
--- a/app/src/test/java/org/mozilla/fenix/helpers/TestStrictModeManager.kt
+++ b/app/src/test/java/org/mozilla/fenix/helpers/TestStrictModeManager.kt
@@ -6,7 +6,7 @@ package org.mozilla.fenix.helpers
 
 import android.os.StrictMode
 import io.mockk.mockk
-import org.mozilla.fenix.StrictModeManager
+import org.mozilla.fenix.perf.StrictModeManager
 
 /**
  * A test version of [StrictModeManager]. This class is difficult to mock because of [resetAfter]
diff --git a/app/src/test/java/org/mozilla/fenix/StrictModeManagerTest.kt b/app/src/test/java/org/mozilla/fenix/perf/StrictModeManagerTest.kt
similarity index 97%
rename from app/src/test/java/org/mozilla/fenix/StrictModeManagerTest.kt
rename to app/src/test/java/org/mozilla/fenix/perf/StrictModeManagerTest.kt
index 7bf76e4ee..57219d90a 100644
--- a/app/src/test/java/org/mozilla/fenix/StrictModeManagerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/perf/StrictModeManagerTest.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
+package org.mozilla.fenix.perf
 
 import android.os.StrictMode
 import androidx.fragment.app.FragmentManager
@@ -21,6 +21,8 @@ import org.junit.Assert.fail
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mozilla.fenix.Config
+import org.mozilla.fenix.ReleaseChannel
 import org.mozilla.fenix.components.Components
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner