diff --git a/app/src/main/java/org/mozilla/fenix/home/Mode.kt b/app/src/main/java/org/mozilla/fenix/home/Mode.kt
index 91b52608f4..a4cd3eeb47 100644
--- a/app/src/main/java/org/mozilla/fenix/home/Mode.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/Mode.kt
@@ -13,6 +13,7 @@ import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.onboarding.FenixOnboarding
+import org.mozilla.fenix.onboarding.OnboardingState
 import org.mozilla.fenix.nimbus.Onboarding as OnboardingConfig
 
 /**
@@ -31,17 +32,6 @@ sealed class Mode {
     }
 }
 
-/**
- * Describes various onboarding states.
- */
-sealed class OnboardingState {
-    // Signed out, without an option to auto-login using a shared FxA account.
-    object SignedOutNoAutoSignIn : OnboardingState()
-
-    // Signed in.
-    object SignedIn : OnboardingState()
-}
-
 class CurrentMode(
     private val context: Context,
     private val onboarding: FenixOnboarding,
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
index 66cdf4391d..df3b4d2b4f 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
@@ -20,12 +20,12 @@ import org.mozilla.fenix.ext.shouldShowRecentSyncedTabs
 import org.mozilla.fenix.ext.shouldShowRecentTabs
 import org.mozilla.fenix.gleanplumb.Message
 import org.mozilla.fenix.home.Mode
-import org.mozilla.fenix.home.OnboardingState
 import org.mozilla.fenix.home.recentbookmarks.RecentBookmark
 import org.mozilla.fenix.home.recentvisits.RecentlyVisitedItem
 import org.mozilla.fenix.nimbus.MessageSurfaceId
 import org.mozilla.fenix.nimbus.OnboardingPanel
 import org.mozilla.fenix.onboarding.HomeCFRPresenter
+import org.mozilla.fenix.onboarding.OnboardingState
 import org.mozilla.fenix.utils.Settings
 import org.mozilla.fenix.nimbus.Onboarding as OnboardingConfig
 
diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingState.kt b/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingState.kt
new file mode 100644
index 0000000000..6b52d40c86
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingState.kt
@@ -0,0 +1,20 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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.onboarding
+
+/**
+ * Describes various onboarding states.
+ */
+sealed class OnboardingState {
+    /**
+     * Signed out, without an option to auto-login using a shared FxA account.
+     */
+    object SignedOutNoAutoSignIn : OnboardingState()
+
+    /**
+     * Signed in.
+     */
+    object SignedIn : OnboardingState()
+}
diff --git a/app/src/test/java/org/mozilla/fenix/home/ModeTest.kt b/app/src/test/java/org/mozilla/fenix/home/ModeTest.kt
index 046e2f7870..2906815856 100644
--- a/app/src/test/java/org/mozilla/fenix/home/ModeTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/ModeTest.kt
@@ -17,6 +17,7 @@ import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.onboarding.FenixOnboarding
+import org.mozilla.fenix.onboarding.OnboardingState
 
 class ModeTest {