diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4f5e6d02a..896f43108 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -179,7 +179,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:windowSoftInputMode="adjustResize" />
 
-    <activity android:name=".sharing.v2.ShareActivity"
+    <activity android:name=".sharing.ShareActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:excludeFromRecents="true"
               android:taskAffinity=""
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ResolvedShareData.kt b/app/src/main/java/org/thoughtcrime/securesms/sharing/ResolvedShareData.kt
similarity index 92%
rename from app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ResolvedShareData.kt
rename to app/src/main/java/org/thoughtcrime/securesms/sharing/ResolvedShareData.kt
index 9fdc30792..e8c4368fe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ResolvedShareData.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/ResolvedShareData.kt
@@ -1,7 +1,6 @@
-package org.thoughtcrime.securesms.sharing.v2
+package org.thoughtcrime.securesms.sharing
 
 import android.net.Uri
-import org.thoughtcrime.securesms.sharing.MultiShareArgs
 import java.lang.UnsupportedOperationException
 
 sealed class ResolvedShareData {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareActivity.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/sharing/ShareActivity.kt
index 28708db35..275494413 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.sharing.v2
+package org.thoughtcrime.securesms.sharing
 
 import android.app.Activity
 import android.content.Intent
@@ -21,8 +21,6 @@ import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectFor
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionActivity.Companion.share
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.sharing.MultiShareDialogs
-import org.thoughtcrime.securesms.sharing.MultiShareSender
 import org.thoughtcrime.securesms.sharing.MultiShareSender.MultiShareSendResultCollection
 import org.thoughtcrime.securesms.sharing.interstitial.ShareInterstitialActivity
 import org.thoughtcrime.securesms.util.ConversationUtil
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareEvent.kt b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareEvent.kt
similarity index 91%
rename from app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareEvent.kt
rename to app/src/main/java/org/thoughtcrime/securesms/sharing/ShareEvent.kt
index 51718a835..ce0feb012 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareEvent.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareEvent.kt
@@ -1,7 +1,6 @@
-package org.thoughtcrime.securesms.sharing.v2
+package org.thoughtcrime.securesms.sharing
 
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
-import org.thoughtcrime.securesms.sharing.MultiShareArgs
 
 sealed class ShareEvent {
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareRepository.kt
similarity index 99%
rename from app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareRepository.kt
rename to app/src/main/java/org/thoughtcrime/securesms/sharing/ShareRepository.kt
index 1b6743ed8..1054df04b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareRepository.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.sharing.v2
+package org.thoughtcrime.securesms.sharing
 
 import android.Manifest
 import android.content.Context
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareState.kt b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareState.kt
similarity index 86%
rename from app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareState.kt
rename to app/src/main/java/org/thoughtcrime/securesms/sharing/ShareState.kt
index c3be3ac50..9358208a9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareState.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.sharing.v2
+package org.thoughtcrime.securesms.sharing
 
 data class ShareState(
   val loadState: ShareDataLoadState = ShareDataLoadState.Init
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareViewModel.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/sharing/ShareViewModel.kt
index 31db8d176..f2a3e48e1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareViewModel.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.sharing.v2
+package org.thoughtcrime.securesms.sharing
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
@@ -10,7 +10,6 @@ import io.reactivex.rxjava3.kotlin.subscribeBy
 import io.reactivex.rxjava3.subjects.PublishSubject
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
-import org.thoughtcrime.securesms.sharing.InterstitialContentType
 import org.thoughtcrime.securesms.util.rx.RxStore
 
 class ShareViewModel(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/UnresolvedShareData.kt b/app/src/main/java/org/thoughtcrime/securesms/sharing/UnresolvedShareData.kt
similarity index 87%
rename from app/src/main/java/org/thoughtcrime/securesms/sharing/v2/UnresolvedShareData.kt
rename to app/src/main/java/org/thoughtcrime/securesms/sharing/UnresolvedShareData.kt
index 88a059c5b..18af3923e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/UnresolvedShareData.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/UnresolvedShareData.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.sharing.v2
+package org.thoughtcrime.securesms.sharing
 
 import android.net.Uri