diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a911fdde67..25f667073b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -843,12 +843,12 @@
         android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
         android:exported="false"/>
 
-    <activity android:name=".registrationv3.olddevice.TransferAccountActivity"
+    <activity android:name=".registration.olddevice.TransferAccountActivity"
         android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
         android:theme="@style/Theme.Signal.DayNight.NoActionBar"
         android:exported="false"/>
 
-    <activity android:name=".registrationv3.ui.RegistrationActivity"
+    <activity android:name=".registration.ui.RegistrationActivity"
         android:launchMode="singleTask"
         android:theme="@style/Theme.Signal.DayNight.NoActionBar"
         android:windowSoftInputMode="stateHidden|adjustResize"
@@ -974,7 +974,7 @@
               android:windowSoftInputMode="stateVisible|adjustResize"
               android:exported="false"/>
 
-    <activity android:name=".registrationv3.ui.restore.RemoteRestoreActivity"
+    <activity android:name=".registration.ui.restore.RemoteRestoreActivity"
               android:theme="@style/Signal.DayNight.NoActionBar"
               android:exported="false"/>
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
index 5a39f83481..5d42970cc1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
@@ -29,12 +29,11 @@ import org.thoughtcrime.securesms.pin.PinRestoreActivity;
 import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationActivity;
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity;
 import org.thoughtcrime.securesms.restore.RestoreActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.AppForegroundObserver;
 import org.thoughtcrime.securesms.util.AppStartup;
-import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.Locale;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/EnterKeyScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/EnterKeyScreen.kt
index d381d6437b..87d96a416b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/EnterKeyScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/EnterKeyScreen.kt
@@ -43,9 +43,9 @@ import org.signal.core.ui.compose.Buttons
 import org.signal.core.ui.compose.horizontalGutters
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.fonts.MonoTypeface
-import org.thoughtcrime.securesms.registrationv3.ui.restore.BackupKeyVisualTransformation
-import org.thoughtcrime.securesms.registrationv3.ui.restore.attachBackupKeyAutoFillHelper
-import org.thoughtcrime.securesms.registrationv3.ui.restore.backupKeyAutoFillHelper
+import org.thoughtcrime.securesms.registration.ui.restore.BackupKeyVisualTransformation
+import org.thoughtcrime.securesms.registration.ui.restore.attachBackupKeyAutoFillHelper
+import org.thoughtcrime.securesms.registration.ui.restore.backupKeyAutoFillHelper
 import org.whispersystems.signalservice.api.AccountEntropyPool
 
 /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/UnauthorizedBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/UnauthorizedBanner.kt
index b13e575e9b..318c46f8b0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/banner/banners/UnauthorizedBanner.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/banner/banners/UnauthorizedBanner.kt
@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.banner.ui.compose.Action
 import org.thoughtcrime.securesms.banner.ui.compose.DefaultBanner
 import org.thoughtcrime.securesms.banner.ui.compose.Importance
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationActivity
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 
 /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt
index a0e3d398f3..6f1988a206 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt
@@ -54,7 +54,7 @@ import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
 import org.thoughtcrime.securesms.lock.v2.SvrConstants
 import org.thoughtcrime.securesms.pin.RegistrationLockV2Dialog
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationActivity
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity
 import org.thoughtcrime.securesms.util.PlayStoreUtil
 import org.thoughtcrime.securesms.util.ServiceUtil
 import org.thoughtcrime.securesms.util.ViewUtil
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsViewModel.kt
index e51a08b4c2..a14a5dc0e5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsViewModel.kt
@@ -6,7 +6,6 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 
 class AccountSettingsViewModel : ViewModel() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberCaptchaFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberCaptchaFragment.kt
index 57a86f1672..401e0d103e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberCaptchaFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberCaptchaFragment.kt
@@ -6,7 +6,7 @@
 package org.thoughtcrime.securesms.components.settings.app.changenumber
 
 import androidx.fragment.app.activityViewModels
-import org.thoughtcrime.securesms.registrationv3.ui.captcha.CaptchaFragment
+import org.thoughtcrime.securesms.registration.ui.captcha.CaptchaFragment
 
 /**
  * Screen visible to the user when they are to solve a captcha. @see [CaptchaFragment]
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt
index a27b1c16c4..8e2b13e583 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt
@@ -23,13 +23,13 @@ import org.thoughtcrime.securesms.components.ViewBinderDelegate
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.changeNumberSuccess
 import org.thoughtcrime.securesms.databinding.FragmentChangeNumberEnterCodeBinding
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
 import org.thoughtcrime.securesms.registration.data.network.RegistrationResult
 import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult
 import org.thoughtcrime.securesms.registration.fragments.ContactSupportBottomSheetFragment
 import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate
 import org.thoughtcrime.securesms.registration.fragments.SignalStrengthPhoneStateListener
 import org.thoughtcrime.securesms.registration.sms.ReceivedSmsEvent
-import org.thoughtcrime.securesms.registrationv3.data.RegistrationRepository
 import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.thoughtcrime.securesms.util.visible
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt
index 7eadde7995..f9ab356b63 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt
@@ -61,7 +61,7 @@ import kotlin.time.Duration.Companion.seconds
 /**
  * Repository to perform data operations during change number.
  *
- * @see [org.thoughtcrime.securesms.registrationv3.data.RegistrationRepository]
+ * @see [org.thoughtcrime.securesms.registration.data.RegistrationRepository]
  */
 class ChangeNumberRepository(
   private val accountManager: SignalServiceAccountManager = AppDependencies.signalServiceAccountManager,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt
index 278c066f04..b5ebf97c0f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt
@@ -18,9 +18,9 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.changeNumberSuccess
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
 import org.thoughtcrime.securesms.registration.data.network.Challenge
 import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult
-import org.thoughtcrime.securesms.registrationv3.data.RegistrationRepository
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt
index a57298c373..f8209b3f65 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt
@@ -23,16 +23,16 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.registration.data.RegistrationData
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
 import org.thoughtcrime.securesms.registration.data.network.Challenge
 import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionCreationResult
 import org.thoughtcrime.securesms.registration.data.network.SessionMetadataResult
 import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult
 import org.thoughtcrime.securesms.registration.sms.SmsRetrieverReceiver
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
 import org.thoughtcrime.securesms.registration.ui.countrycode.Country
 import org.thoughtcrime.securesms.registration.viewmodel.NumberViewState
 import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet
-import org.thoughtcrime.securesms.registrationv3.data.RegistrationRepository
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationViewModel
 import org.thoughtcrime.securesms.util.dualsim.MccMncProducer
 import org.whispersystems.signalservice.api.push.ServiceId
 import java.io.IOException
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index 01e17e9b70..ceafdd59a8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -293,7 +293,7 @@ import org.thoughtcrime.securesms.recipients.RecipientExporter
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment
 import org.thoughtcrime.securesms.recipients.ui.disappearingmessages.RecipientDisappearingMessagesActivity
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationActivity
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity
 import org.thoughtcrime.securesms.revealable.ViewOnceMessageActivity
 import org.thoughtcrime.securesms.revealable.ViewOnceUtil
 import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet
diff --git a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferViewModel.kt
index 60fc42651e..abea1efb1a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferViewModel.kt
@@ -16,8 +16,8 @@ import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.ReclaimUsernameAndLinkJob
 import org.thoughtcrime.securesms.keyvalue.Completed
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
 import org.thoughtcrime.securesms.registration.util.RegistrationUtil
-import org.thoughtcrime.securesms.registrationv3.data.RegistrationRepository
 
 class NewDeviceTransferViewModel : ViewModel() {
   fun onRestoreComplete(context: Context, onComplete: () -> Unit) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
index 8b68fe0c0a..8c495edd97 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.keyvalue.SvrValues;
 import org.thoughtcrime.securesms.net.SignalNetwork;
 import org.thoughtcrime.securesms.registration.secondary.DeviceNameCipher;
-import org.thoughtcrime.securesms.registrationv3.data.RegistrationRepository;
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.signalservice.api.NetworkResultUtil;
 import org.whispersystems.signalservice.api.account.AccountAttributes;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt
index 149f668358..2e06bbd34b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt
@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionNavigator
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionViewModel
 import org.thoughtcrime.securesms.mms.MediaConstraints
 import org.thoughtcrime.securesms.permissions.Permissions
-import org.thoughtcrime.securesms.registrationv3.olddevice.TransferAccountActivity
+import org.thoughtcrime.securesms.registration.olddevice.TransferAccountActivity
 import org.thoughtcrime.securesms.stories.Stories
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureViewModel.kt
index bba66f93e5..69b1df3bf6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureViewModel.kt
@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.registrationv3.data.QuickRegistrationRepository
+import org.thoughtcrime.securesms.registration.data.QuickRegistrationRepository
 import org.thoughtcrime.securesms.util.rx.RxStore
 import java.io.FileDescriptor
 import java.util.Optional
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt
index 591f122199..c56cf3fabd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt
@@ -33,7 +33,6 @@ import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.AlarmSleepTimer
 import org.thoughtcrime.securesms.util.AppForegroundObserver
-import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.SignalLocalMetrics
 import org.thoughtcrime.securesms.util.asChain
 import org.whispersystems.signalservice.api.push.ServiceId
diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/SvrRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/pin/SvrRepository.kt
index 1147477d7e..fbed448b5b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/pin/SvrRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/pin/SvrRepository.kt
@@ -24,8 +24,8 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
 import org.thoughtcrime.securesms.megaphone.Megaphones
 import org.thoughtcrime.securesms.net.SignalNetwork
+import org.thoughtcrime.securesms.registration.ui.restore.StorageServiceRestore
 import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet
-import org.thoughtcrime.securesms.registrationv3.ui.restore.StorageServiceRestore
 import org.whispersystems.signalservice.api.NetworkResultUtil
 import org.whispersystems.signalservice.api.SvrNoDataException
 import org.whispersystems.signalservice.api.kbs.MasterKey
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt
index 61e3b5739b..f57478f91a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt
@@ -41,7 +41,7 @@ import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.profiles.manage.EditProfileViewModel.AvatarState
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository.UsernameDeleteResult
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationActivity
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity
 import org.thoughtcrime.securesms.util.NameUtil.getAbbreviation
 import org.thoughtcrime.securesms.util.PlayStoreUtil
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/data/LocalRegistrationMetadataUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/LocalRegistrationMetadataUtil.kt
index 81317ef588..d0090f6f29 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/data/LocalRegistrationMetadataUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/LocalRegistrationMetadataUtil.kt
@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.LocalRegistratio
 import org.whispersystems.signalservice.api.account.PreKeyCollection
 
 /**
- * Takes the two sources of registration data ([RegistrationData], [org.thoughtcrime.securesms.registrationv3.data.RegistrationRepository.AccountRegistrationResult])
+ * Takes the two sources of registration data ([RegistrationData], [RegistrationRepository.AccountRegistrationResult])
  * and combines them into a proto-backed class [LocalRegistrationMetadata] so they can be serialized & stored.
  */
 object LocalRegistrationMetadataUtil {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/data/QuickRegistrationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/QuickRegistrationRepository.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/data/QuickRegistrationRepository.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/data/QuickRegistrationRepository.kt
index 4bfa8d4cc9..e2df76721d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/data/QuickRegistrationRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/QuickRegistrationRepository.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright 2024 Signal Messenger, LLC
+ * Copyright 2025 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.data
+package org.thoughtcrime.securesms.registration.data
 
 import android.net.Uri
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/data/RegistrationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationRepository.kt
similarity index 99%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/data/RegistrationRepository.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationRepository.kt
index a50e94ef91..07cc82b0ae 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/data/RegistrationRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationRepository.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright 2024 Signal Messenger, LLC
+ * Copyright 2025 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.data
+package org.thoughtcrime.securesms.registration.data
 
 import android.app.backup.BackupManager
 import android.content.Context
@@ -51,13 +51,10 @@ import org.thoughtcrime.securesms.profiles.AvatarHelper
 import org.thoughtcrime.securesms.push.AccountManagerFactory
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.registration.data.AccountRegistrationResult
 import org.thoughtcrime.securesms.registration.data.LocalRegistrationMetadataUtil.getAciIdentityKeyPair
 import org.thoughtcrime.securesms.registration.data.LocalRegistrationMetadataUtil.getAciPreKeyCollection
 import org.thoughtcrime.securesms.registration.data.LocalRegistrationMetadataUtil.getPniIdentityKeyPair
 import org.thoughtcrime.securesms.registration.data.LocalRegistrationMetadataUtil.getPniPreKeyCollection
-import org.thoughtcrime.securesms.registration.data.RegisterAsLinkedDeviceResponse
-import org.thoughtcrime.securesms.registration.data.RegistrationData
 import org.thoughtcrime.securesms.registration.data.network.BackupAuthCheckResult
 import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult
 import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionCheckResult
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/olddevice/TransferAccountActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/olddevice/TransferAccountActivity.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/olddevice/TransferAccountActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/olddevice/TransferAccountActivity.kt
index 16b1e0b50f..820ea42ad0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/olddevice/TransferAccountActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/olddevice/TransferAccountActivity.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright 2024 Signal Messenger, LLC
+ * Copyright 2025 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.olddevice
+package org.thoughtcrime.securesms.registration.olddevice
 
 import android.content.Context
 import android.content.Intent
@@ -63,7 +63,7 @@ import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferActi
 import org.thoughtcrime.securesms.fonts.SignalSymbols
 import org.thoughtcrime.securesms.fonts.SignalSymbols.SignalSymbol
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.registrationv3.data.QuickRegistrationRepository
+import org.thoughtcrime.securesms.registration.data.QuickRegistrationRepository
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
 import org.thoughtcrime.securesms.util.DynamicTheme
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/olddevice/TransferAccountViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/olddevice/TransferAccountViewModel.kt
similarity index 91%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/olddevice/TransferAccountViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/olddevice/TransferAccountViewModel.kt
index 658481c3d3..79e699a3bf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/olddevice/TransferAccountViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/olddevice/TransferAccountViewModel.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright 2024 Signal Messenger, LLC
+ * Copyright 2025 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.olddevice
+package org.thoughtcrime.securesms.registration.olddevice
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.registrationv3.data.QuickRegistrationRepository
+import org.thoughtcrime.securesms.registration.data.QuickRegistrationRepository
 import org.whispersystems.signalservice.api.provisioning.RestoreMethod
 import java.util.UUID
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationActivity.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationActivity.kt
index 7931fa9956..2f13760c15 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationActivity.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright 2024 Signal Messenger, LLC
+ * Copyright 2025 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui
+package org.thoughtcrime.securesms.registration.ui
 
 import android.content.Context
 import android.content.Intent
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationCheckpoint.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationCheckpoint.kt
similarity index 86%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationCheckpoint.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationCheckpoint.kt
index ab7122d4af..7b3406013a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationCheckpoint.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationCheckpoint.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright 2024 Signal Messenger, LLC
+ * Copyright 2025 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui
+package org.thoughtcrime.securesms.registration.ui
 
 /**
  * An ordered list of checkpoints of the registration process.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationState.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationState.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationState.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationState.kt
index 33b2627dfe..c9d79cb200 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationState.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright 2024 Signal Messenger, LLC
+ * Copyright 2025 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui
+package org.thoughtcrime.securesms.registration.ui
 
 import com.google.i18n.phonenumbers.NumberParseException
 import com.google.i18n.phonenumbers.PhoneNumberUtil
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
similarity index 99%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
index 57bac9f9f3..4d8c0f04b1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright 2024 Signal Messenger, LLC
+ * Copyright 2025 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui
+package org.thoughtcrime.securesms.registration.ui
 
 import android.Manifest
 import android.annotation.SuppressLint
@@ -50,6 +50,7 @@ import org.thoughtcrime.securesms.pin.SvrWrongPinException
 import org.thoughtcrime.securesms.registration.data.AccountRegistrationResult
 import org.thoughtcrime.securesms.registration.data.LocalRegistrationMetadataUtil
 import org.thoughtcrime.securesms.registration.data.RegistrationData
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
 import org.thoughtcrime.securesms.registration.data.network.BackupAuthCheckResult
 import org.thoughtcrime.securesms.registration.data.network.Challenge
 import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult
@@ -73,12 +74,10 @@ import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequ
 import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.Success
 import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.TokenNotAccepted
 import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.UnknownError
-import org.thoughtcrime.securesms.registration.ui.toE164
+import org.thoughtcrime.securesms.registration.ui.link.RegisterLinkDeviceResult
+import org.thoughtcrime.securesms.registration.ui.restore.StorageServiceRestore
 import org.thoughtcrime.securesms.registration.util.RegistrationUtil
 import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet
-import org.thoughtcrime.securesms.registrationv3.data.RegistrationRepository
-import org.thoughtcrime.securesms.registrationv3.ui.link.RegisterLinkDeviceResult
-import org.thoughtcrime.securesms.registrationv3.ui.restore.StorageServiceRestore
 import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.Util
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/accountlocked/AccountLockedFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/accountlocked/AccountLockedFragment.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/accountlocked/AccountLockedFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/accountlocked/AccountLockedFragment.kt
index c2099c3a75..1d6f0ea6d6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/accountlocked/AccountLockedFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/accountlocked/AccountLockedFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.accountlocked
+package org.thoughtcrime.securesms.registration.ui.accountlocked
 
 import android.content.Intent
 import android.net.Uri
@@ -15,7 +15,7 @@ import androidx.fragment.app.activityViewModels
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
 import kotlin.time.Duration.Companion.milliseconds
 
 /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/captcha/CaptchaFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/CaptchaFragment.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/captcha/CaptchaFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/CaptchaFragment.kt
index 881d7dcffa..11f9078e4d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/captcha/CaptchaFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/CaptchaFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.captcha
+package org.thoughtcrime.securesms.registration.ui.captcha
 
 import android.annotation.SuppressLint
 import android.os.Bundle
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/captcha/RegistrationCaptchaFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/RegistrationCaptchaFragment.kt
similarity index 80%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/captcha/RegistrationCaptchaFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/RegistrationCaptchaFragment.kt
index 9926189235..867a5f9736 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/captcha/RegistrationCaptchaFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/RegistrationCaptchaFragment.kt
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.captcha
+package org.thoughtcrime.securesms.registration.ui.captcha
 
 import androidx.fragment.app.activityViewModels
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
 
 /**
  * Screen that displays a captcha as part of the registration flow.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/countrycode/CountryCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeFragment.kt
similarity index 82%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/countrycode/CountryCodeFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeFragment.kt
index 80b9c6b68c..b7983fb2fb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/countrycode/CountryCodeFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeFragment.kt
@@ -1,10 +1,12 @@
-@file:OptIn(ExperimentalMaterial3Api::class)
+/*
+ * Copyright 2025 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
 
-package org.thoughtcrime.securesms.registrationv3.ui.countrycode
+package org.thoughtcrime.securesms.registration.ui.countrycode
 
 import android.os.Bundle
 import android.view.View
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.res.stringResource
@@ -17,9 +19,6 @@ import org.signal.core.util.getParcelableCompat
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeFragment
-import org.thoughtcrime.securesms.registration.ui.countrycode.Country
-import org.thoughtcrime.securesms.registration.ui.countrycode.CountryCodeSelectScreen
-import org.thoughtcrime.securesms.registration.ui.countrycode.CountryCodeViewModel
 
 /**
  * Country picker fragment used in registration V3
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeViewModel.kt
index 3ad82d151d..2025dc609d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeViewModel.kt
@@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
 /**
- * View model to support [org.thoughtcrime.securesms.registrationv3.ui.countrycode.CountryCodeFragment] and track the countries
+ * View model to support [CountryCodeFragment] and track the countries
  */
 class CountryCodeViewModel : ViewModel() {
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/entercode/EnterCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeFragment.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/entercode/EnterCodeFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeFragment.kt
index 9d85944f60..c027600726 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/entercode/EnterCodeFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.entercode
+package org.thoughtcrime.securesms.registration.ui.entercode
 
 import android.content.DialogInterface
 import android.os.Bundle
@@ -38,8 +38,8 @@ import org.thoughtcrime.securesms.registration.fragments.ContactSupportBottomShe
 import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView
 import org.thoughtcrime.securesms.registration.fragments.SignalStrengthPhoneStateListener
 import org.thoughtcrime.securesms.registration.sms.ReceivedSmsEvent
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationCheckpoint
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.registration.ui.RegistrationCheckpoint
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
 import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.thoughtcrime.securesms.util.visible
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/entercode/EnterCodeState.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeState.kt
similarity index 76%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/entercode/EnterCodeState.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeState.kt
index f1b19819d8..8c570d135b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/entercode/EnterCodeState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeState.kt
@@ -3,6 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.entercode
+package org.thoughtcrime.securesms.registration.ui.entercode
 
 data class EnterCodeState(val resetRequiredAfterFailure: Boolean = false, val showKeyboard: Boolean = false)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/entercode/EnterCodeViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeViewModel.kt
similarity index 92%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/entercode/EnterCodeViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeViewModel.kt
index 9074a4f534..a467b5b51f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/entercode/EnterCodeViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeViewModel.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.entercode
+package org.thoughtcrime.securesms.registration.ui.entercode
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/link/RegisterLinkDeviceQrFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceQrFragment.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/link/RegisterLinkDeviceQrFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceQrFragment.kt
index 196b13be60..b3bcfff7c6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/link/RegisterLinkDeviceQrFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceQrFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.link
+package org.thoughtcrime.securesms.registration.ui.link
 
 import android.os.Bundle
 import android.view.View
@@ -65,8 +65,8 @@ import org.signal.core.ui.compose.theme.SignalTheme
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCode
 import org.thoughtcrime.securesms.compose.ComposeFragment
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationViewModel
-import org.thoughtcrime.securesms.registrationv3.ui.shared.RegistrationScreen
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreen
 import java.lang.IllegalStateException
 
 /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/link/RegisterLinkDeviceQrViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceQrViewModel.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/link/RegisterLinkDeviceQrViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceQrViewModel.kt
index f8bb3f29fe..c450d9c582 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/link/RegisterLinkDeviceQrViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceQrViewModel.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.link
+package org.thoughtcrime.securesms.registration.ui.link
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/link/RegisterLinkDeviceResult.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceResult.kt
similarity index 92%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/link/RegisterLinkDeviceResult.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceResult.kt
index f92196cd35..b60e87db61 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/link/RegisterLinkDeviceResult.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/link/RegisterLinkDeviceResult.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.link
+package org.thoughtcrime.securesms.registration.ui.link
 
 import kotlin.time.Duration
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/permissions/GrantPermissionsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/permissions/GrantPermissionsFragment.kt
similarity index 90%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/permissions/GrantPermissionsFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/permissions/GrantPermissionsFragment.kt
index 416792d633..0ec824d583 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/permissions/GrantPermissionsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/permissions/GrantPermissionsFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.permissions
+package org.thoughtcrime.securesms.registration.ui.permissions
 
 import android.content.pm.PackageManager
 import android.os.Build
@@ -20,9 +20,9 @@ import androidx.navigation.fragment.navArgs
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.compose.ComposeFragment
 import org.thoughtcrime.securesms.registration.fragments.WelcomePermissions
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationCheckpoint
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationViewModel
-import org.thoughtcrime.securesms.registrationv3.ui.welcome.WelcomeUserSelection
+import org.thoughtcrime.securesms.registration.ui.RegistrationCheckpoint
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.registration.ui.welcome.WelcomeUserSelection
 import org.thoughtcrime.securesms.util.BackupUtil
 
 /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/permissions/GrantPermissionsScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/permissions/GrantPermissionsScreen.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/permissions/GrantPermissionsScreen.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/permissions/GrantPermissionsScreen.kt
index b9070b90be..37ebf7e8f9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/permissions/GrantPermissionsScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/permissions/GrantPermissionsScreen.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.permissions
+package org.thoughtcrime.securesms.registration.ui.permissions
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
@@ -26,7 +26,7 @@ import org.signal.core.ui.compose.Buttons
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.SignalPreview
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.registrationv3.ui.shared.RegistrationScreen
+import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreen
 
 /**
  * Layout that explains permissions rationale to the user.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberFragment.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberFragment.kt
index 1656dd28dc..cd324c4687 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.phonenumber
+package org.thoughtcrime.securesms.registration.ui.phonenumber
 
 import android.content.Context
 import android.content.DialogInterface
@@ -46,6 +46,7 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.ViewBinderDelegate
 import org.thoughtcrime.securesms.databinding.FragmentRegistrationEnterPhoneNumberBinding
 import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
 import org.thoughtcrime.securesms.registration.data.network.Challenge
 import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult
 import org.thoughtcrime.securesms.registration.data.network.RegistrationResult
@@ -54,14 +55,13 @@ import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionC
 import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionResult
 import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult
 import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView
+import org.thoughtcrime.securesms.registration.ui.RegistrationCheckpoint
+import org.thoughtcrime.securesms.registration.ui.RegistrationState
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
 import org.thoughtcrime.securesms.registration.ui.countrycode.Country
+import org.thoughtcrime.securesms.registration.ui.countrycode.CountryCodeFragment
 import org.thoughtcrime.securesms.registration.ui.toE164
 import org.thoughtcrime.securesms.registration.util.CountryPrefix
-import org.thoughtcrime.securesms.registrationv3.data.RegistrationRepository
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationCheckpoint
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationState
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationViewModel
-import org.thoughtcrime.securesms.registrationv3.ui.countrycode.CountryCodeFragment
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.Dialogs
 import org.thoughtcrime.securesms.util.PlayServicesUtil
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberMode.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberMode.kt
similarity index 90%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberMode.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberMode.kt
index d6f3bf4e75..643bad0e2f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberMode.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberMode.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.phonenumber
+package org.thoughtcrime.securesms.registration.ui.phonenumber
 
 /**
  * Enter phone number mode to determine if verification is needed or just e164 input is necessary.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberState.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberState.kt
similarity index 83%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberState.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberState.kt
index 496e850a50..275295f473 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberState.kt
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.phonenumber
+package org.thoughtcrime.securesms.registration.ui.phonenumber
 
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
 import org.thoughtcrime.securesms.registration.ui.countrycode.Country
-import org.thoughtcrime.securesms.registrationv3.data.RegistrationRepository
 
 /**
  * State holder for the phone number entry screen, including phone number and Play Services errors.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberViewModel.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberViewModel.kt
index 476d931d6a..e4276cda1f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberViewModel.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.phonenumber
+package org.thoughtcrime.securesms.registration.ui.phonenumber
 
 import android.content.Context
 import androidx.lifecycle.ViewModel
@@ -15,10 +15,10 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
 import org.signal.core.util.E164Util
 import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
 import org.thoughtcrime.securesms.registration.ui.countrycode.Country
 import org.thoughtcrime.securesms.registration.ui.countrycode.CountryUtils
 import org.thoughtcrime.securesms.registration.util.CountryPrefix
-import org.thoughtcrime.securesms.registrationv3.data.RegistrationRepository
 import org.thoughtcrime.securesms.util.Util
 
 /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/registrationlock/RegistrationLockFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/registrationlock/RegistrationLockFragment.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/registrationlock/RegistrationLockFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/registrationlock/RegistrationLockFragment.kt
index 6a529245ee..cc4861e525 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/registrationlock/RegistrationLockFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/registrationlock/RegistrationLockFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.registrationlock
+package org.thoughtcrime.securesms.registration.ui.registrationlock
 
 import android.os.Bundle
 import android.view.KeyEvent
@@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.lock.v2.SvrConstants
 import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult
 import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult
 import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.SupportEmailUtil
 import org.thoughtcrime.securesms.util.ViewUtil
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/reregisterwithpin/ReRegisterWithPinFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinFragment.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/reregisterwithpin/ReRegisterWithPinFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinFragment.kt
index db576d44f8..6a368dd85a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/reregisterwithpin/ReRegisterWithPinFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.reregisterwithpin
+package org.thoughtcrime.securesms.registration.ui.reregisterwithpin
 
 import android.os.Bundle
 import android.view.View
@@ -21,10 +21,10 @@ import org.thoughtcrime.securesms.databinding.FragmentRegistrationPinRestoreEntr
 import org.thoughtcrime.securesms.lock.v2.SvrConstants
 import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult
 import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationCheckpoint
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationState
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationViewModel
-import org.thoughtcrime.securesms.registrationv3.ui.phonenumber.EnterPhoneNumberMode
+import org.thoughtcrime.securesms.registration.ui.RegistrationCheckpoint
+import org.thoughtcrime.securesms.registration.ui.RegistrationState
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.registration.ui.phonenumber.EnterPhoneNumberMode
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.SupportEmailUtil
 import org.thoughtcrime.securesms.util.ViewUtil
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/reregisterwithpin/ReRegisterWithPinState.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinState.kt
similarity index 86%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/reregisterwithpin/ReRegisterWithPinState.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinState.kt
index b5de7f7853..6f0e179422 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/reregisterwithpin/ReRegisterWithPinState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinState.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.reregisterwithpin
+package org.thoughtcrime.securesms.registration.ui.reregisterwithpin
 
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/reregisterwithpin/ReRegisterWithPinViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinViewModel.kt
similarity index 92%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/reregisterwithpin/ReRegisterWithPinViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinViewModel.kt
index 493a03b720..cb4b3d1b1b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/reregisterwithpin/ReRegisterWithPinViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinViewModel.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.reregisterwithpin
+package org.thoughtcrime.securesms.registration.ui.reregisterwithpin
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/AccountEntropyPoolVerification.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/AccountEntropyPoolVerification.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/AccountEntropyPoolVerification.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/AccountEntropyPoolVerification.kt
index 73ba2e17df..cb33cda979 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/AccountEntropyPoolVerification.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/AccountEntropyPoolVerification.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import org.thoughtcrime.securesms.restore.enterbackupkey.PostRegistrationEnterBackupKeyViewModel
 import org.whispersystems.signalservice.api.AccountEntropyPool
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/BackupKeyAutoFill.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/BackupKeyAutoFill.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/BackupKeyAutoFill.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/BackupKeyAutoFill.kt
index e8b7c70058..2275d3481a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/BackupKeyAutoFill.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/BackupKeyAutoFill.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/BackupKeyVisualTransformation.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/BackupKeyVisualTransformation.kt
similarity index 95%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/BackupKeyVisualTransformation.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/BackupKeyVisualTransformation.kt
index 7f83b2218f..c57fa9bf97 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/BackupKeyVisualTransformation.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/BackupKeyVisualTransformation.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.input.OffsetMapping
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyFragment.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyFragment.kt
index 11805e9299..989eea9d04 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import android.os.Bundle
 import android.view.View
@@ -28,9 +28,9 @@ import org.thoughtcrime.securesms.components.contactsupport.ContactSupportViewMo
 import org.thoughtcrime.securesms.components.contactsupport.SendSupportEmailEffect
 import org.thoughtcrime.securesms.compose.ComposeFragment
 import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationCheckpoint
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationViewModel
-import org.thoughtcrime.securesms.registrationv3.ui.phonenumber.EnterPhoneNumberMode
+import org.thoughtcrime.securesms.registration.ui.RegistrationCheckpoint
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.registration.ui.phonenumber.EnterPhoneNumberMode
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyScreen.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyScreen.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyScreen.kt
index 32b1d3253e..5b009a6154 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyScreen.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.foundation.background
@@ -46,7 +46,6 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import kotlinx.coroutines.launch
@@ -58,7 +57,7 @@ import org.signal.core.ui.compose.horizontalGutters
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.backup.v2.ui.BackupsIconColors
 import org.thoughtcrime.securesms.fonts.MonoTypeface
-import org.thoughtcrime.securesms.registrationv3.ui.shared.RegistrationScreen
+import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreen
 import org.whispersystems.signalservice.api.AccountEntropyPool
 
 /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyViewModel.kt
similarity index 91%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyViewModel.kt
index 790bf8c396..4ca4688ff5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/EnterBackupKeyViewModel.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -15,7 +15,6 @@ import kotlinx.coroutines.flow.update
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult
-import org.thoughtcrime.securesms.registrationv3.ui.restore.AccountEntropyPoolVerification.AEPValidationError
 import org.whispersystems.signalservice.api.AccountEntropyPool
 
 class EnterBackupKeyViewModel : ViewModel() {
@@ -69,7 +68,7 @@ class EnterBackupKeyViewModel : ViewModel() {
           isRegistering = false,
           showRegistrationError = true,
           registerAccountResult = registerAccountResult,
-          aepValidationError = if (incorrectKeyError) AEPValidationError.Incorrect else it.aepValidationError
+          aepValidationError = if (incorrectKeyError) AccountEntropyPoolVerification.AEPValidationError.Incorrect else it.aepValidationError
         )
       } else {
         it
@@ -114,7 +113,7 @@ class EnterBackupKeyViewModel : ViewModel() {
     val showRegistrationError: Boolean = false,
     val showBackupTierNotRestoreError: TierRestoreError? = null,
     val registerAccountResult: RegisterAccountResult? = null,
-    val aepValidationError: AEPValidationError? = null,
+    val aepValidationError: AccountEntropyPoolVerification.AEPValidationError? = null,
     val tierRetryAttempts: Int = 0
   )
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/NoBackupToRestoreFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/NoBackupToRestoreFragment.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/NoBackupToRestoreFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/NoBackupToRestoreFragment.kt
index c1619e29fc..aabece044b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/NoBackupToRestoreFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/NoBackupToRestoreFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -29,7 +29,7 @@ import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.SignalPreview
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeFragment
-import org.thoughtcrime.securesms.registrationv3.ui.shared.RegistrationScreen
+import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreen
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RegistrationProvisionMessageExt.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RegistrationProvisionMessageExt.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RegistrationProvisionMessageExt.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RegistrationProvisionMessageExt.kt
index e4902944cb..3db16f8692 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RegistrationProvisionMessageExt.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RegistrationProvisionMessageExt.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import org.signal.libsignal.protocol.IdentityKey
 import org.signal.libsignal.protocol.IdentityKeyPair
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt
index 7b41602e9a..6b684ad22d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import android.content.Context
 import android.content.Intent
@@ -23,6 +23,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -72,9 +73,9 @@ import org.thoughtcrime.securesms.components.contactsupport.ContactSupportViewMo
 import org.thoughtcrime.securesms.components.contactsupport.SendSupportEmailEffect
 import org.thoughtcrime.securesms.conversation.v2.registerForLifecycle
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreen
+import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreenTitleSubtitle
 import org.thoughtcrime.securesms.registration.util.RegistrationUtil
-import org.thoughtcrime.securesms.registrationv3.ui.shared.RegistrationScreen
-import org.thoughtcrime.securesms.registrationv3.ui.shared.RegistrationScreenTitleSubtitle
 import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.PlayStoreUtil
 import org.thoughtcrime.securesms.util.viewModel
@@ -396,6 +397,7 @@ private fun BackupAvailableContent(
           RestoreFailedDialog(onDismiss = onImportErrorDialogDismiss)
         }
       }
+
       RemoteRestoreViewModel.ImportState.FailureWithLogPrompt -> {
         RestoreFailedWithLogPromptDialog(onDismiss = onImportErrorDialogDismiss, onContactSupport = onContactSupport)
       }
@@ -487,7 +489,7 @@ private fun getFeatures(tier: MessageBackupTier?, mediaTTL: Duration): Immutable
  */
 @Composable
 private fun RestoreProgressDialog(restoreProgress: RestoreV2Event?) {
-  androidx.compose.material3.AlertDialog(
+  AlertDialog(
     onDismissRequest = {},
     confirmButton = {},
     dismissButton = {},
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreViewModel.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreViewModel.kt
index 70da14a9f7..20b1f330db 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreViewModel.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -26,7 +26,7 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.RestoreDecisionS
 import org.thoughtcrime.securesms.keyvalue.Completed
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.keyvalue.Skipped
-import org.thoughtcrime.securesms.registrationv3.data.QuickRegistrationRepository
+import org.thoughtcrime.securesms.registration.data.QuickRegistrationRepository
 import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.api.provisioning.RestoreMethod
 import kotlin.time.Duration
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreWakeLock.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreWakeLock.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreWakeLock.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreWakeLock.kt
index 68511adb0b..b932687b6c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreWakeLock.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreWakeLock.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import android.os.PowerManager
 import androidx.activity.ComponentActivity
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreMethod.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreMethod.kt
similarity index 95%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreMethod.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreMethod.kt
index 787ff8c4ab..ad0e7291aa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreMethod.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreMethod.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import org.thoughtcrime.securesms.R
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreRow.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreRow.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreRow.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreRow.kt
index d3d60daa48..4fe1901f09 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreRow.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreRow.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreViaQrFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreViaQrFragment.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreViaQrFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreViaQrFragment.kt
index 43d30b8a90..d7793b81fc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreViaQrFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreViaQrFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import android.os.Bundle
 import android.view.View
@@ -74,9 +74,9 @@ import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCode
 import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCodeData
 import org.thoughtcrime.securesms.compose.ComposeFragment
 import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationViewModel
-import org.thoughtcrime.securesms.registrationv3.ui.shared.RegistrationScreen
-import org.thoughtcrime.securesms.registrationv3.ui.shared.RegistrationScreenTitleSubtitle
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreen
+import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreenTitleSubtitle
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreViaQrViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreViaQrViewModel.kt
similarity index 99%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreViaQrViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreViaQrViewModel.kt
index ad16a8ce66..cd34c5c9a7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RestoreViaQrViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RestoreViaQrViewModel.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/SelectManualRestoreMethodFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/SelectManualRestoreMethodFragment.kt
similarity index 92%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/SelectManualRestoreMethodFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/SelectManualRestoreMethodFragment.kt
index 026c649fd2..c7613b0ede 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/SelectManualRestoreMethodFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/SelectManualRestoreMethodFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import android.app.Activity
 import androidx.activity.result.ActivityResult
@@ -13,8 +13,8 @@ import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.compose.ComposeFragment
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationViewModel
-import org.thoughtcrime.securesms.registrationv3.ui.phonenumber.EnterPhoneNumberMode
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.registration.ui.phonenumber.EnterPhoneNumberMode
 import org.thoughtcrime.securesms.restore.RestoreActivity
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/SelectRestoreMethodScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/SelectRestoreMethodScreen.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/SelectRestoreMethodScreen.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/SelectRestoreMethodScreen.kt
index 919bf1884c..a1d01002e1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/SelectRestoreMethodScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/SelectRestoreMethodScreen.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.material3.Text
@@ -16,7 +16,7 @@ import androidx.compose.ui.res.stringResource
 import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.registrationv3.ui.shared.RegistrationScreen
+import org.thoughtcrime.securesms.registration.ui.shared.RegistrationScreen
 
 /**
  * Screen showing various restore methods available during quick and manual re-registration.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/StorageServiceRestore.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/StorageServiceRestore.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/StorageServiceRestore.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/StorageServiceRestore.kt
index 0218af858f..8a41fc351a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/StorageServiceRestore.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/StorageServiceRestore.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -17,8 +17,8 @@ import org.thoughtcrime.securesms.jobs.ReclaimUsernameAndLinkJob
 import org.thoughtcrime.securesms.jobs.StorageAccountRestoreJob
 import org.thoughtcrime.securesms.jobs.StorageSyncJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
 import org.thoughtcrime.securesms.registration.util.RegistrationUtil
-import org.thoughtcrime.securesms.registrationv3.data.RegistrationRepository
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/shared/RegistrationScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/shared/RegistrationScreen.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/shared/RegistrationScreen.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/shared/RegistrationScreen.kt
index ed27eb7aeb..ad7dee3ec0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/shared/RegistrationScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/shared/RegistrationScreen.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.shared
+package org.thoughtcrime.securesms.registration.ui.shared
 
 import android.content.Intent
 import android.widget.Toast
@@ -38,7 +38,6 @@ import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.horizontalGutters
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.dependencies.GooglePlayBillingDependencies.context
 import org.thoughtcrime.securesms.logsubmit.SubmitDebugLogActivity
 
 private const val TAP_TARGET = 8
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/welcome/RestoreWelcomeBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/RestoreWelcomeBottomSheet.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/welcome/RestoreWelcomeBottomSheet.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/RestoreWelcomeBottomSheet.kt
index dfa5638013..a62e834809 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/welcome/RestoreWelcomeBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/RestoreWelcomeBottomSheet.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.welcome
+package org.thoughtcrime.securesms.registration.ui.welcome
 
 import android.content.DialogInterface
 import androidx.compose.foundation.background
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/welcome/WelcomeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeFragment.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/welcome/WelcomeFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeFragment.kt
index c49763df5a..f3d496e347 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/welcome/WelcomeFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.welcome
+package org.thoughtcrime.securesms.registration.ui.welcome
 
 import android.content.pm.PackageManager
 import android.os.Bundle
@@ -22,10 +22,10 @@ import org.thoughtcrime.securesms.databinding.FragmentRegistrationWelcomeV3Bindi
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView
 import org.thoughtcrime.securesms.registration.fragments.WelcomePermissions
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationCheckpoint
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationViewModel
-import org.thoughtcrime.securesms.registrationv3.ui.permissions.GrantPermissionsFragment
-import org.thoughtcrime.securesms.registrationv3.ui.phonenumber.EnterPhoneNumberMode
+import org.thoughtcrime.securesms.registration.ui.RegistrationCheckpoint
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.registration.ui.permissions.GrantPermissionsFragment
+import org.thoughtcrime.securesms.registration.ui.phonenumber.EnterPhoneNumberMode
 import org.thoughtcrime.securesms.util.BackupUtil
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/welcome/WelcomeUserSelection.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeUserSelection.kt
similarity index 80%
rename from app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/welcome/WelcomeUserSelection.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeUserSelection.kt
index fcddd4bbac..b332954f7c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/welcome/WelcomeUserSelection.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeUserSelection.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.welcome
+package org.thoughtcrime.securesms.registration.ui.welcome
 
 /**
  * User options available to start registration flow.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt
index a391a18235..fd2ab95c8b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt
@@ -19,9 +19,8 @@ import org.thoughtcrime.securesms.BaseActivity
 import org.thoughtcrime.securesms.PassphraseRequiredActivity
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.RestoreDirections
-import org.thoughtcrime.securesms.registrationv3.ui.restore.RemoteRestoreActivity
+import org.thoughtcrime.securesms.registration.ui.restore.RemoteRestoreActivity
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
-import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreViewModel.kt
index 36058e6839..919307d893 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreViewModel.kt
@@ -22,9 +22,9 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.keyvalue.Skipped
 import org.thoughtcrime.securesms.keyvalue.includeDeviceToDeviceTransfer
 import org.thoughtcrime.securesms.keyvalue.skippedRestoreChoice
-import org.thoughtcrime.securesms.registrationv3.data.QuickRegistrationRepository
-import org.thoughtcrime.securesms.registrationv3.ui.restore.RestoreMethod
-import org.thoughtcrime.securesms.registrationv3.ui.restore.StorageServiceRestore
+import org.thoughtcrime.securesms.registration.data.QuickRegistrationRepository
+import org.thoughtcrime.securesms.registration.ui.restore.RestoreMethod
+import org.thoughtcrime.securesms.registration.ui.restore.StorageServiceRestore
 import org.thoughtcrime.securesms.restore.transferorrestore.BackupRestorationType
 import org.whispersystems.signalservice.api.provisioning.RestoreMethod as ApiRestoreMethod
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/enterbackupkey/PostRegistrationEnterBackupKeyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/enterbackupkey/PostRegistrationEnterBackupKeyFragment.kt
index deea742551..bd665d4559 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/restore/enterbackupkey/PostRegistrationEnterBackupKeyFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/enterbackupkey/PostRegistrationEnterBackupKeyFragment.kt
@@ -24,7 +24,7 @@ import org.signal.core.ui.compose.Dialogs
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeFragment
-import org.thoughtcrime.securesms.registrationv3.ui.restore.EnterBackupKeyScreen
+import org.thoughtcrime.securesms.registration.ui.restore.EnterBackupKeyScreen
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.whispersystems.signalservice.api.AccountEntropyPool
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/enterbackupkey/PostRegistrationEnterBackupKeyViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/enterbackupkey/PostRegistrationEnterBackupKeyViewModel.kt
index d719818ced..4e4b6e3f5f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/restore/enterbackupkey/PostRegistrationEnterBackupKeyViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/enterbackupkey/PostRegistrationEnterBackupKeyViewModel.kt
@@ -19,8 +19,8 @@ import kotlinx.coroutines.withContext
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.registrationv3.ui.restore.AccountEntropyPoolVerification
-import org.thoughtcrime.securesms.registrationv3.ui.restore.AccountEntropyPoolVerification.AEPValidationError
+import org.thoughtcrime.securesms.registration.ui.restore.AccountEntropyPoolVerification
+import org.thoughtcrime.securesms.registration.ui.restore.AccountEntropyPoolVerification.AEPValidationError
 import org.whispersystems.signalservice.api.AccountEntropyPool
 
 class PostRegistrationEnterBackupKeyViewModel : ViewModel() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupViewModel.kt
index df402bf2e5..01828815a4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupViewModel.kt
@@ -21,8 +21,8 @@ import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.ReclaimUsernameAndLinkJob
 import org.thoughtcrime.securesms.keyvalue.Completed
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
 import org.thoughtcrime.securesms.registration.util.RegistrationUtil
-import org.thoughtcrime.securesms.registrationv3.data.RegistrationRepository
 import org.thoughtcrime.securesms.restore.RestoreRepository
 
 /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/selection/SelectRestoreMethodFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/selection/SelectRestoreMethodFragment.kt
index 36843b28dc..e719b923dc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/restore/selection/SelectRestoreMethodFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/selection/SelectRestoreMethodFragment.kt
@@ -16,10 +16,10 @@ import kotlinx.coroutines.withContext
 import org.signal.core.ui.compose.Dialogs
 import org.thoughtcrime.securesms.MainActivity
 import org.thoughtcrime.securesms.compose.ComposeFragment
-import org.thoughtcrime.securesms.registrationv3.data.QuickRegistrationRepository
-import org.thoughtcrime.securesms.registrationv3.ui.restore.RemoteRestoreActivity
-import org.thoughtcrime.securesms.registrationv3.ui.restore.RestoreMethod
-import org.thoughtcrime.securesms.registrationv3.ui.restore.SelectRestoreMethodScreen
+import org.thoughtcrime.securesms.registration.data.QuickRegistrationRepository
+import org.thoughtcrime.securesms.registration.ui.restore.RemoteRestoreActivity
+import org.thoughtcrime.securesms.registration.ui.restore.RestoreMethod
+import org.thoughtcrime.securesms.registration.ui.restore.SelectRestoreMethodScreen
 import org.thoughtcrime.securesms.restore.RestoreViewModel
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.whispersystems.signalservice.api.provisioning.RestoreMethod as ApiRestoreMethod
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java b/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java
index 69e4adb90c..ac715b502e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java
@@ -23,8 +23,7 @@ import androidx.annotation.NonNull;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationActivity;
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity;
 
 public class Dialogs {
   public static void showAlertDialog(Context context, String title, String message) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index 75cafa4b57..acadff90cd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -36,7 +36,7 @@ import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.notifications.NotificationIds;
 import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.registrationv3.ui.RegistrationActivity;
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/app/src/main/res/layout/activity_registration_navigation_v3.xml b/app/src/main/res/layout/activity_registration_navigation_v3.xml
index 571a69947f..4bd60a34d7 100644
--- a/app/src/main/res/layout/activity_registration_navigation_v3.xml
+++ b/app/src/main/res/layout/activity_registration_navigation_v3.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".registrationv3.ui.RegistrationActivity">
+    tools:context=".registration.ui.RegistrationActivity">
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/nav_host_fragment"
diff --git a/app/src/main/res/layout/fragment_registration_enter_code.xml b/app/src/main/res/layout/fragment_registration_enter_code.xml
index 83e0812b67..3f38056327 100644
--- a/app/src/main/res/layout/fragment_registration_enter_code.xml
+++ b/app/src/main/res/layout/fragment_registration_enter_code.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".registrationv3.ui.entercode.EnterCodeFragment">
+    tools:context=".registration.ui.entercode.EnterCodeFragment">
 
     <ScrollView
         android:id="@+id/scroll_view"
diff --git a/app/src/main/res/layout/fragment_registration_enter_phone_number.xml b/app/src/main/res/layout/fragment_registration_enter_phone_number.xml
index 1665fc4dca..e8730623a5 100644
--- a/app/src/main/res/layout/fragment_registration_enter_phone_number.xml
+++ b/app/src/main/res/layout/fragment_registration_enter_phone_number.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
-    tools:context="org.thoughtcrime.securesms.registrationv3.ui.phonenumber.EnterPhoneNumberFragment">
+    tools:context="org.thoughtcrime.securesms.registration.ui.phonenumber.EnterPhoneNumberFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/navigation/registration_v3.xml b/app/src/main/res/navigation/registration_v3.xml
index ab006e48a9..35c09ede4d 100644
--- a/app/src/main/res/navigation/registration_v3.xml
+++ b/app/src/main/res/navigation/registration_v3.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/welcomeFragment"
-        android:name="org.thoughtcrime.securesms.registrationv3.ui.welcome.WelcomeFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.welcome.WelcomeFragment"
         android:label="fragment_welcome"
         tools:layout="@layout/fragment_registration_welcome_v3">
 
@@ -55,19 +55,19 @@
 
     <fragment
         android:id="@+id/grantPermissionsFragment"
-        android:name="org.thoughtcrime.securesms.registrationv3.ui.permissions.GrantPermissionsFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.permissions.GrantPermissionsFragment"
         android:label="fragment_grant_permissions"
         tools:ignore="NewApi">
 
         <argument
             android:name="welcomeUserSelection"
-            app:argType="org.thoughtcrime.securesms.registrationv3.ui.welcome.WelcomeUserSelection" />
+            app:argType="org.thoughtcrime.securesms.registration.ui.welcome.WelcomeUserSelection" />
 
     </fragment>
 
     <fragment
         android:id="@+id/restoreViaQr"
-        android:name="org.thoughtcrime.securesms.registrationv3.ui.restore.RestoreViaQrFragment">
+        android:name="org.thoughtcrime.securesms.registration.ui.restore.RestoreViaQrFragment">
 
         <action
             android:id="@+id/go_to_noBackupToRestore"
@@ -99,12 +99,12 @@
 
     <fragment
         android:id="@+id/linkViaQr"
-        android:name="org.thoughtcrime.securesms.registrationv3.ui.link.RegisterLinkDeviceQrFragment">
+        android:name="org.thoughtcrime.securesms.registration.ui.link.RegisterLinkDeviceQrFragment">
     </fragment>
 
     <fragment
         android:id="@+id/noBackupToRestore"
-        android:name="org.thoughtcrime.securesms.registrationv3.ui.restore.NoBackupToRestoreFragment">
+        android:name="org.thoughtcrime.securesms.registration.ui.restore.NoBackupToRestoreFragment">
 
         <action
             android:id="@+id/restart_registration_flow"
@@ -120,7 +120,7 @@
 
     <fragment
         android:id="@+id/selectRestoreMethod"
-        android:name="org.thoughtcrime.securesms.registrationv3.ui.restore.SelectManualRestoreMethodFragment">
+        android:name="org.thoughtcrime.securesms.registration.ui.restore.SelectManualRestoreMethodFragment">
 
         <action
             android:id="@+id/go_to_enterPhoneNumber"
@@ -132,13 +132,13 @@
 
         <argument
             android:name="welcomeUserSelection"
-            app:argType="org.thoughtcrime.securesms.registrationv3.ui.welcome.WelcomeUserSelection" />
+            app:argType="org.thoughtcrime.securesms.registration.ui.welcome.WelcomeUserSelection" />
 
     </fragment>
 
     <fragment
         android:id="@+id/countryPickerFragment"
-        android:name="org.thoughtcrime.securesms.registrationv3.ui.countrycode.CountryCodeFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.countrycode.CountryCodeFragment"
         tools:layout="@layout/fragment_registration_country_picker">
 
         <argument
@@ -150,7 +150,7 @@
 
     <fragment
         android:id="@+id/enterPhoneNumberFragment"
-        android:name="org.thoughtcrime.securesms.registrationv3.ui.phonenumber.EnterPhoneNumberFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.phonenumber.EnterPhoneNumberFragment"
         android:label="fragment_enter_phone_number"
         tools:layout="@layout/fragment_registration_enter_phone_number">
 
@@ -224,13 +224,13 @@
 
         <argument
             android:name="enterPhoneNumberMode"
-            app:argType="org.thoughtcrime.securesms.registrationv3.ui.phonenumber.EnterPhoneNumberMode" />
+            app:argType="org.thoughtcrime.securesms.registration.ui.phonenumber.EnterPhoneNumberMode" />
 
     </fragment>
 
     <fragment
         android:id="@+id/enterBackupKey"
-        android:name="org.thoughtcrime.securesms.registrationv3.ui.restore.EnterBackupKeyFragment">
+        android:name="org.thoughtcrime.securesms.registration.ui.restore.EnterBackupKeyFragment">
 
         <action
             android:id="@+id/go_to_enterPhoneNumber"
@@ -245,7 +245,7 @@
 
     <fragment
         android:id="@+id/enterCodeFragment"
-        android:name="org.thoughtcrime.securesms.registrationv3.ui.entercode.EnterCodeFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.entercode.EnterCodeFragment"
         android:label="fragment_enter_code"
         tools:layout="@layout/fragment_registration_enter_code">
 
@@ -281,7 +281,7 @@
 
     <fragment
         android:id="@+id/registrationLockFragment"
-        android:name="org.thoughtcrime.securesms.registrationv3.ui.registrationlock.RegistrationLockFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.registrationlock.RegistrationLockFragment"
         android:label="fragment_kbs_lock"
         tools:layout="@layout/fragment_registration_lock">
 
@@ -303,7 +303,7 @@
 
     <fragment
         android:id="@+id/reRegisterWithPinFragment"
-        android:name="org.thoughtcrime.securesms.registrationv3.ui.reregisterwithpin.ReRegisterWithPinFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.reregisterwithpin.ReRegisterWithPinFragment"
         tools:layout="@layout/fragment_registration_lock">
 
         <action
@@ -320,13 +320,13 @@
 
     <fragment
         android:id="@+id/accountLockedFragment"
-        android:name="org.thoughtcrime.securesms.registrationv3.ui.accountlocked.AccountLockedFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.accountlocked.AccountLockedFragment"
         android:label="fragment_account_locked"
         tools:layout="@layout/account_locked_fragment" />
 
     <fragment
         android:id="@+id/captchaFragment"
-        android:name="org.thoughtcrime.securesms.registrationv3.ui.captcha.RegistrationCaptchaFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.captcha.RegistrationCaptchaFragment"
         android:label="fragment_captcha"
         tools:layout="@layout/fragment_registration_captcha" />
 
diff --git a/app/src/main/res/navigation/restore.xml b/app/src/main/res/navigation/restore.xml
index b8cc85ad35..45a4ac732e 100644
--- a/app/src/main/res/navigation/restore.xml
+++ b/app/src/main/res/navigation/restore.xml
@@ -70,7 +70,7 @@
 
     <activity
         android:id="@+id/remoteRestoreActivity"
-        android:name="org.thoughtcrime.securesms.registrationv3.ui.restore.RemoteRestoreActivity" />
+        android:name="org.thoughtcrime.securesms.registration.ui.restore.RemoteRestoreActivity" />
 
     <fragment
         android:id="@+id/choose_local_backup_fragment"
diff --git a/app/src/test/java/org/thoughtcrime/securesms/registrationv3/ui/restore/AccountEntropyPoolVerificationTest.kt b/app/src/test/java/org/thoughtcrime/securesms/registration/ui/restore/AccountEntropyPoolVerificationTest.kt
similarity index 93%
rename from app/src/test/java/org/thoughtcrime/securesms/registrationv3/ui/restore/AccountEntropyPoolVerificationTest.kt
rename to app/src/test/java/org/thoughtcrime/securesms/registration/ui/restore/AccountEntropyPoolVerificationTest.kt
index 3f4d128455..cd3a2ebef4 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/registrationv3/ui/restore/AccountEntropyPoolVerificationTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/registration/ui/restore/AccountEntropyPoolVerificationTest.kt
@@ -1,4 +1,9 @@
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+/*
+ * Copyright 2025 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import assertk.assertThat
 import assertk.assertions.isEqualTo
@@ -7,7 +12,7 @@ import assertk.assertions.isTrue
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
-import org.thoughtcrime.securesms.registrationv3.ui.restore.AccountEntropyPoolVerification.AEPValidationError
+import org.thoughtcrime.securesms.registration.ui.restore.AccountEntropyPoolVerification.AEPValidationError
 
 @RunWith(Parameterized::class)
 class AccountEntropyPoolVerificationTest(
diff --git a/app/src/test/java/org/thoughtcrime/securesms/registrationv3/ui/restore/BackupKeyVisualTransformationTest.kt b/app/src/test/java/org/thoughtcrime/securesms/registration/ui/restore/BackupKeyVisualTransformationTest.kt
similarity index 98%
rename from app/src/test/java/org/thoughtcrime/securesms/registrationv3/ui/restore/BackupKeyVisualTransformationTest.kt
rename to app/src/test/java/org/thoughtcrime/securesms/registration/ui/restore/BackupKeyVisualTransformationTest.kt
index 6902986695..43603eb8e8 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/registrationv3/ui/restore/BackupKeyVisualTransformationTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/registration/ui/restore/BackupKeyVisualTransformationTest.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registrationv3.ui.restore
+package org.thoughtcrime.securesms.registration.ui.restore
 
 import androidx.compose.ui.text.AnnotatedString
 import assertk.assertThat
diff --git a/app/src/test/java/org/thoughtcrime/securesms/registration/util/RegistrationUtilTest.kt b/app/src/test/java/org/thoughtcrime/securesms/registration/util/RegistrationUtilTest.kt
index 80fce4dcb2..d133f0161a 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/registration/util/RegistrationUtilTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/registration/util/RegistrationUtilTest.kt
@@ -73,40 +73,12 @@ class RegistrationUtilTest {
     unmockkAll()
   }
 
-  @Test
-  fun maybeMarkRegistrationComplete_allValidNoRestoreOption() {
-    every { signalStore.registration.isRegistrationComplete } returns false
-    every { signalStore.account.isRegistered } returns true
-    every { Recipient.self() } returns Recipient(profileName = ProfileName.fromParts("Dark", "Helmet"))
-    every { signalStore.svr.hasPin() } returns true
-    every { RemoteConfig.restoreAfterRegistration } returns false
-
-    RegistrationUtil.maybeMarkRegistrationComplete()
-
-    verify { signalStore.registration.markRegistrationComplete() }
-  }
-
-  @Test
-  fun maybeMarkRegistrationComplete_allValidNoRestoreOptionSvrOptOut() {
-    every { signalStore.registration.isRegistrationComplete } returns false
-    every { signalStore.account.isRegistered } returns true
-    every { Recipient.self() } returns Recipient(profileName = ProfileName.fromParts("Dark", "Helmet"))
-    every { signalStore.svr.hasPin() } returns false
-    every { signalStore.svr.hasOptedOut() } returns true
-    every { RemoteConfig.restoreAfterRegistration } returns false
-
-    RegistrationUtil.maybeMarkRegistrationComplete()
-
-    verify { signalStore.registration.markRegistrationComplete() }
-  }
-
   @Test
   fun maybeMarkRegistrationComplete_allValidWithRestoreOption() {
     every { signalStore.registration.isRegistrationComplete } returns false
     every { signalStore.account.isRegistered } returns true
     every { Recipient.self() } returns Recipient(profileName = ProfileName.fromParts("Dark", "Helmet"))
     every { signalStore.svr.hasPin() } returns true
-    every { RemoteConfig.restoreAfterRegistration } returns true
     every { signalStore.registration.restoreDecisionState } returns RestoreDecisionState.Skipped
 
     RegistrationUtil.maybeMarkRegistrationComplete()
@@ -133,7 +105,6 @@ class RegistrationUtilTest {
     RegistrationUtil.maybeMarkRegistrationComplete()
 
     every { signalStore.svr.hasPin() } returns true
-    every { RemoteConfig.restoreAfterRegistration } returns true
     every { signalStore.registration.restoreDecisionState } returns RestoreDecisionState.Start
 
     RegistrationUtil.maybeMarkRegistrationComplete()
diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/RemoteConfig_StaticValuesTest.kt b/app/src/test/java/org/thoughtcrime/securesms/util/RemoteConfig_StaticValuesTest.kt
index 73a197cd7c..21922ea875 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/util/RemoteConfig_StaticValuesTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/util/RemoteConfig_StaticValuesTest.kt
@@ -51,8 +51,7 @@ class RemoteConfig_StaticValuesTest {
       "PROMPT_BATTERY_SAVER",
       "PROMPT_FOR_NOTIFICATION_LOGS",
       "DEVICE_SPECIFIC_NOTIFICATION_CONFIG",
-      "messageBackups",
-      "restoreAfterRegistration"
+      "messageBackups"
     )
 
     val publicVals: List<KProperty1<*, *>> = RemoteConfig::class.memberProperties