diff --git a/app/build.gradle b/app/build.gradle
index d86c8a3a02..b2eae383c9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -143,8 +143,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.2'
 }
 
-def canonicalVersionCode = 193
-def canonicalVersionName = "1.11.2"
+def canonicalVersionCode = 198
+def canonicalVersionName = "1.11.3"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bc9e379d11..6eae3a6927 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -55,6 +55,12 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" tools:node="remove"/>
 
+    <queries>
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE" />
+        </intent>
+    </queries>
+
     <!-- The allowBackup="false" below is important to guard against potential malicious backups -->
 
     <application
@@ -87,80 +93,80 @@
             android:value="false" />
 
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.LandingActivity"
+            android:name="org.thoughtcrime.securesms.onboarding.LandingActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.RegisterActivity"
+            android:name="org.thoughtcrime.securesms.onboarding.RegisterActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.RecoveryPhraseRestoreActivity"
+            android:name="org.thoughtcrime.securesms.onboarding.RecoveryPhraseRestoreActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.LinkDeviceActivity"
+            android:name="org.thoughtcrime.securesms.onboarding.LinkDeviceActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.DisplayNameActivity"
+            android:name="org.thoughtcrime.securesms.onboarding.DisplayNameActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.PNModeActivity"
+            android:name="org.thoughtcrime.securesms.onboarding.PNModeActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.HomeActivity"
+            android:name="org.thoughtcrime.securesms.home.HomeActivity"
             android:screenOrientation="portrait"
             android:launchMode="singleTask"
             android:theme="@style/Theme.Session.DayNight.NoActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.SettingsActivity"
+            android:name="org.thoughtcrime.securesms.preferences.SettingsActivity"
             android:screenOrientation="portrait"
             android:label="@string/activity_settings_title" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.PathActivity"
+            android:name="org.thoughtcrime.securesms.home.PathActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.QRCodeActivity"
+            android:name="org.thoughtcrime.securesms.preferences.QRCodeActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.CreatePrivateChatActivity"
+            android:name="org.thoughtcrime.securesms.dms.CreatePrivateChatActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.CreateClosedGroupActivity"
+            android:name="org.thoughtcrime.securesms.groups.CreateClosedGroupActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity"
+            android:name="org.thoughtcrime.securesms.groups.EditClosedGroupActivity"
             android:label="@string/activity_edit_closed_group_title"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.JoinPublicChatActivity"
+            android:name="org.thoughtcrime.securesms.groups.JoinPublicChatActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.SeedActivity"
+            android:name="org.thoughtcrime.securesms.onboarding.SeedActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.SelectContactsActivity"
+            android:name="org.thoughtcrime.securesms.contacts.SelectContactsActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.PrivacySettingsActivity"
+            android:name="org.thoughtcrime.securesms.preferences.PrivacySettingsActivity"
             android:label="@string/activity_privacy_settings_title"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.NotificationSettingsActivity"
+            android:name="org.thoughtcrime.securesms.preferences.NotificationSettingsActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.ChatSettingsActivity"
+            android:name="org.thoughtcrime.securesms.preferences.ChatSettingsActivity"
             android:screenOrientation="portrait" />
 
         <activity
@@ -192,7 +198,7 @@
         <activity-alias
             android:name=".RoutingActivity"
             android:exported="true"
-            android:targetActivity="org.thoughtcrime.securesms.loki.activities.HomeActivity">
+            android:targetActivity="org.thoughtcrime.securesms.home.HomeActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -209,14 +215,14 @@
         <activity
             android:name="org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2"
             android:screenOrientation="portrait"
-            android:parentActivityName="org.thoughtcrime.securesms.loki.activities.HomeActivity"
+            android:parentActivityName="org.thoughtcrime.securesms.home.HomeActivity"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.thoughtcrime.securesms.loki.activities.HomeActivity" />
+                android:value="org.thoughtcrime.securesms.home.HomeActivity" />
         </activity>
         <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.OpenGroupGuidelinesActivity"
+            android:name="org.thoughtcrime.securesms.groups.OpenGroupGuidelinesActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.TextSecure.DayNight" />
         <activity
@@ -285,7 +291,7 @@
             android:exported="true"
             android:theme="@style/Theme.Session.DayNight.NoActionBar" />
         <service
-            android:name="org.thoughtcrime.securesms.loki.api.PushNotificationService"
+            android:name="org.thoughtcrime.securesms.notifications.PushNotificationService"
             android:enabled="true"
             android:exported="false">
             <intent-filter>
@@ -405,7 +411,7 @@
             </intent-filter>
         </receiver>
         <receiver
-            android:name="org.thoughtcrime.securesms.loki.api.BackgroundPollWorker$BootBroadcastReceiver"
+            android:name="org.thoughtcrime.securesms.notifications.BackgroundPollWorker$BootBroadcastReceiver"
             android:enabled="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index 0eacf377a5..6ea6795f12 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -27,10 +27,10 @@ import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ProcessLifecycleOwner;
 import androidx.multidex.MultiDexApplication;
+
 import org.conscrypt.Conscrypt;
 import org.session.libsession.avatars.AvatarHelper;
 import org.session.libsession.messaging.MessagingModuleConfiguration;
-import org.session.libsession.messaging.contacts.Contact;
 import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier;
 import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPollerV2;
 import org.session.libsession.messaging.sending_receiving.pollers.Poller;
@@ -42,11 +42,11 @@ import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.session.libsession.utilities.dynamiclanguage.LocaleParser;
-import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsignal.utilities.Log;
 import org.session.libsignal.utilities.ThreadUtils;
 import org.signal.aesgcmprovider.AesGcmProvider;
 import org.thoughtcrime.securesms.components.TypingStatusSender;
+import org.thoughtcrime.securesms.crypto.KeyPairUtilities;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.dependencies.SignalCommunicationModule;
@@ -58,17 +58,14 @@ import org.thoughtcrime.securesms.jobs.JobManagerFactories;
 import org.thoughtcrime.securesms.logging.AndroidLogger;
 import org.thoughtcrime.securesms.logging.PersistentLogger;
 import org.thoughtcrime.securesms.logging.UncaughtExceptionLogger;
-import org.thoughtcrime.securesms.loki.activities.HomeActivity;
-import org.thoughtcrime.securesms.loki.api.BackgroundPollWorker;
-import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager;
-import org.thoughtcrime.securesms.loki.api.OpenGroupManager;
-import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase;
-import org.thoughtcrime.securesms.loki.database.LokiUserDatabase;
-import org.thoughtcrime.securesms.loki.database.SessionContactDatabase;
-import org.thoughtcrime.securesms.loki.utilities.Broadcaster;
-import org.thoughtcrime.securesms.loki.utilities.ContactUtilities;
-import org.thoughtcrime.securesms.loki.utilities.FcmUtils;
-import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities;
+import org.thoughtcrime.securesms.home.HomeActivity;
+import org.thoughtcrime.securesms.notifications.BackgroundPollWorker;
+import org.thoughtcrime.securesms.notifications.LokiPushNotificationManager;
+import org.thoughtcrime.securesms.groups.OpenGroupManager;
+import org.thoughtcrime.securesms.database.LokiAPIDatabase;
+import org.thoughtcrime.securesms.util.Broadcaster;
+import org.thoughtcrime.securesms.notifications.FcmUtils;
+import org.thoughtcrime.securesms.util.UiModeUtilities;
 import org.thoughtcrime.securesms.notifications.DefaultMessageNotifier;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.notifications.OptimizedMessageNotifier;
@@ -84,12 +81,14 @@ import org.webrtc.PeerConnectionFactory;
 import org.webrtc.PeerConnectionFactory.InitializationOptions;
 import org.webrtc.voiceengine.WebRtcAudioManager;
 import org.webrtc.voiceengine.WebRtcAudioUtils;
+
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.security.Security;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
+
 import dagger.ObjectGraph;
 import kotlin.Unit;
 import kotlinx.coroutines.Job;
@@ -154,8 +153,10 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
         conversationListNotificationHandler = new Handler(Looper.getMainLooper());
         LokiAPIDatabase apiDB = DatabaseFactory.getLokiAPIDatabase(this);
         MessagingModuleConfiguration.Companion.configure(this,
-            DatabaseFactory.getStorage(this),
-            DatabaseFactory.getAttachmentProvider(this));
+                DatabaseFactory.getStorage(this),
+                DatabaseFactory.getAttachmentProvider(this),
+                ()-> KeyPairUtilities.INSTANCE.getUserED25519KeyPair(this)
+        );
         SnodeModule.Companion.configure(apiDB, broadcaster);
         String userPublicKey = TextSecurePreferences.getLocalNumber(this);
         if (userPublicKey != null) {
@@ -181,27 +182,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
         Log.i(TAG, "App is now visible.");
         KeyCachingService.onAppForegrounded(this);
 
-        boolean hasPerformedContactMigration = TextSecurePreferences.INSTANCE.hasPerformedContactMigration(this);
-        if (!hasPerformedContactMigration) {
-            TextSecurePreferences.INSTANCE.setPerformedContactMigration(this);
-            Set<Recipient> allContacts = ContactUtilities.getAllContacts(this);
-            SessionContactDatabase contactDB = DatabaseFactory.getSessionContactDatabase(this);
-            LokiUserDatabase userDB = DatabaseFactory.getLokiUserDatabase(this);
-            for (Recipient recipient : allContacts) {
-                if (recipient.isGroupRecipient()) { continue; }
-                String sessionID = recipient.getAddress().serialize();
-                Contact contact = contactDB.getContactWithSessionID(sessionID);
-                if (contact == null) {
-                    contact = new Contact(sessionID);
-                    String name = userDB.getDisplayName(sessionID);
-                    contact.setName(name);
-                    contact.setProfilePictureURL(recipient.getProfileAvatar());
-                    contact.setProfilePictureEncryptionKey(recipient.getProfileKey());
-                    contact.setTrusted(true);
-                }
-                contactDB.setContact(contact);
-            }
-        }
         if (poller != null) {
             poller.setCaughtUp(false);
         }
@@ -487,7 +467,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
         boolean isUsingFCM = TextSecurePreferences.isUsingFCM(this);
         TextSecurePreferences.clearAll(this);
         if (isMigratingToV2KeyPair) {
-            TextSecurePreferences.setIsMigratingKeyPair(this, true);
             TextSecurePreferences.setIsUsingFCM(this, isUsingFCM);
             TextSecurePreferences.setProfileName(this, displayName);
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
index 0b36a73eed..e28b419880 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -189,7 +189,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
       CharSequence relativeTimeSpan;
 
       if (mediaItem.date > 0) {
-        relativeTimeSpan = DateUtils.getExtendedRelativeTimeSpanString(this, Locale.getDefault(), mediaItem.date);
+        relativeTimeSpan = DateUtils.getDisplayFormattedTimeSpanString(this, Locale.getDefault(), mediaItem.date);
       } else {
         relativeTimeSpan = getString(R.string.MediaPreviewActivity_draft);
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java
index e150c1656b..ca6cf8f6c8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java
@@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
 
 
 import org.thoughtcrime.securesms.database.model.MessageRecord;
-import org.thoughtcrime.securesms.loki.views.UserView;
+import org.thoughtcrime.securesms.contacts.UserView;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.Conversions;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index df61907714..7cbb0533f0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -39,7 +39,7 @@ import android.widget.ImageView;
 import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
 import androidx.core.os.CancellationSignal;
 
-import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
+import org.thoughtcrime.securesms.util.AnimationCompleteListener;
 import org.thoughtcrime.securesms.components.AnimatingToggle;
 import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.service.KeyCachingService;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
index d4e836ae4d..a791d77a57 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
@@ -12,8 +12,8 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import org.session.libsignal.utilities.Log;
-import org.thoughtcrime.securesms.loki.activities.HomeActivity;
-import org.thoughtcrime.securesms.loki.activities.LandingActivity;
+import org.thoughtcrime.securesms.home.HomeActivity;
+import org.thoughtcrime.securesms.onboarding.LandingActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.session.libsession.utilities.TextSecurePreferences;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java
index ba7e145bf4..d92ff18d0a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java
@@ -42,9 +42,8 @@ import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.session.libsignal.utilities.Log;
-import org.thoughtcrime.securesms.loki.fragments.ContactSelectionListFragment;
-import org.thoughtcrime.securesms.loki.fragments.ContactSelectionListLoader.DisplayMode;
-import org.thoughtcrime.securesms.mediasend.Media;
+import org.thoughtcrime.securesms.contacts.ContactSelectionListFragment;
+import org.thoughtcrime.securesms.contacts.ContactSelectionListLoader.DisplayMode;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.session.libsession.utilities.recipients.Recipient;
@@ -54,7 +53,6 @@ import org.session.libsession.utilities.ViewUtil;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 
 import network.loki.messenger.R;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java
index d593cdca96..37fdf2367d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java
@@ -11,7 +11,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import org.session.libsession.utilities.Address;
-import org.thoughtcrime.securesms.loki.activities.HomeActivity;
+import org.thoughtcrime.securesms.home.HomeActivity;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupRestoreActivity.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/BackupRestoreActivity.kt
index a1bc90237b..33b0a8a3fc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupRestoreActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.backup;
 
 import android.app.Activity
 import android.app.Application
@@ -9,17 +9,13 @@ import android.os.Bundle
 import android.provider.OpenableColumns
 import android.text.Spannable
 import android.text.SpannableStringBuilder
-import android.text.method.LinkMovementMethod
 import android.text.style.ClickableSpan
 import android.text.style.StyleSpan
 import android.view.View
-import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
-import androidx.core.widget.addTextChangedListener
-import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
@@ -28,18 +24,17 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.BaseActionBarActivity
-import org.thoughtcrime.securesms.backup.FullBackupImporter
 import org.thoughtcrime.securesms.backup.FullBackupImporter.DatabaseDowngradeException
 import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.session.libsignal.utilities.Log
-import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo
-import org.thoughtcrime.securesms.loki.utilities.show
+import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo
+import org.thoughtcrime.securesms.util.show
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.util.BackupUtil
 import org.session.libsession.utilities.TextSecurePreferences
+import org.thoughtcrime.securesms.home.HomeActivity
 
 class BackupRestoreActivity : BaseActionBarActivity() {
 
@@ -188,7 +183,6 @@ class BackupRestoreViewModel(application: Application): AndroidViewModel(applica
                 TextSecurePreferences.setRestorationTime(context, System.currentTimeMillis())
                 TextSecurePreferences.setHasViewedSeed(context, true)
                 TextSecurePreferences.setHasSeenWelcomeScreen(context, true)
-                val application = ApplicationContext.getInstance(context)
 
                 BackupRestoreResult.SUCCESS
             } catch (e: DatabaseDowngradeException) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt
index 25c902800e..3ea5d8e400 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt
@@ -21,8 +21,7 @@ import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream
 import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream
 import org.thoughtcrime.securesms.database.*
 import org.session.libsignal.utilities.Log
-import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase
-import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase
+import org.thoughtcrime.securesms.database.LokiBackupFilesDatabase
 import org.thoughtcrime.securesms.util.BackupUtil
 import org.session.libsession.utilities.Util
 import org.session.libsignal.crypto.kdf.HKDFv3
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
index c0757fea24..21797a9eef 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -19,7 +19,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 
 
-import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator;
+import org.thoughtcrime.securesms.util.AvatarPlaceholderGenerator;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/LabeledSeparatorView.kt
similarity index 95%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt
rename to app/src/main/java/org/thoughtcrime/securesms/components/LabeledSeparatorView.kt
index 5a7cdc8c14..34273e565c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/LabeledSeparatorView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.views
+package org.thoughtcrime.securesms.components
 
 import android.content.Context
 import android.graphics.Canvas
@@ -9,7 +9,7 @@ import android.view.LayoutInflater
 import android.widget.RelativeLayout
 import kotlinx.android.synthetic.main.view_separator.view.*
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.loki.utilities.toPx
+import org.thoughtcrime.securesms.util.toPx
 import org.session.libsession.utilities.ThemeUtil
 
 class LabeledSeparatorView : RelativeLayout {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
rename to app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt
index b07675f5ea..41e3f510ee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.views
+package org.thoughtcrime.securesms.components
 
 import android.content.Context
 import android.util.AttributeSet
@@ -17,7 +17,7 @@ import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.TextSecurePreferences
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator
+import org.thoughtcrime.securesms.util.AvatarPlaceholderGenerator
 import org.thoughtcrime.securesms.mms.GlideRequests
 
 class ProfilePictureView : RelativeLayout {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
index 85cf9332bf..5e8c9a99c5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
@@ -22,8 +22,8 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import org.session.libsession.messaging.contacts.Contact;
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.loki.database.SessionContactDatabase;
-import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities;
+import org.thoughtcrime.securesms.database.SessionContactDatabase;
+import org.thoughtcrime.securesms.util.UiModeUtilities;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java b/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
index b3ef44585a..8a56acd658 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
@@ -16,7 +16,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 
-import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
+import org.thoughtcrime.securesms.util.AnimationCompleteListener;
 
 import network.loki.messenger.R;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java
index 027a319651..b1ef0f9f72 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java
@@ -8,7 +8,7 @@ import org.session.libsession.messaging.messages.control.TypingIndicator;
 import org.session.libsession.messaging.sending_receiving.MessageSender;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
-import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol;
+import org.thoughtcrime.securesms.util.SessionMetaProtocol;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.Util;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
rename to app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.kt
index ba039009bc..73be89270a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.fragments
+package org.thoughtcrime.securesms.contacts
 
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
@@ -7,7 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import kotlinx.android.synthetic.main.contact_selection_list_divider.view.*
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.loki.views.UserView
+import org.thoughtcrime.securesms.contacts.UserView
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.session.libsession.utilities.recipients.Recipient
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListFragment.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListFragment.kt
index 8a68d4e3b8..b32e5a20b8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListFragment.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.fragments
+package org.thoughtcrime.securesms.contacts
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
@@ -11,10 +11,11 @@ import android.view.View
 import android.view.ViewGroup
 import kotlinx.android.synthetic.main.contact_selection_list_fragment.*
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.contacts.ContactsCursorLoader
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.session.libsession.utilities.recipients.Recipient
+import org.thoughtcrime.securesms.contacts.ContactSelectionListItem
+import org.thoughtcrime.securesms.contacts.ContactSelectionListLoader
 
 class ContactSelectionListFragment : Fragment(), LoaderManager.LoaderCallbacks<List<ContactSelectionListItem>>, ContactClickListener {
     private var cursorFilter: String? = null
@@ -98,7 +99,7 @@ class ContactSelectionListFragment : Fragment(), LoaderManager.LoaderCallbacks<L
         update(listOf())
     }
 
-    private fun update(items: List<ContactSelectionListItem>) {        
+    private fun update(items: List<ContactSelectionListItem>) {
         if (activity?.isDestroyed == true) {
             Log.e(ContactSelectionListFragment::class.java.name,
                     "Received a loader callback after the fragment was detached from the activity.",
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListLoader.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt
rename to app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListLoader.kt
index 8eab5b3a8b..3a2b2cbb5c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListLoader.kt
@@ -1,8 +1,8 @@
-package org.thoughtcrime.securesms.loki.fragments
+package org.thoughtcrime.securesms.contacts
 
 import android.content.Context
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.loki.utilities.ContactUtilities
+import org.thoughtcrime.securesms.util.ContactUtilities
 import org.session.libsession.utilities.recipients.Recipient
 import org.thoughtcrime.securesms.util.AsyncLoader
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/SelectContactsActivity.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/contacts/SelectContactsActivity.kt
index 34a511c27a..bf7a4f6ec8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/SelectContactsActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.contacts
 
 import android.app.Activity
 import android.content.Intent
@@ -40,8 +40,8 @@ class SelectContactsActivity : PassphraseRequiredActionBarActivity(), LoaderMana
         setContentView(R.layout.activity_select_contacts)
         supportActionBar!!.title = resources.getString(R.string.activity_select_contacts_title)
 
-        usersToExclude = intent.getStringArrayExtra(Companion.usersToExcludeKey)?.toSet() ?: setOf()
-        val emptyStateText = intent.getStringExtra(Companion.emptyStateTextKey)
+        usersToExclude = intent.getStringArrayExtra(usersToExcludeKey)?.toSet() ?: setOf()
+        val emptyStateText = intent.getStringExtra(emptyStateTextKey)
         if (emptyStateText != null) {
             emptyStateMessageTextView.text = emptyStateText
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/SelectContactsAdapter.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
rename to app/src/main/java/org/thoughtcrime/securesms/contacts/SelectContactsAdapter.kt
index 2ce6d89ebf..5e3ae1213c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/SelectContactsAdapter.kt
@@ -1,10 +1,9 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.contacts
 
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
 import android.view.ViewGroup
 import org.session.libsession.utilities.Address
-import org.thoughtcrime.securesms.loki.views.UserView
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.session.libsession.utilities.recipients.Recipient
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsLoader.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/SelectContactsLoader.kt
similarity index 81%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsLoader.kt
rename to app/src/main/java/org/thoughtcrime/securesms/contacts/SelectContactsLoader.kt
index a0dc10c34d..f71c9b560c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsLoader.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/SelectContactsLoader.kt
@@ -1,7 +1,7 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.contacts
 
 import android.content.Context
-import org.thoughtcrime.securesms.loki.utilities.ContactUtilities
+import org.thoughtcrime.securesms.util.ContactUtilities
 import org.thoughtcrime.securesms.util.AsyncLoader
 
 class SelectContactsLoader(context: Context, val usersToExclude: Set<String>) : AsyncLoader<List<String>>(context) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/UserView.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/UserView.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/views/UserView.kt
rename to app/src/main/java/org/thoughtcrime/securesms/contacts/UserView.kt
index 7dae953974..d2101973e7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/UserView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/UserView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.views
+package org.thoughtcrime.securesms.contacts
 
 import android.content.Context
 import android.util.AttributeSet
@@ -10,7 +10,7 @@ import kotlinx.android.synthetic.main.view_user.view.*
 import network.loki.messenger.R
 import org.session.libsession.messaging.contacts.Contact
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.loki.utilities.MentionManagerUtilities
+import org.thoughtcrime.securesms.conversation.v2.utilities.MentionManagerUtilities
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.session.libsession.utilities.recipients.Recipient
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index defdadf38d..835c35bcb6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -23,6 +23,8 @@ import android.widget.RelativeLayout
 import android.widget.Toast
 import androidx.annotation.DimenRes
 import androidx.appcompat.app.AlertDialog
+import androidx.core.view.children
+import androidx.core.view.get
 import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
@@ -40,6 +42,7 @@ import kotlinx.android.synthetic.main.view_conversation.view.*
 import kotlinx.android.synthetic.main.view_input_bar.view.*
 import kotlinx.android.synthetic.main.view_input_bar_recording.*
 import kotlinx.android.synthetic.main.view_input_bar_recording.view.*
+import kotlinx.android.synthetic.main.view_visible_message.view.*
 import network.loki.messenger.R
 import nl.komponents.kovenant.ui.failUi
 import nl.komponents.kovenant.ui.successUi
@@ -69,7 +72,6 @@ import org.session.libsession.utilities.concurrent.SimpleTask
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.recipients.RecipientModifiedListener
 import org.session.libsignal.utilities.ListenableFuture
-import org.session.libsignal.utilities.SettableFuture
 import org.session.libsignal.utilities.guava.Optional
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
@@ -84,8 +86,7 @@ import org.thoughtcrime.securesms.conversation.v2.input_bar.mentions.MentionCand
 import org.thoughtcrime.securesms.conversation.v2.menus.ConversationActionModeCallback
 import org.thoughtcrime.securesms.conversation.v2.menus.ConversationActionModeCallbackDelegate
 import org.thoughtcrime.securesms.conversation.v2.menus.ConversationMenuHelper
-import org.thoughtcrime.securesms.conversation.v2.messages.VisibleMessageContentViewDelegate
-import org.thoughtcrime.securesms.conversation.v2.messages.VisibleMessageView
+import org.thoughtcrime.securesms.conversation.v2.messages.*
 import org.thoughtcrime.securesms.conversation.v2.search.SearchBottomBar
 import org.thoughtcrime.securesms.conversation.v2.search.SearchViewModel
 import org.thoughtcrime.securesms.conversation.v2.utilities.AttachmentManager
@@ -100,20 +101,16 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewViewModel
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewViewModel.LinkPreviewState
-import org.thoughtcrime.securesms.loki.activities.SelectContactsActivity
-import org.thoughtcrime.securesms.loki.activities.SelectContactsActivity.Companion.selectedContactsKey
-import org.thoughtcrime.securesms.loki.utilities.ActivityDispatcher
-import org.thoughtcrime.securesms.loki.utilities.MentionUtilities
-import org.thoughtcrime.securesms.loki.utilities.push
-import org.thoughtcrime.securesms.loki.utilities.toPx
+import org.thoughtcrime.securesms.contacts.SelectContactsActivity
+import org.thoughtcrime.securesms.contacts.SelectContactsActivity.Companion.selectedContactsKey
+import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities
+import org.thoughtcrime.securesms.util.toPx
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.mediasend.MediaSendActivity
 import org.thoughtcrime.securesms.mms.*
 import org.thoughtcrime.securesms.notifications.MarkReadReceiver
 import org.thoughtcrime.securesms.permissions.Permissions
-import org.thoughtcrime.securesms.util.DateUtils
-import org.thoughtcrime.securesms.util.MediaUtil
-import org.thoughtcrime.securesms.util.SaveAttachmentTask
+import org.thoughtcrime.securesms.util.*
 import java.util.*
 import java.util.concurrent.ExecutionException
 import kotlin.math.*
@@ -125,7 +122,7 @@ import kotlin.math.*
 class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDelegate,
         InputBarRecordingViewDelegate, AttachmentManager.AttachmentListener, ActivityDispatcher,
         ConversationActionModeCallbackDelegate, VisibleMessageContentViewDelegate, RecipientModifiedListener,
-        SearchBottomBar.EventListener {
+        SearchBottomBar.EventListener, VoiceMessageViewDelegate {
     private val screenWidth = Resources.getSystem().displayMetrics.widthPixels
     private var linkPreviewViewModel: LinkPreviewViewModel? = null
     private var threadID: Long = -1
@@ -213,6 +210,11 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             threadID = DatabaseFactory.getThreadDatabase(this).getOrCreateThreadIdFor(recipient)
         }
         this.threadID = threadID
+        val thread = DatabaseFactory.getThreadDatabase(this).getRecipientForThreadId(threadID)
+        if (thread == null) {
+            Toast.makeText(this, "This thread has been deleted.", Toast.LENGTH_LONG).show()
+            return finish()
+        }
         setUpRecyclerView()
         setUpToolBar()
         setUpInputBar()
@@ -232,6 +234,13 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         scrollToFirstUnreadMessageIfNeeded()
         markAllAsRead()
         showOrHideInputIfNeeded()
+        if (this.thread.isOpenGroupRecipient) {
+            val openGroup = DatabaseFactory.getLokiThreadDatabase(this).getOpenGroupChat(threadID)
+            if (openGroup == null) {
+                Toast.makeText(this, "This thread has been deleted.", Toast.LENGTH_LONG).show()
+                return finish()
+            }
+        }
     }
 
     override fun onResume() {
@@ -849,6 +858,21 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         conversationRecyclerView.scrollToPosition(lastSeenItemPosition)
     }
 
+    override fun playNextAudioIfPossible(current: Int) {
+        if (current > 0) {
+            val nextVisibleMessageView = conversationRecyclerView[current - 1] as? VisibleMessageView
+            nextVisibleMessageView?.let { visibleMessageView ->
+                visibleMessageView.messageContentView.mainContainer.children.forEach { child ->
+                    val nextVoiceMessageView = child as? VoiceMessageView
+                    nextVoiceMessageView?.let { voiceMessageView ->
+                        voiceMessageView.togglePlayback()
+                        return@forEach
+                    }
+                }
+            }
+        }
+    }
+
     override fun sendMessage() {
         if (thread.isContactRecipient && thread.isBlocked) {
             BlockedDialog(thread).show(supportFragmentManager, "Blocked Dialog")
@@ -1129,7 +1153,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         for (message in sortedMessages) {
             val body = MentionUtilities.highlightMentions(message.body, message.threadId, this)
             if (TextUtils.isEmpty(body)) { continue }
-            val formattedTimestamp = DateUtils.getExtendedRelativeTimeSpanString(this, Locale.getDefault(), message.timestamp)
+            val formattedTimestamp = DateUtils.getDisplayFormattedTimeSpanString(this, Locale.getDefault(), message.timestamp)
             builder.append("$formattedTimestamp: $body").append('\n')
         }
         if (builder.isNotEmpty() && builder[builder.length - 1] == '\n') {
@@ -1265,7 +1289,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     private fun saveDraft() {
-        val text = inputBar.text.trim()
+        val text = inputBar?.text?.trim() ?: return
         if (text.isEmpty()) { return }
         val drafts = Drafts()
         drafts.add(DraftDatabase.Draft(DraftDatabase.Draft.TEXT, text))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
index 4b413ef89f..a4a5f1ba28 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
@@ -72,6 +72,7 @@ class ConversationAdapter(context: Context, cursor: Cursor, private val onItemPr
                 view.snIsSelected = isSelected
                 view.messageTimestampTextView.isVisible = isSelected
                 val position = viewHolder.adapterPosition
+                view.viewHolderIndex = position
                 view.bind(message, getMessageBefore(position, cursor), getMessageAfter(position, cursor), glide, searchQuery)
                 view.onPress = { event -> onItemPress(message, viewHolder.adapterPosition, view, event) }
                 view.onSwipeToReply = { onItemSwipeToReply(message, viewHolder.adapterPosition) }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRecyclerView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRecyclerView.kt
index 1926024015..475efaba38 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRecyclerView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRecyclerView.kt
@@ -8,8 +8,8 @@ import android.view.VelocityTracker
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.activity_conversation_v2.*
-import org.thoughtcrime.securesms.loki.utilities.disableClipping
-import org.thoughtcrime.securesms.loki.utilities.toPx
+import org.thoughtcrime.securesms.util.disableClipping
+import org.thoughtcrime.securesms.util.toPx
 import kotlin.math.abs
 import kotlin.math.max
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/AlbumThumbnailView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/AlbumThumbnailView.kt
index b4d4ab3941..7cd78cda2b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/AlbumThumbnailView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/AlbumThumbnailView.kt
@@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.MediaPreviewActivity
 import org.thoughtcrime.securesms.components.CornerMask
 import org.thoughtcrime.securesms.conversation.v2.utilities.KThumbnailView
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.loki.utilities.ActivityDispatcher
+import org.thoughtcrime.securesms.util.ActivityDispatcher
 import org.thoughtcrime.securesms.longmessage.LongMessageActivity
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.mms.Slide
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/LinkPreviewDraftView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/LinkPreviewDraftView.kt
index 23c0add0ef..b056c4f9a4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/LinkPreviewDraftView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/LinkPreviewDraftView.kt
@@ -8,7 +8,7 @@ import androidx.core.view.isVisible
 import kotlinx.android.synthetic.main.view_link_preview_draft.view.*
 import network.loki.messenger.R
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview
-import org.thoughtcrime.securesms.loki.utilities.toPx
+import org.thoughtcrime.securesms.util.toPx
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.mms.ImageSlide
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/MentionCandidateSelectionView.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt
rename to app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/MentionCandidateSelectionView.kt
index b7745a67a1..5f16b2317d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/MentionCandidateSelectionView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.views
+package org.thoughtcrime.securesms.conversation.v2.components
 
 import android.content.Context
 import android.util.AttributeSet
@@ -8,7 +8,7 @@ import android.view.ViewGroup
 import android.widget.BaseAdapter
 import android.widget.ListView
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.loki.utilities.toPx
+import org.thoughtcrime.securesms.util.toPx
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.session.libsession.messaging.mentions.Mention
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/MentionCandidateView.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
rename to app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/MentionCandidateView.kt
index e8e1c4f9a4..7c7d8b624b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/MentionCandidateView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.views
+package org.thoughtcrime.securesms.conversation.v2.components
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/OpenGroupGuidelinesView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/OpenGroupGuidelinesView.kt
index e4d7e4a3b6..d6cffd08db 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/OpenGroupGuidelinesView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/OpenGroupGuidelinesView.kt
@@ -8,8 +8,8 @@ import android.widget.FrameLayout
 import kotlinx.android.synthetic.main.view_open_group_guidelines.view.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
-import org.thoughtcrime.securesms.loki.activities.OpenGroupGuidelinesActivity
-import org.thoughtcrime.securesms.loki.utilities.push
+import org.thoughtcrime.securesms.groups.OpenGroupGuidelinesActivity
+import org.thoughtcrime.securesms.util.push
 
 class OpenGroupGuidelinesView : FrameLayout {
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/JoinOpenGroupDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/JoinOpenGroupDialog.kt
index 51d85c3651..0d4c30508f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/JoinOpenGroupDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/JoinOpenGroupDialog.kt
@@ -9,12 +9,11 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import kotlinx.android.synthetic.main.dialog_join_open_group.view.*
 import network.loki.messenger.R
-import org.session.libsession.messaging.open_groups.OpenGroupV2
 import org.session.libsession.utilities.OpenGroupUrlParser
 import org.session.libsignal.utilities.ThreadUtils
 import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
-import org.thoughtcrime.securesms.loki.api.OpenGroupManager
-import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol
+import org.thoughtcrime.securesms.groups.OpenGroupManager
+import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 
 /** Shown upon tapping an open group invitation. */
 class JoinOpenGroupDialog(private val name: String, private val url: String) : BaseDialog() {
@@ -38,7 +37,7 @@ class JoinOpenGroupDialog(private val name: String, private val url: String) : B
         val activity = requireContext() as AppCompatActivity
         ThreadUtils.queue {
             OpenGroupManager.add(openGroup.server, openGroup.room, openGroup.serverPublicKey, activity)
-            MultiDeviceProtocol.forceSyncConfigurationNowIfNeeded(activity)
+            ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(activity)
         }
         dismiss()
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
index f310cd019b..53ebf036ff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
@@ -19,8 +19,8 @@ import org.thoughtcrime.securesms.conversation.v2.messages.QuoteView
 import org.thoughtcrime.securesms.conversation.v2.messages.QuoteViewDelegate
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.loki.utilities.toDp
-import org.thoughtcrime.securesms.loki.utilities.toPx
+import org.thoughtcrime.securesms.util.toDp
+import org.thoughtcrime.securesms.util.toPx
 import org.thoughtcrime.securesms.mms.GlideRequests
 import kotlin.math.max
 import kotlin.math.roundToInt
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarButton.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarButton.kt
index ef1417ea42..25e209424e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarButton.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarButton.kt
@@ -17,10 +17,9 @@ import android.widget.ImageView
 import android.widget.RelativeLayout
 import androidx.annotation.DrawableRes
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.conversation.v2.messages.VisibleMessageView
-import org.thoughtcrime.securesms.loki.utilities.*
-import org.thoughtcrime.securesms.loki.views.GlowViewUtilities
-import org.thoughtcrime.securesms.loki.views.InputBarButtonImageViewContainer
+import org.thoughtcrime.securesms.util.*
+import org.thoughtcrime.securesms.util.GlowViewUtilities
+import org.thoughtcrime.securesms.util.InputBarButtonImageViewContainer
 import java.util.*
 import kotlin.math.abs
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarEditText.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarEditText.kt
index f2d3e5eded..39db2f6d25 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarEditText.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarEditText.kt
@@ -9,7 +9,7 @@ import android.util.Log
 import android.widget.RelativeLayout
 import androidx.appcompat.widget.AppCompatEditText
 import org.thoughtcrime.securesms.conversation.v2.utilities.TextUtilities
-import org.thoughtcrime.securesms.loki.utilities.toPx
+import org.thoughtcrime.securesms.util.toPx
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarRecordingView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarRecordingView.kt
index 0a210d6ae5..cc8166212b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarRecordingView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarRecordingView.kt
@@ -13,9 +13,9 @@ import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isVisible
 import kotlinx.android.synthetic.main.view_input_bar_recording.view.*
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.loki.utilities.animateSizeChange
-import org.thoughtcrime.securesms.loki.utilities.disableClipping
-import org.thoughtcrime.securesms.loki.utilities.toPx
+import org.thoughtcrime.securesms.util.animateSizeChange
+import org.thoughtcrime.securesms.util.disableClipping
+import org.thoughtcrime.securesms.util.toPx
 import org.thoughtcrime.securesms.util.DateUtils
 import java.util.*
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/mentions/MentionCandidatesView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/mentions/MentionCandidatesView.kt
index bbf97f0afd..4fcfba74b2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/mentions/MentionCandidatesView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/mentions/MentionCandidatesView.kt
@@ -8,7 +8,7 @@ import android.view.ViewGroup
 import android.widget.BaseAdapter
 import android.widget.ListView
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.loki.utilities.toPx
+import org.thoughtcrime.securesms.util.toPx
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.session.libsession.messaging.mentions.Mention
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
index 42e36e2c78..62f292e325 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
@@ -31,6 +31,7 @@ class ConversationActionModeCallback(private val adapter: ConversationAdapter, p
         if (selectedItems.isEmpty()) { return }
         val firstMessage = selectedItems.iterator().next()
         val openGroup = DatabaseFactory.getLokiThreadDatabase(context).getOpenGroupChat(threadID)
+        val thread = DatabaseFactory.getThreadDatabase(context).getRecipientForThreadId(threadID)!!
         val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
         fun userCanDeleteSelectedItems(): Boolean {
             if (openGroup == null) { return true }
@@ -54,7 +55,7 @@ class ConversationActionModeCallback(private val adapter: ConversationAdapter, p
         menu.findItem(R.id.menu_context_copy).isVisible = !containsControlMessage && hasText
         // Copy Session ID
         menu.findItem(R.id.menu_context_copy_public_key).isVisible =
-            (openGroup != null && selectedItems.size == 1 && firstMessage.recipient.address.toString() != userPublicKey)
+            (thread.isGroupRecipient && selectedItems.size == 1 && firstMessage.recipient.address.toString() != userPublicKey)
         // Resend
         menu.findItem(R.id.menu_context_resend).isVisible = (selectedItems.size == 1 && firstMessage.isFailed)
         // Save media
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
index 5c26c4d540..93278cb6a6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
@@ -38,10 +38,10 @@ import org.session.libsignal.utilities.toHexString
 import org.thoughtcrime.securesms.*
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity
-import org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity.Companion.groupIDKey
-import org.thoughtcrime.securesms.loki.activities.SelectContactsActivity
-import org.thoughtcrime.securesms.loki.utilities.getColorWithID
+import org.thoughtcrime.securesms.groups.EditClosedGroupActivity
+import org.thoughtcrime.securesms.groups.EditClosedGroupActivity.Companion.groupIDKey
+import org.thoughtcrime.securesms.contacts.SelectContactsActivity
+import org.thoughtcrime.securesms.util.getColorWithID
 import org.thoughtcrime.securesms.util.BitmapUtil
 import java.io.IOException
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt
index f684152482..0457f82702 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt
@@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.conversation.v2.utilities.MessageBubbleUtiliti
 import org.thoughtcrime.securesms.conversation.v2.utilities.ModalURLSpan
 import org.thoughtcrime.securesms.conversation.v2.utilities.TextUtilities.getIntersectedModalSpans
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities
+import org.thoughtcrime.securesms.util.UiModeUtilities
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.mms.ImageSlide
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
index b03b4be278..1798b07f0a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
@@ -1,11 +1,8 @@
 package org.thoughtcrime.securesms.conversation.v2.messages
 
-import android.content.ContentResolver
 import android.content.Context
 import android.content.res.ColorStateList
-import android.content.res.Resources
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
@@ -13,22 +10,19 @@ import androidx.annotation.ColorInt
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.text.toSpannable
 import androidx.core.view.isVisible
-import androidx.core.view.marginStart
-import com.google.android.exoplayer2.util.MimeTypes
 import kotlinx.android.synthetic.main.view_link_preview.view.*
 import kotlinx.android.synthetic.main.view_quote.view.*
 import network.loki.messenger.R
 import org.session.libsession.messaging.contacts.Contact
-import org.session.libsession.messaging.utilities.UpdateMessageData
 import org.session.libsession.utilities.recipients.Recipient
+import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities
 import org.thoughtcrime.securesms.conversation.v2.utilities.TextUtilities
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.database.model.MessageRecord
-import org.thoughtcrime.securesms.loki.utilities.*
+import org.thoughtcrime.securesms.util.*
 import org.thoughtcrime.securesms.mms.GlideRequests
-import org.thoughtcrime.securesms.mms.ImageSlide
 import org.thoughtcrime.securesms.mms.SlideDeck
 import org.thoughtcrime.securesms.util.MediaUtil
+import org.thoughtcrime.securesms.util.UiModeUtilities
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
index 1a9f2d01e2..783eb46cae 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
@@ -6,7 +6,6 @@ import android.graphics.Rect
 import android.graphics.drawable.Drawable
 import android.text.style.BackgroundColorSpan
 import android.text.style.ForegroundColorSpan
-import android.text.method.LinkMovementMethod
 import android.text.style.URLSpan
 import android.text.util.Linkify
 import android.util.AttributeSet
@@ -23,7 +22,6 @@ import androidx.core.graphics.BlendModeColorFilterCompat
 import androidx.core.graphics.BlendModeCompat
 import androidx.core.text.getSpans
 import androidx.core.text.toSpannable
-import androidx.core.text.util.LinkifyCompat
 import kotlinx.android.synthetic.main.view_link_preview.view.*
 import kotlinx.android.synthetic.main.view_visible_message_content.view.*
 import network.loki.messenger.R
@@ -32,15 +30,18 @@ import org.session.libsession.utilities.ViewUtil
 import org.session.libsession.utilities.recipients.Recipient
 import org.thoughtcrime.securesms.conversation.v2.components.AlbumThumbnailView
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView
+import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
 import org.thoughtcrime.securesms.conversation.v2.dialogs.OpenURLDialog
+import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities
 import org.thoughtcrime.securesms.conversation.v2.utilities.ModalURLSpan
 import org.thoughtcrime.securesms.conversation.v2.utilities.TextUtilities.getIntersectedModalSpans
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.loki.utilities.*
+import org.thoughtcrime.securesms.util.*
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.util.SearchUtil
 import org.thoughtcrime.securesms.util.SearchUtil.StyleFactory
+import org.thoughtcrime.securesms.util.UiModeUtilities
 import java.util.*
 import kotlin.math.roundToInt
 
@@ -48,6 +49,7 @@ class VisibleMessageContentView : LinearLayout {
     var onContentClick: ((event: MotionEvent) -> Unit)? = null
     var onContentDoubleTap: (() -> Unit)? = null
     var delegate: VisibleMessageContentViewDelegate? = null
+    var viewHolderIndex: Int = -1
 
     // region Lifecycle
     constructor(context: Context) : super(context) { initialize() }
@@ -109,7 +111,8 @@ class VisibleMessageContentView : LinearLayout {
             // Audio attachment
             if (contactIsTrusted || message.isOutgoing) {
                 val voiceMessageView = VoiceMessageView(context)
-                voiceMessageView.bind(message, isStartOfMessageCluster, isEndOfMessageCluster)
+                voiceMessageView.index = viewHolderIndex
+            voiceMessageView.delegate = context as? ConversationActivityV2voiceMessageView.bind(message, isStartOfMessageCluster, isEndOfMessageCluster)
                 mainContainer.addView(voiceMessageView)
                 // We have to use onContentClick (rather than a click listener directly on the voice
                 // message view) so as to not interfere with all the other gestures.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index 86b92b9498..0fcbf685b4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -24,12 +24,8 @@ import org.session.libsignal.utilities.ThreadUtils
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.model.MessageRecord
-import org.thoughtcrime.securesms.loki.utilities.disableClipping
-import org.thoughtcrime.securesms.loki.utilities.getColorWithID
-import org.thoughtcrime.securesms.loki.utilities.toDp
-import org.thoughtcrime.securesms.loki.utilities.toPx
 import org.thoughtcrime.securesms.mms.GlideRequests
-import org.thoughtcrime.securesms.util.DateUtils
+import org.thoughtcrime.securesms.util.*
 import java.util.*
 import kotlin.math.abs
 import kotlin.math.min
@@ -47,6 +43,7 @@ class VisibleMessageView : LinearLayout {
     private var longPressCallback: Runnable? = null
     private var onDownTimestamp = 0L
     private var onDoubleTap: (() -> Unit)? = null
+    var viewHolderIndex: Int = -1
     var snIsSelected = false
         set(value) { field = value; handleIsSelectedChanged()}
     var onPress: ((event: MotionEvent) -> Unit)? = null
@@ -82,7 +79,7 @@ class VisibleMessageView : LinearLayout {
         val senderSessionID = sender.address.serialize()
         val threadID = message.threadId
         val threadDB = DatabaseFactory.getThreadDatabase(context)
-        val thread = threadDB.getRecipientForThreadId(threadID)!!
+        val thread = threadDB.getRecipientForThreadId(threadID) ?: return
         val contactDB = DatabaseFactory.getSessionContactDatabase(context)
         val contact = contactDB.getContactWithSessionID(senderSessionID)
         val isGroupThread = thread.isGroupRecipient
@@ -96,7 +93,7 @@ class VisibleMessageView : LinearLayout {
             profilePictureView.glide = glide
             profilePictureView.update()
             if (thread.isOpenGroupRecipient) {
-                val openGroup = DatabaseFactory.getLokiThreadDatabase(context).getOpenGroupChat(threadID)!!
+                val openGroup = DatabaseFactory.getLokiThreadDatabase(context).getOpenGroupChat(threadID) ?: return
                 val isModerator = OpenGroupAPIV2.isUserModerator(senderSessionID, openGroup.room, openGroup.server)
                 moderatorIconImageView.visibility = if (isModerator) View.VISIBLE else View.INVISIBLE
             } else {
@@ -110,11 +107,11 @@ class VisibleMessageView : LinearLayout {
             senderNameTextView.visibility = View.GONE
         }
         // Date break
-        val showDateBreak = (previous == null || !DateUtils.isSameDay(message.timestamp, previous.timestamp))
+        val showDateBreak = (previous == null || !DateUtils.isSameHour(message.timestamp, previous.timestamp))
         dateBreakTextView.isVisible = showDateBreak
-        dateBreakTextView.text = if (showDateBreak) DateUtils.getRelativeDate(context, Locale.getDefault(), message.timestamp) else ""
+        dateBreakTextView.text = if (showDateBreak) DateUtils.getDisplayFormattedTimeSpanString(context, Locale.getDefault(), message.timestamp) else ""
         // Timestamp
-        messageTimestampTextView.text = DateUtils.getExtendedRelativeTimeSpanString(context, Locale.getDefault(), message.timestamp)
+        messageTimestampTextView.text = DateUtils.getDisplayFormattedTimeSpanString(context, Locale.getDefault(), message.timestamp)
         // Margins
         val startPadding: Int
         if (isGroupThread) {
@@ -152,6 +149,7 @@ class VisibleMessageView : LinearLayout {
         var maxWidth = screenWidth - startPadding - endPadding
         if (profilePictureContainer.visibility != View.GONE) { maxWidth -= profilePictureContainer.width }
         // Populate content view
+        messageContentView.viewHolderIndex = viewHolderIndex
         messageContentView.bind(message, isStartOfMessageCluster, isEndOfMessageCluster, glide, maxWidth, thread, searchQuery, isGroupThread || (contact?.isTrusted ?: false))
         messageContentView.delegate = contentViewDelegate
         onDoubleTap = { messageContentView.onContentDoubleTap?.invoke() }
@@ -176,10 +174,10 @@ class VisibleMessageView : LinearLayout {
 
     private fun isEndOfMessageCluster(current: MessageRecord, next: MessageRecord?, isGroupThread: Boolean): Boolean {
         return if (isGroupThread) {
-            next == null || next.isUpdate || !DateUtils.isSameDay(current.timestamp, next.timestamp)
+            next == null || next.isUpdate || !DateUtils.isSameHour(current.timestamp, next.timestamp)
                 || current.recipient.address != next.recipient.address
         } else {
-            next == null || next.isUpdate || !DateUtils.isSameDay(current.timestamp, next.timestamp)
+            next == null || next.isUpdate || !DateUtils.isSameHour(current.timestamp, next.timestamp)
                 || current.isOutgoing != next.isOutgoing
         }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt
index f647cfe0a6..16992557e3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt
@@ -32,6 +32,8 @@ class VoiceMessageView : LinearLayout, AudioSlidePlayer.Listener {
     private var duration = 0L
     private var player: AudioSlidePlayer? = null
     private var isPreparing = false
+    var delegate: VoiceMessageViewDelegate? = null
+    var index = -1
 
     // region Lifecycle
     constructor(context: Context) : super(context) { initialize() }
@@ -84,6 +86,7 @@ class VoiceMessageView : LinearLayout, AudioSlidePlayer.Listener {
         if (progress == 1.0) {
             togglePlayback()
             handleProgressChanged(0.0)
+            delegate?.playNextAudioIfPossible(index)
         } else {
             handleProgressChanged(progress)
         }
@@ -133,3 +136,8 @@ class VoiceMessageView : LinearLayout, AudioSlidePlayer.Listener {
     }
     // endregion
 }
+
+interface VoiceMessageViewDelegate {
+
+    fun playNextAudioIfPossible(current: Int)
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt
index 79bb1405a7..e1456a7f94 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt
@@ -6,7 +6,7 @@ import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
-import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities
+import org.thoughtcrime.securesms.util.UiModeUtilities
 
 open class BaseDialog : DialogFragment() {
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionManagerUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionManagerUtilities.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionManagerUtilities.kt
rename to app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionManagerUtilities.kt
index 000b61db89..31d650a671 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionManagerUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionManagerUtilities.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.conversation.v2.utilities
 
 import android.content.Context
 import org.session.libsession.utilities.TextSecurePreferences
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt
rename to app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt
index d54d19f0ee..3a0c6e7c15 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.conversation.v2.utilities
 
 import android.content.Context
 import android.graphics.Typeface
@@ -13,6 +13,7 @@ import nl.komponents.kovenant.combine.Tuple2
 import org.session.libsession.messaging.contacts.Contact
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.session.libsession.utilities.TextSecurePreferences
+import org.thoughtcrime.securesms.util.UiModeUtilities
 import java.util.regex.Pattern
 
 object MentionUtilities {
diff --git a/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
similarity index 57%
rename from libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java
rename to app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
index d42f5c2ac5..a5333ef5d4 100644
--- a/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
@@ -15,21 +15,22 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.session.libsession.utilities;
+package org.thoughtcrime.securesms.crypto;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
+import android.os.Build;
+
 import androidx.annotation.NonNull;
 
-import org.session.libsignal.crypto.ecc.ECPublicKey;
 import org.session.libsignal.crypto.IdentityKey;
 import org.session.libsignal.crypto.IdentityKeyPair;
-import org.session.libsignal.exceptions.InvalidKeyException;
 import org.session.libsignal.crypto.ecc.Curve;
 import org.session.libsignal.crypto.ecc.ECKeyPair;
 import org.session.libsignal.crypto.ecc.ECPrivateKey;
-
+import org.session.libsignal.crypto.ecc.ECPublicKey;
+import org.session.libsignal.exceptions.InvalidKeyException;
 import org.session.libsignal.utilities.Base64;
 
 import java.io.IOException;
@@ -45,19 +46,41 @@ public class IdentityKeyUtil {
 
   @SuppressWarnings("unused")
   private static final String TAG = IdentityKeyUtil.class.getSimpleName();
+  private static final String ENCRYPTED_SUFFIX = "_encrypted";
 
   public static final String IDENTITY_PUBLIC_KEY_PREF                    = "pref_identity_public_v3";
   public static final String IDENTITY_PRIVATE_KEY_PREF                   = "pref_identity_private_v3";
   public static final String ED25519_PUBLIC_KEY                          = "pref_ed25519_public_key";
   public static final String ED25519_SECRET_KEY                          = "pref_ed25519_secret_key";
   public static final String LOKI_SEED                                   = "loki_seed";
+  public static final String HAS_MIGRATED_KEY                            = "has_migrated_keys";
+
+  private static SharedPreferences getSharedPreferences(Context context) {
+    return context.getSharedPreferences(MASTER_SECRET_UTIL_PREFERENCES_NAME, 0);
+  }
 
   public static boolean hasIdentityKey(Context context) {
-    SharedPreferences preferences = context.getSharedPreferences(MASTER_SECRET_UTIL_PREFERENCES_NAME, 0);
+    SharedPreferences preferences = getSharedPreferences(context);
 
-    return
-        preferences.contains(IDENTITY_PUBLIC_KEY_PREF) &&
-        preferences.contains(IDENTITY_PRIVATE_KEY_PREF);
+    return (preferences.contains(IDENTITY_PUBLIC_KEY_PREF) &&
+            preferences.contains(IDENTITY_PRIVATE_KEY_PREF))
+            || (preferences.contains(IDENTITY_PUBLIC_KEY_PREF+ENCRYPTED_SUFFIX) &&
+            preferences.contains(IDENTITY_PRIVATE_KEY_PREF+ENCRYPTED_SUFFIX));
+  }
+
+  public static void checkUpdate(Context context) {
+    SharedPreferences preferences = getSharedPreferences(context);
+    // check if any keys are not migrated
+    if (hasIdentityKey(context) && !preferences.getBoolean(HAS_MIGRATED_KEY, false)) {
+      // this will retrieve and force upgrade if possible
+      // retrieve will force upgrade if available
+      retrieve(context,IDENTITY_PUBLIC_KEY_PREF);
+      retrieve(context,IDENTITY_PRIVATE_KEY_PREF);
+      retrieve(context,ED25519_PUBLIC_KEY);
+      retrieve(context,ED25519_SECRET_KEY);
+      retrieve(context,LOKI_SEED);
+      preferences.edit().putBoolean(HAS_MIGRATED_KEY, true).apply();
+    }
   }
 
   public static @NonNull IdentityKey getIdentityKey(@NonNull Context context) {
@@ -94,14 +117,56 @@ public class IdentityKeyUtil {
 
   public static String retrieve(Context context, String key) {
     SharedPreferences preferences = context.getSharedPreferences(MASTER_SECRET_UTIL_PREFERENCES_NAME, 0);
-    return preferences.getString(key, null);
+
+    String unencryptedSecret = preferences.getString(key, null);
+    String encryptedSecret   = preferences.getString(key+ENCRYPTED_SUFFIX, null);
+
+    if      (unencryptedSecret != null) return getUnencryptedSecret(key, unencryptedSecret, context);
+    else if (encryptedSecret != null)   return getEncryptedSecret(encryptedSecret);
+
+    return null;
   }
 
+  private static String getUnencryptedSecret(String key, String unencryptedSecret, Context context) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+      return unencryptedSecret;
+    } else {
+      KeyStoreHelper.SealedData encryptedSecret = KeyStoreHelper.seal(unencryptedSecret.getBytes());
+
+      // save the encrypted suffix secret "key_encrypted"
+      save(context,key+ENCRYPTED_SUFFIX,encryptedSecret.serialize());
+      // delete the regular secret "key"
+      delete(context,key);
+
+      return unencryptedSecret;
+    }
+  }
+
+  private static String getEncryptedSecret(String encryptedSecret) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+      throw new AssertionError("OS downgrade not supported. KeyStore sealed data exists on platform < M!");
+    } else {
+      KeyStoreHelper.SealedData sealedData = KeyStoreHelper.SealedData.fromString(encryptedSecret);
+      return new String(KeyStoreHelper.unseal(sealedData));
+    }
+  }
+
+
   public static void save(Context context, String key, String value) {
     SharedPreferences preferences   = context.getSharedPreferences(MASTER_SECRET_UTIL_PREFERENCES_NAME, 0);
     Editor preferencesEditor        = preferences.edit();
 
-    preferencesEditor.putString(key, value);
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      boolean isEncryptedSuffix = key.endsWith(ENCRYPTED_SUFFIX);
+      if (isEncryptedSuffix) {
+        preferencesEditor.putString(key, value);
+      } else {
+        KeyStoreHelper.SealedData encryptedSecret = KeyStoreHelper.seal(value.getBytes());
+        preferencesEditor.putString(key+ENCRYPTED_SUFFIX, encryptedSecret.serialize());
+      }
+    } else {
+      preferencesEditor.putString(key, value);
+    }
     if (!preferencesEditor.commit()) throw new AssertionError("failed to save identity key/value to shared preferences");
   }
 
diff --git a/libsession/src/main/java/org/session/libsession/utilities/KeyPairUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/crypto/KeyPairUtilities.kt
similarity index 98%
rename from libsession/src/main/java/org/session/libsession/utilities/KeyPairUtilities.kt
rename to app/src/main/java/org/thoughtcrime/securesms/crypto/KeyPairUtilities.kt
index dfefaa2f12..652732f081 100644
--- a/libsession/src/main/java/org/session/libsession/utilities/KeyPairUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/KeyPairUtilities.kt
@@ -1,4 +1,4 @@
-package org.session.libsession.utilities
+package org.thoughtcrime.securesms.crypto
 
 import android.content.Context
 import com.goterl.lazysodium.LazySodiumAndroid
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MnemonicUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/crypto/MnemonicUtilities.kt
similarity index 88%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MnemonicUtilities.kt
rename to app/src/main/java/org/thoughtcrime/securesms/crypto/MnemonicUtilities.kt
index 226bb1abfd..04cdd85ae4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MnemonicUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/MnemonicUtilities.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.crypto
 
 import android.content.Context
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/BackupFileRecord.kt b/app/src/main/java/org/thoughtcrime/securesms/database/BackupFileRecord.kt
similarity index 88%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/database/BackupFileRecord.kt
rename to app/src/main/java/org/thoughtcrime/securesms/database/BackupFileRecord.kt
index 0d3fc63bcf..7a78a09892 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/BackupFileRecord.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/BackupFileRecord.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.database
+package org.thoughtcrime.securesms.database
 
 import android.net.Uri
 import java.util.*
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java b/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java
index 9a87fa8730..211223fd41 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java
@@ -25,13 +25,8 @@ import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
 import org.thoughtcrime.securesms.crypto.DatabaseSecret;
 import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
-import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase;
-import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase;
-import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase;
-import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
-import org.thoughtcrime.securesms.loki.database.LokiUserDatabase;
-import org.thoughtcrime.securesms.loki.database.SessionJobDatabase;
-import org.thoughtcrime.securesms.loki.database.SessionContactDatabase;
+import org.thoughtcrime.securesms.database.LokiAPIDatabase;
+import org.thoughtcrime.securesms.database.SessionJobDatabase;
 
 public class DatabaseFactory {
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/DatabaseUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseUtilities.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/DatabaseUtilities.kt
rename to app/src/main/java/org/thoughtcrime/securesms/database/DatabaseUtilities.kt
index 23834fb9af..b063eb1b63 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/DatabaseUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseUtilities.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.database
 
 import android.content.ContentValues
 import androidx.core.database.getStringOrNull
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/LokiAPIDatabase.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
rename to app/src/main/java/org/thoughtcrime/securesms/database/LokiAPIDatabase.kt
index 91f04adef8..ab0e0ba0f7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/LokiAPIDatabase.kt
@@ -1,23 +1,26 @@
-package org.thoughtcrime.securesms.loki.database
+package org.thoughtcrime.securesms.database
 
 import android.content.ContentValues
 import android.content.Context
-import org.session.libsession.utilities.IdentityKeyUtil
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.crypto.ecc.DjbECPrivateKey
 import org.session.libsignal.crypto.ecc.DjbECPublicKey
 import org.session.libsignal.crypto.ecc.ECKeyPair
-import org.session.libsignal.utilities.Snode
 import org.session.libsignal.database.LokiAPIDatabaseProtocol
-import org.session.libsignal.utilities.PublicKeyValidation
-import org.session.libsignal.utilities.removing05PrefixIfNeeded
-import org.session.libsignal.utilities.toHexString
-import org.session.libsignal.utilities.Hex
-import org.session.libsignal.utilities.Log
-import org.thoughtcrime.securesms.database.Database
+import org.session.libsignal.utilities.*
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
+import org.thoughtcrime.securesms.database.*
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
-import org.thoughtcrime.securesms.loki.utilities.*
+import org.thoughtcrime.securesms.util.*
 import java.util.*
+import kotlin.Array
+import kotlin.Boolean
+import kotlin.Int
+import kotlin.Long
+import kotlin.Pair
+import kotlin.String
+import kotlin.arrayOf
+import kotlin.to
 
 class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), LokiAPIDatabaseProtocol {
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiBackupFilesDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/LokiBackupFilesDatabase.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiBackupFilesDatabase.kt
rename to app/src/main/java/org/thoughtcrime/securesms/database/LokiBackupFilesDatabase.kt
index fd92fe4bf1..03e964de71 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiBackupFilesDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/LokiBackupFilesDatabase.kt
@@ -1,10 +1,9 @@
-package org.thoughtcrime.securesms.loki.database
+package org.thoughtcrime.securesms.database
 
 import android.content.ContentValues
 import android.content.Context
 import android.database.Cursor
 import android.net.Uri
-import org.thoughtcrime.securesms.database.Database
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import java.lang.IllegalArgumentException
 import java.util.*
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/LokiMessageDatabase.kt
similarity index 88%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt
rename to app/src/main/java/org/thoughtcrime/securesms/database/LokiMessageDatabase.kt
index fc1aa4351b..c36c197cbb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/LokiMessageDatabase.kt
@@ -1,14 +1,10 @@
-package org.thoughtcrime.securesms.loki.database
+package org.thoughtcrime.securesms.database
 
 import android.content.ContentValues
 import android.content.Context
 import net.sqlcipher.database.SQLiteDatabase.CONFLICT_REPLACE
-import org.thoughtcrime.securesms.database.Database
-import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
-import org.thoughtcrime.securesms.loki.utilities.*
 import org.session.libsignal.database.LokiMessageDatabaseProtocol
-import org.session.libsignal.utilities.Log
 
 class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), LokiMessageDatabaseProtocol {
 
@@ -63,9 +59,9 @@ class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Datab
         val database = databaseHelper.writableDatabase
 
         val serverID = database.get(messageIDTable,
-                "${Companion.messageID} = ? AND ${Companion.messageType} = ?",
+                "${Companion.messageID} = ? AND $messageType = ?",
                 arrayOf(messageID.toString(), (if (isSms) SMS_TYPE else MMS_TYPE).toString())) { cursor ->
-            cursor.getInt(Companion.serverID).toLong()
+            cursor.getInt(serverID).toLong()
         } ?: return
 
         database.beginTransaction()
@@ -89,7 +85,7 @@ class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Datab
         return database.get(messageIDTable,
                 "$messageID = ? AND ${Companion.serverID} = ?",
                 arrayOf(mappedID.toString(), mappedServerID.toString())) { cursor ->
-            cursor.getInt(Companion.messageID).toLong() to (cursor.getInt(messageType) == SMS_TYPE)
+            cursor.getInt(messageID).toLong() to (cursor.getInt(messageType) == SMS_TYPE)
         }
     }
 
@@ -137,18 +133,18 @@ class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Datab
         val database = databaseHelper.writableDatabase
         try {
             val messages = mutableSetOf<Pair<Long,Long>>()
-            database.get(messageThreadMappingTable,  "${Companion.threadID} = ?", arrayOf(threadId.toString())) { cursor ->
+            database.get(messageThreadMappingTable,  "$threadID = ?", arrayOf(threadId.toString())) { cursor ->
                 // for each add
                 while (cursor.moveToNext()) {
-                    messages.add(cursor.getLong(Companion.messageID) to cursor.getLong(Companion.serverID))
+                    messages.add(cursor.getLong(messageID) to cursor.getLong(serverID))
                 }
             }
             var deletedCount = 0L
             database.beginTransaction()
             messages.forEach { (messageId, serverId) ->
-                deletedCount += database.delete(messageIDTable, "${Companion.messageID} = ? AND ${Companion.serverID} = ?", arrayOf(messageId.toString(), serverId.toString()))
+                deletedCount += database.delete(messageIDTable, "$messageID = ? AND $serverID = ?", arrayOf(messageId.toString(), serverId.toString()))
             }
-            val mappingDeleted = database.delete(messageThreadMappingTable, "${Companion.threadID} = ?", arrayOf(threadId.toString()))
+            val mappingDeleted = database.delete(messageThreadMappingTable, "$threadID = ?", arrayOf(threadId.toString()))
             database.setTransactionSuccessful()
         } finally {
             database.endTransaction()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/LokiThreadDatabase.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt
rename to app/src/main/java/org/thoughtcrime/securesms/database/LokiThreadDatabase.kt
index f0f6123b2e..0b45875bd6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/LokiThreadDatabase.kt
@@ -1,12 +1,9 @@
-package org.thoughtcrime.securesms.loki.database
+package org.thoughtcrime.securesms.database
 
 import android.content.ContentValues
 import android.content.Context
 import android.database.Cursor
-import org.thoughtcrime.securesms.database.Database
-import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
-import org.thoughtcrime.securesms.loki.utilities.*
 import org.session.libsession.messaging.open_groups.OpenGroupV2
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.recipients.Recipient
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/LokiUserDatabase.kt
similarity index 92%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
rename to app/src/main/java/org/thoughtcrime/securesms/database/LokiUserDatabase.kt
index fba0d64b36..4a5468c5d4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/LokiUserDatabase.kt
@@ -1,9 +1,7 @@
-package org.thoughtcrime.securesms.loki.database
+package org.thoughtcrime.securesms.database
 
 import android.content.Context
-import org.thoughtcrime.securesms.database.Database
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
-import org.thoughtcrime.securesms.loki.utilities.get
 import org.session.libsession.utilities.TextSecurePreferences
 
 class LokiUserDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
index 87b59132d4..ef68a39cea 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -883,6 +883,7 @@ public class MmsDatabase extends MessagingDatabase {
   }
 
   public void deleteQuotedFromMessages(MessageRecord toDeleteRecord) {
+    if (toDeleteRecord == null) { return; }
     String query = THREAD_ID + " = ?";
     Cursor threadMmsCursor = rawQuery(query, new String[]{String.valueOf(toDeleteRecord.getThreadId())});
     Reader reader = readerFor(threadMmsCursor);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionContactDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SessionContactDatabase.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionContactDatabase.kt
rename to app/src/main/java/org/thoughtcrime/securesms/database/SessionContactDatabase.kt
index 4429289f52..9bcf94ec1e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionContactDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SessionContactDatabase.kt
@@ -1,13 +1,11 @@
-package org.thoughtcrime.securesms.loki.database
+package org.thoughtcrime.securesms.database
 
 import android.content.ContentValues
 import android.content.Context
 import net.sqlcipher.Cursor
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsignal.utilities.Base64
-import org.thoughtcrime.securesms.database.Database
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
-import org.thoughtcrime.securesms.loki.utilities.*
 
 class SessionContactDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper) {
 
@@ -35,7 +33,7 @@ class SessionContactDatabase(context: Context, helper: SQLCipherOpenHelper) : Da
 
     fun getContactWithSessionID(sessionID: String): Contact? {
         val database = databaseHelper.readableDatabase
-        return database.get(sessionContactTable, "${SessionContactDatabase.sessionID} = ?", arrayOf( sessionID )) { cursor ->
+        return database.get(sessionContactTable, "${Companion.sessionID} = ?", arrayOf( sessionID )) { cursor ->
             contactFromCursor(cursor)
         }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionJobDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SessionJobDatabase.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionJobDatabase.kt
rename to app/src/main/java/org/thoughtcrime/securesms/database/SessionJobDatabase.kt
index a0ca59dd0f..49729241a5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionJobDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SessionJobDatabase.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.database
+package org.thoughtcrime.securesms.database
 
 import android.content.ContentValues
 import android.content.Context
@@ -6,10 +6,10 @@ import net.sqlcipher.Cursor
 import org.session.libsession.messaging.jobs.*
 import org.session.libsession.messaging.utilities.Data
 import org.session.libsignal.utilities.Log
-import org.thoughtcrime.securesms.database.Database
+import org.thoughtcrime.securesms.database.*
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer
-import org.thoughtcrime.securesms.loki.utilities.*
+import org.thoughtcrime.securesms.util.*
 
 class SessionJobDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper) {
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
index 85d1586a1b..6dec2c421c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -26,13 +26,11 @@ import org.session.libsignal.messages.SignalServiceGroup
 import org.session.libsignal.utilities.KeyHelper
 import org.session.libsignal.utilities.guava.Optional
 import org.thoughtcrime.securesms.ApplicationContext
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob
-import org.thoughtcrime.securesms.loki.api.OpenGroupManager
-import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase
-import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol
-import org.thoughtcrime.securesms.loki.utilities.get
-import org.thoughtcrime.securesms.loki.utilities.getString
+import org.thoughtcrime.securesms.groups.OpenGroupManager
+import org.thoughtcrime.securesms.util.SessionMetaProtocol
 import org.thoughtcrime.securesms.mms.PartAuthority
 
 class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), StorageProtocol {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index 5643340ec9..16f1f64d4a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -49,7 +49,7 @@ import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
-import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol;
+import org.thoughtcrime.securesms.util.SessionMetaProtocol;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
index 349f7a082b..8c0763d233 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
@@ -23,14 +23,13 @@ import org.thoughtcrime.securesms.database.SearchDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.session.libsignal.utilities.Log;
-import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase;
-import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase;
-import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase;
-import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
-import org.thoughtcrime.securesms.loki.database.LokiUserDatabase;
-import org.thoughtcrime.securesms.loki.database.SessionContactDatabase;
-import org.thoughtcrime.securesms.loki.database.SessionJobDatabase;
-import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsMigration;
+import org.thoughtcrime.securesms.database.LokiAPIDatabase;
+import org.thoughtcrime.securesms.database.LokiBackupFilesDatabase;
+import org.thoughtcrime.securesms.database.LokiMessageDatabase;
+import org.thoughtcrime.securesms.database.LokiThreadDatabase;
+import org.thoughtcrime.securesms.database.LokiUserDatabase;
+import org.thoughtcrime.securesms.database.SessionContactDatabase;
+import org.thoughtcrime.securesms.database.SessionJobDatabase;
 
 public class SQLCipherOpenHelper extends SQLiteOpenHelper {
 
@@ -182,8 +181,6 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
 
       if (oldVersion < lokiV12) {
         db.execSQL(LokiAPIDatabase.getCreateLastMessageHashValueTable2Command());
-        db.execSQL(ClosedGroupsMigration.getCreateCurrentClosedGroupRatchetTableCommand());
-        db.execSQL(ClosedGroupsMigration.getCreateClosedGroupPrivateKeyTableCommand());
       }
 
       if (oldVersion < lokiV13) {
@@ -193,10 +190,6 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
       if (oldVersion < lokiV14_BACKUP_FILES) {
         db.execSQL(LokiBackupFilesDatabase.getCreateTableCommand());
       }
-
-      if (oldVersion < lokiV15) {
-        db.execSQL(ClosedGroupsMigration.getCreateOldClosedGroupRatchetTableCommand());
-      }
       
       if (oldVersion < lokiV16) {
         db.execSQL(LokiAPIDatabase.getCreateOpenGroupProfilePictureTableCommand());
@@ -217,7 +210,6 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
       if (oldVersion < lokiV19) {
         db.execSQL(LokiAPIDatabase.getCreateClosedGroupEncryptionKeyPairsTable());
         db.execSQL(LokiAPIDatabase.getCreateClosedGroupPublicKeysTable());
-        ClosedGroupsMigration.INSTANCE.perform(db);
         db.execSQL("DROP TABLE identities");
         deleteJobRecords(db, "RetrieveProfileJob");
         deleteJobRecords(db,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/dms/CreatePrivateChatActivity.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/dms/CreatePrivateChatActivity.kt
index 6eedd97013..152dafaafd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/dms/CreatePrivateChatActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.dms
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
@@ -32,8 +32,8 @@ import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment
-import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragmentDelegate
+import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragment
+import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragmentDelegate
 
 class CreatePrivateChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCodeWrapperFragmentDelegate {
     private val adapter = CreatePrivateChatActivityAdapter(this)
@@ -191,6 +191,7 @@ class EnterPublicKeyFragment : Fragment() {
     }
 
     private fun handleIsKeyboardShowingChanged() {
+        val optionalContentContainer = optionalContentContainer ?: return
         optionalContentContainer.isVisible = !isKeyboardShowing
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/ClosedGroupEditingOptionsBottomSheet.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt
rename to app/src/main/java/org/thoughtcrime/securesms/groups/ClosedGroupEditingOptionsBottomSheet.kt
index b2f62cc37f..f5a75041a5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ClosedGroupEditingOptionsBottomSheet.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.dialogs
+package org.thoughtcrime.securesms.groups
 
 import android.os.Bundle
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/CreateClosedGroupActivity.kt
similarity index 95%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/groups/CreateClosedGroupActivity.kt
index 9b40454a2b..e8ab3c6337 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/CreateClosedGroupActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.groups
 
 import android.content.Context
 import android.content.Intent
@@ -19,14 +19,15 @@ import org.session.libsession.messaging.sending_receiving.groupSizeLimit
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 
 import org.session.libsession.utilities.Address
-import org.session.libsession.utilities.DistributionTypes
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.loki.utilities.fadeIn
-import org.thoughtcrime.securesms.loki.utilities.fadeOut
+import org.thoughtcrime.securesms.util.fadeIn
+import org.thoughtcrime.securesms.util.fadeOut
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.TextSecurePreferences
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
+import org.thoughtcrime.securesms.contacts.SelectContactsAdapter
+import org.thoughtcrime.securesms.contacts.SelectContactsLoader
 
 //TODO Refactor to avoid using kotlinx.android.synthetic
 class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), LoaderManager.LoaderCallbacks<List<String>> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/viewmodel/DefaultGroupsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/DefaultGroupsViewModel.kt
similarity index 87%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/viewmodel/DefaultGroupsViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/groups/DefaultGroupsViewModel.kt
index d4281a6cfb..a9b6662d8b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/viewmodel/DefaultGroupsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/DefaultGroupsViewModel.kt
@@ -1,10 +1,11 @@
-package org.thoughtcrime.securesms.loki.viewmodel
+package org.thoughtcrime.securesms.groups
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onStart
 import org.session.libsession.messaging.open_groups.OpenGroupAPIV2
+import org.thoughtcrime.securesms.util.State
 
 typealias DefaultGroups = List<OpenGroupAPIV2.DefaultGroup>
 typealias GroupState = State<DefaultGroups>
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt
index d6508e8975..6f53644190 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.groups
 
 import android.content.Context
 import android.content.Intent
@@ -24,15 +24,15 @@ import org.session.libsession.messaging.sending_receiving.groupSizeLimit
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.session.libsession.utilities.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.loki.dialogs.ClosedGroupEditingOptionsBottomSheet
-import org.thoughtcrime.securesms.loki.utilities.fadeIn
-import org.thoughtcrime.securesms.loki.utilities.fadeOut
+import org.thoughtcrime.securesms.util.fadeIn
+import org.thoughtcrime.securesms.util.fadeOut
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.ThemeUtil
 import org.session.libsignal.utilities.toHexString
+import org.thoughtcrime.securesms.contacts.SelectContactsActivity
 import java.io.IOException
 
 class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupLoader.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
rename to app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupLoader.kt
index d2bb17a732..5360f4261d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupLoader.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.groups
 
 import android.content.Context
 import org.thoughtcrime.securesms.database.DatabaseFactory
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupMembersAdapter.kt
similarity index 95%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
rename to app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupMembersAdapter.kt
index 4a451ba222..b2d0f6255a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupMembersAdapter.kt
@@ -1,10 +1,10 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.groups
 
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
 import android.view.ViewGroup
 import org.session.libsession.utilities.Address
-import org.thoughtcrime.securesms.loki.views.UserView
+import org.thoughtcrime.securesms.contacts.UserView
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.TextSecurePreferences
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/JoinPublicChatActivity.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/groups/JoinPublicChatActivity.kt
index 4ce8bbde04..5d6d559a89 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/JoinPublicChatActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.groups
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
@@ -25,22 +25,20 @@ import network.loki.messenger.R
 import okhttp3.HttpUrl
 import org.session.libsession.messaging.open_groups.OpenGroupAPIV2.DefaultGroup
 import org.session.libsession.utilities.Address
-import org.session.libsession.utilities.DistributionTypes
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.PublicKeyValidation
 import org.thoughtcrime.securesms.BaseActionBarActivity
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
-
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
+import org.thoughtcrime.securesms.groups.DefaultGroupsViewModel
 import org.thoughtcrime.securesms.groups.GroupManager
-import org.thoughtcrime.securesms.loki.api.OpenGroupManager
-import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment
-import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragmentDelegate
-import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol
-import org.thoughtcrime.securesms.loki.viewmodel.DefaultGroupsViewModel
-import org.thoughtcrime.securesms.loki.viewmodel.State
+import org.thoughtcrime.securesms.groups.OpenGroupManager
+import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragment
+import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragmentDelegate
+import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
+import org.thoughtcrime.securesms.util.State
 import java.util.*
 
 class JoinPublicChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCodeWrapperFragmentDelegate {
@@ -108,7 +106,7 @@ class JoinPublicChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCode
                 } else {
                     throw Exception("No longer supported.")
                 }
-                MultiDeviceProtocol.forceSyncConfigurationNowIfNeeded(this@JoinPublicChatActivity)
+                ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(this@JoinPublicChatActivity)
                 withContext(Dispatchers.Main) {
                     val recipient = Recipient.from(this@JoinPublicChatActivity, Address.fromSerialized(groupID), false)
                     openConversationActivity(this@JoinPublicChatActivity, threadID, recipient)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/OpenGroupGuidelinesActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupGuidelinesActivity.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/OpenGroupGuidelinesActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupGuidelinesActivity.kt
index 9c714b6eff..3b7827679e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/OpenGroupGuidelinesActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupGuidelinesActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.groups
 
 import android.os.Bundle
 import kotlinx.android.synthetic.main.activity_open_group_guidelines.*
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/OpenGroupManager.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupManager.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/api/OpenGroupManager.kt
rename to app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupManager.kt
index a1b2b208f7..f25e238b0c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/OpenGroupManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupManager.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.api
+package org.thoughtcrime.securesms.groups
 
 import android.content.Context
 import android.graphics.Bitmap
@@ -11,7 +11,6 @@ import org.session.libsession.messaging.sending_receiving.pollers.OpenGroupPolle
 import org.session.libsession.utilities.Util
 import org.session.libsignal.utilities.ThreadUtils
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.groups.GroupManager
 import org.thoughtcrime.securesms.util.BitmapUtil
 import java.util.concurrent.Executors
 
@@ -116,6 +115,7 @@ object OpenGroupManager {
         val lokiThreadDB = DatabaseFactory.getLokiThreadDatabase(context)
         lokiThreadDB.removeOpenGroupChat(threadID)
         ThreadUtils.queue {
+            threadDB.deleteConversation(threadID) // Must be invoked on a background thread
             GroupManager.deleteGroup(groupID, context) // Must be invoked on a background thread
         }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupUtilities.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt
rename to app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupUtilities.kt
index 2f562e87c6..6729b5ca2e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupUtilities.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.groups
 
 import android.content.Context
 import androidx.annotation.WorkerThread
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationOptionsBottomSheet.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
rename to app/src/main/java/org/thoughtcrime/securesms/home/ConversationOptionsBottomSheet.kt
index 9c7b51f31b..4664ea09c4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationOptionsBottomSheet.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.dialogs
+package org.thoughtcrime.securesms.home
 
 import android.os.Bundle
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/ConversationView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
similarity index 92%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/views/ConversationView.kt
rename to app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
index 893c73019e..57681963c1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/ConversationView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.views
+package org.thoughtcrime.securesms.home
 
 import android.content.Context
 import android.content.res.Resources
@@ -15,8 +15,8 @@ import kotlinx.android.synthetic.main.view_conversation.view.*
 import network.loki.messenger.R
 import org.session.libsession.utilities.recipients.Recipient
 import org.thoughtcrime.securesms.database.model.ThreadRecord
-import org.thoughtcrime.securesms.loki.utilities.MentionManagerUtilities.populateUserPublicKeyCacheIfNeeded
-import org.thoughtcrime.securesms.loki.utilities.MentionUtilities.highlightMentions
+import org.thoughtcrime.securesms.conversation.v2.utilities.MentionManagerUtilities.populateUserPublicKeyCacheIfNeeded
+import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities.highlightMentions
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.util.DateUtils
 import java.util.*
@@ -58,7 +58,7 @@ class ConversationView : LinearLayout {
         profilePictureView.update(thread.recipient, thread.threadId)
         val senderDisplayName = getUserDisplayName(thread.recipient) ?: thread.recipient.address.toString()
         conversationViewDisplayNameTextView.text = senderDisplayName
-        timestampTextView.text = DateUtils.getBriefRelativeTimeSpanString(context, Locale.getDefault(), thread.date)
+        timestampTextView.text = DateUtils.getDisplayFormattedTimeSpanString(context, Locale.getDefault(), thread.date)
         muteIndicatorImageView.visibility = if (thread.recipient.isMuted) VISIBLE else GONE
         val rawSnippet = thread.getDisplayBody(context)
         val snippet = highlightMentions(rawSnippet, thread.threadId, context)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
index 58eda3cc91..608091b05f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.home
 
 import android.app.AlertDialog
 import android.content.BroadcastReceiver
@@ -29,28 +29,31 @@ import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import org.session.libsession.messaging.jobs.JobQueue
-import org.session.libsession.messaging.mentions.MentionsManager
 import org.session.libsession.messaging.sending_receiving.MessageSender
-import org.session.libsession.messaging.sending_receiving.pollers.OpenGroupPollerV2
 import org.session.libsession.utilities.*
-import org.session.libsignal.utilities.toHexString
+import org.session.libsession.utilities.Util
 import org.session.libsignal.utilities.ThreadUtils
+import org.session.libsignal.utilities.toHexString
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
-
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.model.ThreadRecord
-import org.thoughtcrime.securesms.loki.api.OpenGroupManager
-import org.thoughtcrime.securesms.loki.dialogs.*
-import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol
-import org.thoughtcrime.securesms.loki.utilities.*
-import org.thoughtcrime.securesms.loki.views.ConversationView
-import org.thoughtcrime.securesms.loki.views.NewConversationButtonSetViewDelegate
-import org.thoughtcrime.securesms.loki.views.SeedReminderViewDelegate
+import org.thoughtcrime.securesms.dms.CreatePrivateChatActivity
+import org.thoughtcrime.securesms.groups.CreateClosedGroupActivity
+import org.thoughtcrime.securesms.groups.JoinPublicChatActivity
+import org.thoughtcrime.securesms.groups.OpenGroupManager
+import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
+import org.thoughtcrime.securesms.util.*
+import org.thoughtcrime.securesms.onboarding.SeedReminderViewDelegate
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.onboarding.SeedActivity
+import org.thoughtcrime.securesms.preferences.SettingsActivity
+import org.thoughtcrime.securesms.util.IP2Country
 import java.io.IOException
+import java.util.*
 
 class HomeActivity : PassphraseRequiredActionBarActivity(), ConversationClickListener, SeedReminderViewDelegate, NewConversationButtonSetViewDelegate {
     private lateinit var glide: GlideRequests
@@ -156,8 +159,8 @@ class HomeActivity : PassphraseRequiredActionBarActivity(), ConversationClickLis
 
     override fun onResume() {
         super.onResume()
-        if (TextSecurePreferences.getLocalNumber(this) == null) {
-            return; } // This can be the case after a secondary device is auto-cleared
+        if (TextSecurePreferences.getLocalNumber(this) == null) { return; } // This can be the case after a secondary device is auto-cleared
+        IdentityKeyUtil.checkUpdate(this)
         profileButton.recycle() // clear cached image before update tje profilePictureView
         profileButton.update()
         val hasViewedSeed = TextSecurePreferences.getHasViewedSeed(this)
@@ -166,7 +169,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(), ConversationClickLis
         }
         if (TextSecurePreferences.getConfigurationMessageSynced(this)) {
             lifecycleScope.launch(Dispatchers.IO) {
-                MultiDeviceProtocol.syncConfigurationIfNeeded(this@HomeActivity)
+                ConfigurationMessageUtilities.syncConfigurationIfNeeded(this@HomeActivity)
             }
         }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeAdapter.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeAdapter.kt
rename to app/src/main/java/org/thoughtcrime/securesms/home/HomeAdapter.kt
index 6005b53b8d..ba718d355f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeAdapter.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.home
 
 import android.content.Context
 import android.database.Cursor
@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.model.ThreadRecord
-import org.thoughtcrime.securesms.loki.views.ConversationView
 import org.thoughtcrime.securesms.mms.GlideRequests
 
 class HomeAdapter(context: Context, cursor: Cursor) : CursorRecyclerViewAdapter<HomeAdapter.ViewHolder>(context, cursor) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeLoader.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeLoader.kt
similarity index 88%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeLoader.kt
rename to app/src/main/java/org/thoughtcrime/securesms/home/HomeLoader.kt
index a48da0c3ca..92e1abacb6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeLoader.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeLoader.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.home
 
 import android.content.Context
 import android.database.Cursor
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/NewConversationButtonSetView.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
rename to app/src/main/java/org/thoughtcrime/securesms/home/NewConversationButtonSetView.kt
index a418369c90..1bd4df55d9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/NewConversationButtonSetView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.views
+package org.thoughtcrime.securesms.home
 
 import android.animation.FloatEvaluator
 import android.animation.PointFEvaluator
@@ -16,7 +16,9 @@ import android.widget.RelativeLayout
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.loki.utilities.*
+import org.thoughtcrime.securesms.util.*
+import org.thoughtcrime.securesms.util.GlowViewUtilities
+import org.thoughtcrime.securesms.util.NewConversationButtonImageView
 
 class NewConversationButtonSetView : RelativeLayout {
     private var expandedButton: Button? = null
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/PathActivity.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/home/PathActivity.kt
index 2a06562bdf..b812d5c0db 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/PathActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.home
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -22,9 +22,10 @@ import network.loki.messenger.R
 import org.session.libsession.snode.OnionRequestAPI
 import org.session.libsignal.utilities.Snode
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
-import org.thoughtcrime.securesms.loki.utilities.*
-import org.thoughtcrime.securesms.loki.views.GlowViewUtilities
-import org.thoughtcrime.securesms.loki.views.PathDotView
+import org.thoughtcrime.securesms.util.*
+import org.thoughtcrime.securesms.util.GlowViewUtilities
+import org.thoughtcrime.securesms.util.IP2Country
+import org.thoughtcrime.securesms.util.PathDotView
 
 class PathActivity : PassphraseRequiredActionBarActivity() {
     private val broadcastReceivers = mutableListOf<BroadcastReceiver>()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/PathStatusView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/PathStatusView.kt
similarity index 95%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
rename to app/src/main/java/org/thoughtcrime/securesms/home/PathStatusView.kt
index 6990849306..85d54a977f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/PathStatusView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.views
+package org.thoughtcrime.securesms.home
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -12,8 +12,8 @@ import android.view.View
 import androidx.annotation.ColorInt
 import network.loki.messenger.R
 import org.session.libsession.snode.OnionRequestAPI
-import org.thoughtcrime.securesms.loki.utilities.getColorWithID
-import org.thoughtcrime.securesms.loki.utilities.toPx
+import org.thoughtcrime.securesms.util.getColorWithID
+import org.thoughtcrime.securesms.util.toPx
 
 class PathStatusView : View {
     private val broadcastReceivers = mutableListOf<BroadcastReceiver>()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
rename to app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt
index c020fc3aee..147216ec6a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.dialogs
+package org.thoughtcrime.securesms.home
 
 import android.annotation.SuppressLint
 import android.content.ClipData
@@ -17,7 +17,6 @@ import network.loki.messenger.R
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.recipients.Recipient
-import org.session.libsession.utilities.SSKEnvironment
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.mms.GlideApp
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
index 0a078fc017..028eb0b421 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
@@ -14,7 +14,6 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraintObserver;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkOrCellServiceConstraint;
 import org.thoughtcrime.securesms.jobmanager.impl.SqlCipherMigrationConstraint;
 import org.thoughtcrime.securesms.jobmanager.impl.SqlCipherMigrationConstraintObserver;
-import org.thoughtcrime.securesms.loki.api.PrepareAttachmentAudioExtrasJob;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
index 147db87ce5..e5715db263 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
@@ -6,7 +6,7 @@ import org.session.libsession.messaging.utilities.Data;
 import org.session.libsignal.utilities.NoExternalStorageException;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.session.libsignal.utilities.Log;
-import org.thoughtcrime.securesms.loki.database.BackupFileRecord;
+import org.thoughtcrime.securesms.database.BackupFileRecord;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.service.GenericForegroundService;
 import org.thoughtcrime.securesms.util.BackupUtil;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/PrepareAttachmentAudioExtrasJob.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt
rename to app/src/main/java/org/thoughtcrime/securesms/jobs/PrepareAttachmentAudioExtrasJob.kt
index fa92ba3d29..017c335712 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PrepareAttachmentAudioExtrasJob.kt
@@ -1,9 +1,7 @@
-package org.thoughtcrime.securesms.loki.api
+package org.thoughtcrime.securesms.jobs
 
-import android.media.MediaDataSource
 import android.os.Build
 import org.session.libsignal.utilities.Log
-import androidx.annotation.RequiresApi
 import org.greenrobot.eventbus.EventBus
 import org.session.libsession.messaging.utilities.Data
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment
@@ -13,9 +11,7 @@ import org.session.libsession.utilities.DecodedAudio
 import org.session.libsession.utilities.InputStreamMediaDataSource
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.jobmanager.Job
-import org.thoughtcrime.securesms.jobs.BaseJob
 import org.thoughtcrime.securesms.mms.PartAuthority
-import java.io.InputStream
 import java.lang.IllegalStateException
 import java.util.*
 import java.util.concurrent.TimeUnit
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatInfoUpdateWorker.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatInfoUpdateWorker.kt
deleted file mode 100644
index db0e6c5e7f..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatInfoUpdateWorker.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.thoughtcrime.securesms.loki.api
-
-import android.content.Context
-import androidx.work.*
-import org.session.libsignal.utilities.Log
-import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities
-
-/**
- * Delegates the [OpenGroupUtilities.updateGroupInfo] call to the work manager.
- */
-class PublicChatInfoUpdateWorker(val context: Context, params: WorkerParameters) : Worker(context, params) {
-
-    companion object {
-        const val TAG = "PublicChatInfoUpdateWorker"
-
-        private const val DATA_KEY_SERVER_URL = "server_uRL"
-        private const val DATA_KEY_CHANNEL = "channel"
-        private const val DATA_KEY_ROOM = "room"
-
-        @JvmStatic
-        fun scheduleInstant(context: Context, serverUrl: String, room :String) {
-            val workRequest = OneTimeWorkRequestBuilder<PublicChatInfoUpdateWorker>()
-                    .setConstraints(Constraints.Builder()
-                            .setRequiredNetworkType(NetworkType.CONNECTED)
-                            .build()
-                    )
-                    .setInputData(workDataOf(
-                            DATA_KEY_SERVER_URL to serverUrl,
-                            DATA_KEY_ROOM to room
-                    ))
-                    .build()
-
-            WorkManager
-                    .getInstance(context)
-                    .enqueue(workRequest)
-        }
-
-        @JvmStatic
-        fun scheduleInstant(context: Context, serverURL: String, channel: Long) {
-            val workRequest = OneTimeWorkRequestBuilder<PublicChatInfoUpdateWorker>()
-                    .setConstraints(Constraints.Builder()
-                            .setRequiredNetworkType(NetworkType.CONNECTED)
-                            .build()
-                    )
-                    .setInputData(workDataOf(
-                            DATA_KEY_SERVER_URL to serverURL,
-                            DATA_KEY_CHANNEL to channel
-                    ))
-                    .build()
-
-            WorkManager
-                    .getInstance(context)
-                    .enqueue(workRequest)
-        }
-    }
-
-    override fun doWork(): Result {
-        val serverUrl = inputData.getString(DATA_KEY_SERVER_URL)!!
-        val room = inputData.getString(DATA_KEY_ROOM)
-        val openGroupId = "$serverUrl.$room"
-        return try {
-            Log.v(TAG, "Updating open group info for $openGroupId.")
-            OpenGroupUtilities.updateGroupInfo(context, serverUrl, room!!)
-            Log.v(TAG, "Open group info was successfully updated for $openGroupId.")
-            Result.success()
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to update open group info for $openGroupId", e)
-            Result.failure()
-        }
-    }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt
deleted file mode 100644
index 527f88d1e5..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.thoughtcrime.securesms.loki.dialogs
-
-import android.os.Bundle
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import kotlinx.android.synthetic.main.fragment_device_list_bottom_sheet.*
-import network.loki.messenger.R
-
-public class DeviceEditingOptionsBottomSheet : BottomSheetDialogFragment() {
-    var onEditTapped: (() -> Unit)? = null
-    var onUnlinkTapped: (() -> Unit)? = null
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_device_list_bottom_sheet, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        editDisplayNameText.setOnClickListener { onEditTapped?.invoke() }
-        unlinkDeviceText.setOnClickListener { onUnlinkTapped?.invoke() }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt
deleted file mode 100644
index d5a333d8d0..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.thoughtcrime.securesms.loki.protocol
-
-import android.content.ContentValues
-import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase
-import org.thoughtcrime.securesms.loki.utilities.get
-import org.thoughtcrime.securesms.loki.utilities.getAll
-import org.thoughtcrime.securesms.loki.utilities.getString
-import org.thoughtcrime.securesms.loki.utilities.insertOrUpdate
-import org.session.libsignal.utilities.Hex
-import org.session.libsignal.crypto.ecc.DjbECPrivateKey
-import org.session.libsignal.crypto.ecc.DjbECPublicKey
-import org.session.libsignal.crypto.ecc.ECKeyPair
-import org.session.libsignal.utilities.PublicKeyValidation
-import org.session.libsignal.utilities.removing05PrefixIfNeeded
-import org.session.libsignal.utilities.toHexString
-import java.util.*
-
-object ClosedGroupsMigration {
-
-    public val closedGroupPublicKey = "closed_group_public_key"
-    // Ratchets
-    private val oldClosedGroupRatchetTable = "old_closed_group_ratchet_table"
-    private val currentClosedGroupRatchetTable = "closed_group_ratchet_table"
-    private val senderPublicKey = "sender_public_key"
-    private val chainKey = "chain_key"
-    private val keyIndex = "key_index"
-    private val messageKeys = "message_keys"
-    @JvmStatic val createOldClosedGroupRatchetTableCommand
-            = "CREATE TABLE $oldClosedGroupRatchetTable ($closedGroupPublicKey STRING, $senderPublicKey STRING, $chainKey STRING, " +
-            "$keyIndex INTEGER DEFAULT 0, $messageKeys TEXT, PRIMARY KEY ($closedGroupPublicKey, $senderPublicKey));"
-    // Private keys
-    @JvmStatic val createCurrentClosedGroupRatchetTableCommand
-            = "CREATE TABLE $currentClosedGroupRatchetTable ($closedGroupPublicKey STRING, $senderPublicKey STRING, $chainKey STRING, " +
-            "$keyIndex INTEGER DEFAULT 0, $messageKeys TEXT, PRIMARY KEY ($closedGroupPublicKey, $senderPublicKey));"
-    // Private keys
-    public val closedGroupPrivateKeyTable = "closed_group_private_key_table"
-    public val closedGroupPrivateKey = "closed_group_private_key"
-    @JvmStatic val createClosedGroupPrivateKeyTableCommand
-            = "CREATE TABLE $closedGroupPrivateKeyTable ($closedGroupPublicKey STRING PRIMARY KEY, $closedGroupPrivateKey STRING);"
-
-
-fun perform(database: net.sqlcipher.database.SQLiteDatabase) {
-        val publicKeys = database.getAll(closedGroupPrivateKeyTable, null, null) { cursor ->
-            cursor.getString(closedGroupPublicKey)
-        }.filter {
-            PublicKeyValidation.isValid(it)
-        }
-        val keyPairs = mutableListOf<ECKeyPair>()
-        for (publicKey in publicKeys) {
-            val query = "${closedGroupPublicKey} = ?"
-            val privateKey = database.get(closedGroupPrivateKeyTable, query, arrayOf( publicKey )) { cursor ->
-                cursor.getString(closedGroupPrivateKey)
-            }
-            val keyPair = ECKeyPair(DjbECPublicKey(Hex.fromStringCondensed(publicKey.removing05PrefixIfNeeded())), DjbECPrivateKey(Hex.fromStringCondensed(privateKey)))
-            keyPairs.add(keyPair)
-            val row = ContentValues(1)
-            row.put(LokiAPIDatabase.groupPublicKey, publicKey)
-            database.insertOrUpdate(LokiAPIDatabase.closedGroupPublicKeysTable, row, "${LokiAPIDatabase.groupPublicKey} = ?", arrayOf( publicKey ))
-        }
-        for (keyPair in keyPairs) {
-            // In this particular case keyPair.publicKey == groupPublicKey
-            val timestamp = Date().time.toString()
-            val index = "${keyPair.publicKey.serialize().toHexString()}-$timestamp"
-            val encryptionKeyPairPublicKey = keyPair.publicKey.serialize().toHexString().removing05PrefixIfNeeded()
-            val encryptionKeyPairPrivateKey = keyPair.privateKey.serialize().toHexString()
-            val row = ContentValues(3)
-            row.put(LokiAPIDatabase.closedGroupsEncryptionKeyPairIndex, index)
-            row.put(LokiAPIDatabase.encryptionKeyPairPublicKey, encryptionKeyPairPublicKey)
-            row.put(LokiAPIDatabase.encryptionKeyPairPrivateKey, encryptionKeyPairPrivateKey)
-            database.insertOrUpdate(LokiAPIDatabase.closedGroupEncryptionKeyPairsTable, row, "${LokiAPIDatabase.closedGroupsEncryptionKeyPairIndex} = ?", arrayOf( index ))
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt
deleted file mode 100644
index 1ac34bc1e7..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt
+++ /dev/null
@@ -1,392 +0,0 @@
-package org.thoughtcrime.securesms.loki.protocol
-
-import android.content.Context
-import android.util.Log
-import com.google.protobuf.ByteString
-import org.session.libsession.messaging.sending_receiving.*
-import org.session.libsignal.crypto.ecc.DjbECPrivateKey
-import org.session.libsignal.crypto.ecc.DjbECPublicKey
-import org.session.libsignal.crypto.ecc.ECKeyPair
-import org.session.libsignal.messages.SignalServiceGroup
-import org.session.libsignal.protos.SignalServiceProtos
-import org.session.libsignal.protos.SignalServiceProtos.DataMessage
-import org.session.libsignal.utilities.removing05PrefixIfNeeded
-import org.session.libsignal.utilities.toHexString
-import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.database.GroupDatabase
-import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager
-import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager.ClosedGroupOperation
-import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase
-
-import org.session.libsession.utilities.Address
-import org.session.libsession.utilities.GroupRecord
-import org.session.libsession.utilities.recipients.Recipient
-import org.session.libsession.utilities.GroupUtil
-import org.session.libsession.utilities.TextSecurePreferences
-
-import java.util.*
-
-object ClosedGroupsProtocolV2 {
-
-    @JvmStatic
-    fun handleMessage(context: Context, closedGroupUpdate: DataMessage.ClosedGroupControlMessage, sentTimestamp: Long, groupPublicKey: String, senderPublicKey: String) {
-        if (!isValid(context, closedGroupUpdate, senderPublicKey, sentTimestamp)) { return }
-        when (closedGroupUpdate.type) {
-            DataMessage.ClosedGroupControlMessage.Type.NEW -> handleNewClosedGroup(context, closedGroupUpdate, senderPublicKey, sentTimestamp)
-            DataMessage.ClosedGroupControlMessage.Type.MEMBERS_REMOVED -> handleClosedGroupMembersRemoved(context, closedGroupUpdate, sentTimestamp, groupPublicKey, senderPublicKey)
-            DataMessage.ClosedGroupControlMessage.Type.MEMBERS_ADDED -> handleClosedGroupMembersAdded(context, closedGroupUpdate, sentTimestamp, groupPublicKey, senderPublicKey)
-            DataMessage.ClosedGroupControlMessage.Type.NAME_CHANGE -> handleClosedGroupNameChange(context, closedGroupUpdate, sentTimestamp, groupPublicKey, senderPublicKey)
-            DataMessage.ClosedGroupControlMessage.Type.MEMBER_LEFT -> handleClosedGroupMemberLeft(context, sentTimestamp, groupPublicKey, senderPublicKey)
-            DataMessage.ClosedGroupControlMessage.Type.ENCRYPTION_KEY_PAIR -> handleGroupEncryptionKeyPair(context, closedGroupUpdate, groupPublicKey, senderPublicKey)
-            else -> {
-                Log.d("Loki","Can't handle closed group update of unknown type: ${closedGroupUpdate.type}")
-            }
-        }
-    }
-
-    private fun isValid(context: Context, closedGroupUpdate: DataMessage.ClosedGroupControlMessage, senderPublicKey: String, sentTimestamp: Long): Boolean {
-        val record = DatabaseFactory.getMmsSmsDatabase(context).getMessageFor(sentTimestamp, senderPublicKey)
-        if (record != null) return false
-
-        return when (closedGroupUpdate.type) {
-            DataMessage.ClosedGroupControlMessage.Type.NEW -> {
-                (!closedGroupUpdate.publicKey.isEmpty && !closedGroupUpdate.name.isNullOrEmpty() && !(closedGroupUpdate.encryptionKeyPair.privateKey ?: ByteString.copyFrom(ByteArray(0))).isEmpty
-                        && !(closedGroupUpdate.encryptionKeyPair.publicKey ?: ByteString.copyFrom(ByteArray(0))).isEmpty && closedGroupUpdate.membersCount > 0 && closedGroupUpdate.adminsCount > 0)
-            }
-            DataMessage.ClosedGroupControlMessage.Type.MEMBERS_ADDED,
-            DataMessage.ClosedGroupControlMessage.Type.MEMBERS_REMOVED -> {
-                closedGroupUpdate.membersCount > 0
-            }
-            DataMessage.ClosedGroupControlMessage.Type.MEMBER_LEFT -> {
-                senderPublicKey.isNotEmpty()
-            }
-            DataMessage.ClosedGroupControlMessage.Type.NAME_CHANGE -> {
-                !closedGroupUpdate.name.isNullOrEmpty()
-            }
-            DataMessage.ClosedGroupControlMessage.Type.ENCRYPTION_KEY_PAIR -> true
-            else -> false
-        }
-    }
-
-    public fun handleNewClosedGroup(context: Context, closedGroupUpdate: DataMessage.ClosedGroupControlMessage, senderPublicKey: String, sentTimestamp: Long) {
-        // Prepare
-        val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
-        val apiDB = DatabaseFactory.getLokiAPIDatabase(context)
-        // Unwrap the message
-        val groupPublicKey = closedGroupUpdate.publicKey.toByteArray().toHexString()
-        val name = closedGroupUpdate.name
-        val encryptionKeyPairAsProto = closedGroupUpdate.encryptionKeyPair
-        val members = closedGroupUpdate.membersList.map { it.toByteArray().toHexString() }
-        val admins = closedGroupUpdate.adminsList.map { it.toByteArray().toHexString() }
-        // Create the group
-        val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey)
-        val groupDB = DatabaseFactory.getGroupDatabase(context)
-        val prevGroup = groupDB.getGroup(groupID).orNull()
-        if (prevGroup != null) {
-            // Update the group
-            groupDB.updateTitle(groupID, name)
-            groupDB.updateMembers(groupID, members.map { Address.fromSerialized(it) })
-        } else {
-            groupDB.create(groupID, name, LinkedList(members.map { Address.fromSerialized(it) }),
-                    null, null, LinkedList(admins.map { Address.fromSerialized(it) }), sentTimestamp)
-        }
-        DatabaseFactory.getRecipientDatabase(context).setProfileSharing(Recipient.from(context, Address.fromSerialized(groupID), false), true)
-        // Add the group to the user's set of public keys to poll for
-        apiDB.addClosedGroupPublicKey(groupPublicKey)
-        // Store the encryption key pair
-        val encryptionKeyPair = ECKeyPair(DjbECPublicKey(encryptionKeyPairAsProto.publicKey.toByteArray().removing05PrefixIfNeeded()), DjbECPrivateKey(encryptionKeyPairAsProto.privateKey.toByteArray()))
-        apiDB.addClosedGroupEncryptionKeyPair(encryptionKeyPair, groupPublicKey)
-        // Notify the user (if we didn't make the group)
-        if (userPublicKey != senderPublicKey) {
-            DatabaseFactory.getStorage(context).insertIncomingInfoMessage(context, senderPublicKey, groupID, SignalServiceGroup.Type.UPDATE, name, members, admins, sentTimestamp)
-        } else if (prevGroup == null) {
-            // only notify if we created this group
-            val threadID = DatabaseFactory.getLokiThreadDatabase(context).getThreadID(groupID)
-            DatabaseFactory.getStorage(context).insertOutgoingInfoMessage(context, groupID, SignalServiceGroup.Type.UPDATE, name, members, admins, threadID, sentTimestamp)
-        }
-        // Notify the PN server
-        LokiPushNotificationManager.performOperation(context, ClosedGroupOperation.Subscribe, groupPublicKey, userPublicKey)
-    }
-
-    fun handleClosedGroupMembersRemoved(context: Context, closedGroupUpdate: DataMessage.ClosedGroupControlMessage, sentTimestamp: Long, groupPublicKey: String, senderPublicKey: String) {
-        val apiDB = DatabaseFactory.getLokiAPIDatabase(context)
-        val groupDB = DatabaseFactory.getGroupDatabase(context)
-        val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey)
-        val group = groupDB.getGroup(groupID).orNull()
-        if (group == null || !group.isActive) {
-            Log.d("Loki", "Ignoring closed group info message for nonexistent or inactive group.")
-            return
-        }
-        val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
-        val name = group.title
-        // Check common group update logic
-        val members = group.members.map { it.serialize() }
-        val admins = group.admins.map { it.toString() }
-
-        // Users that are part of this remove update
-        val updateMembers = closedGroupUpdate.membersList.map { it.toByteArray().toHexString() }
-
-        if (!isValidGroupUpdate(group, sentTimestamp, senderPublicKey)) {
-            return
-        }
-        // If admin leaves the group is disbanded
-        val didAdminLeave = admins.any { it in updateMembers }
-        // newMembers to save is old members minus removed members
-        val newMembers = members - updateMembers
-        // user should be posting MEMBERS_LEFT so this should not be encountered
-        val senderLeft = senderPublicKey in updateMembers
-        if (senderLeft) {
-            Log.d("Loki", "Received a MEMBERS_REMOVED instead of a MEMBERS_LEFT from sender $senderPublicKey")
-        }
-        val wasCurrentUserRemoved = userPublicKey in updateMembers
-
-        // admin should send a MEMBERS_LEFT message but handled here in case
-        if (didAdminLeave || wasCurrentUserRemoved) {
-            disableLocalGroupAndUnsubscribe(context, apiDB, groupPublicKey, groupDB, groupID, userPublicKey)
-        } else {
-            val isCurrentUserAdmin = admins.contains(userPublicKey)
-            groupDB.updateMembers(groupID, newMembers.map { Address.fromSerialized(it) })
-            if (isCurrentUserAdmin) {
-                MessageSender.generateAndSendNewEncryptionKeyPair(groupPublicKey, newMembers)
-            }
-        }
-        val type =
-                if (senderLeft) SignalServiceGroup.Type.QUIT
-                else SignalServiceGroup.Type.UPDATE
-        if (userPublicKey == senderPublicKey) {
-            val threadID = DatabaseFactory.getLokiThreadDatabase(context).getThreadID(groupID)
-            DatabaseFactory.getStorage(context).insertOutgoingInfoMessage(context, groupID, type, name, members, admins, threadID, sentTimestamp)
-        } else {
-            DatabaseFactory.getStorage(context).insertIncomingInfoMessage(context, senderPublicKey, groupID, type, name, members, admins, sentTimestamp)
-        }
-    }
-
-    fun handleClosedGroupMembersAdded(context: Context, closedGroupUpdate: DataMessage.ClosedGroupControlMessage, sentTimestamp: Long, groupPublicKey: String, senderPublicKey: String) {
-        val userPublicKey = TextSecurePreferences.getLocalNumber(context)
-        val apiDB = DatabaseFactory.getLokiAPIDatabase(context)
-        val groupDB = DatabaseFactory.getGroupDatabase(context)
-        val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey)
-        val group = groupDB.getGroup(groupID).orNull()
-        if (group == null || !group.isActive) {
-            Log.d("Loki", "Ignoring closed group info message for nonexistent or inactive group.")
-            return
-        }
-        // Check common group update logic
-        if (!isValidGroupUpdate(group, sentTimestamp, senderPublicKey)) {
-            return
-        }
-        val name = group.title
-        val members = group.members.map { it.serialize() }
-        val admins = group.admins.map { it.serialize() }
-        // Users that are part of this add update
-        val updateMembers = closedGroupUpdate.membersList.map { it.toByteArray().toHexString() }
-        // newMembers to save is old members plus members included in this update
-        val newMembers = members + updateMembers
-        groupDB.updateMembers(groupID, newMembers.map { Address.fromSerialized(it) })
-        if (userPublicKey == senderPublicKey) {
-            val threadID = DatabaseFactory.getLokiThreadDatabase(context).getThreadID(groupID)
-            DatabaseFactory.getStorage(context).insertOutgoingInfoMessage(context, groupID, SignalServiceGroup.Type.UPDATE, name, members, admins, threadID, sentTimestamp)
-        } else {
-            DatabaseFactory.getStorage(context).insertIncomingInfoMessage(context, senderPublicKey, groupID, SignalServiceGroup.Type.UPDATE, name, members, admins, sentTimestamp)
-        }
-        if (userPublicKey in admins) {
-            // send current encryption key to the latest added members
-            val encryptionKeyPair = pendingKeyPairs[groupPublicKey]?.orNull()
-                ?: apiDB.getLatestClosedGroupEncryptionKeyPair(groupPublicKey)
-            if (encryptionKeyPair == null) {
-                Log.d("Loki", "Couldn't get encryption key pair for closed group.")
-            } else {
-                for (user in updateMembers) {
-                    MessageSender.sendEncryptionKeyPair(groupPublicKey, encryptionKeyPair, setOf(user), targetUser = user, force = false)
-                }
-            }
-        }
-    }
-
-    fun handleClosedGroupNameChange(context: Context, closedGroupUpdate: DataMessage.ClosedGroupControlMessage, sentTimestamp: Long, groupPublicKey: String, senderPublicKey: String) {
-        // Check that the sender is a member of the group (before the update)
-        val userPublicKey = TextSecurePreferences.getLocalNumber(context)
-        val groupDB = DatabaseFactory.getGroupDatabase(context)
-        val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey)
-        val group = groupDB.getGroup(groupID).orNull()
-        if (group == null || !group.isActive) {
-            Log.d("Loki", "Ignoring closed group info message for nonexistent or inactive group.")
-            return
-        }
-        // Check common group update logic
-        if (!isValidGroupUpdate(group, sentTimestamp, senderPublicKey)) {
-            return
-        }
-        val members = group.members.map { it.serialize() }
-        val admins = group.admins.map { it.serialize() }
-        val name = closedGroupUpdate.name
-        groupDB.updateTitle(groupID, name)
-        // Notify the user
-        if (userPublicKey == senderPublicKey) {
-            val threadID = DatabaseFactory.getLokiThreadDatabase(context).getThreadID(groupID)
-            DatabaseFactory.getStorage(context).insertOutgoingInfoMessage(context, groupID, SignalServiceGroup.Type.UPDATE, name, members, admins, threadID, sentTimestamp)
-        } else {
-            DatabaseFactory.getStorage(context).insertIncomingInfoMessage(context, senderPublicKey, groupID, SignalServiceGroup.Type.UPDATE, name, members, admins, sentTimestamp)
-        }
-    }
-
-    private fun handleClosedGroupMemberLeft(context: Context, sentTimestamp: Long, groupPublicKey: String, senderPublicKey: String) {
-        // Check the user leaving isn't us, will already be handled
-        val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
-        val apiDB = DatabaseFactory.getLokiAPIDatabase(context)
-        val groupDB = DatabaseFactory.getGroupDatabase(context)
-        val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey)
-        val group = groupDB.getGroup(groupID).orNull()
-        if (group == null || !group.isActive) {
-            Log.d("Loki", "Ignoring closed group info message for nonexistent or inactive group.")
-            return
-        }
-        val name = group.title
-        // Check common group update logic
-        val members = group.members.map { it.serialize() }
-        val admins = group.admins.map { it.toString() }
-        if (!isValidGroupUpdate(group, sentTimestamp, senderPublicKey)) {
-            return
-        }
-        // If the admin leaves the group is disbanded
-        val didAdminLeave = admins.contains(senderPublicKey)
-        val updatedMemberList = members - senderPublicKey
-        val userLeft = (userPublicKey == senderPublicKey)
-
-        // if the admin left, we left, or we are the only remaining member: remove the group
-        if (didAdminLeave || userLeft) {
-            disableLocalGroupAndUnsubscribe(context, apiDB, groupPublicKey, groupDB, groupID, userPublicKey)
-        } else {
-            val isCurrentUserAdmin = admins.contains(userPublicKey)
-            groupDB.updateMembers(groupID, updatedMemberList.map { Address.fromSerialized(it) })
-            if (isCurrentUserAdmin) {
-                MessageSender.generateAndSendNewEncryptionKeyPair(groupPublicKey, updatedMemberList)
-            }
-        }
-        // Notify user
-        if (userLeft) {
-            val threadID = DatabaseFactory.getLokiThreadDatabase(context).getThreadID(groupID)
-            DatabaseFactory.getStorage(context).insertOutgoingInfoMessage(context, groupID, SignalServiceGroup.Type.QUIT, name, members, admins, threadID, sentTimestamp)
-        } else {
-            DatabaseFactory.getStorage(context).insertIncomingInfoMessage(context, senderPublicKey, groupID, SignalServiceGroup.Type.QUIT, name, members, admins, sentTimestamp)
-        }
-    }
-
-    private fun disableLocalGroupAndUnsubscribe(context: Context, apiDB: LokiAPIDatabase, groupPublicKey: String, groupDB: GroupDatabase, groupID: String, userPublicKey: String) {
-        apiDB.removeClosedGroupPublicKey(groupPublicKey)
-        // Remove the key pairs
-        apiDB.removeAllClosedGroupEncryptionKeyPairs(groupPublicKey)
-        // Mark the group as inactive
-        groupDB.setActive(groupID, false)
-        groupDB.removeMember(groupID, Address.fromSerialized(userPublicKey))
-        // Notify the PN server
-        LokiPushNotificationManager.performOperation(context, ClosedGroupOperation.Unsubscribe, groupPublicKey, userPublicKey)
-    }
-
-    private fun isValidGroupUpdate(group: GroupRecord,
-                                   sentTimestamp: Long,
-                                   senderPublicKey: String): Boolean {
-        val oldMembers = group.members.map { it.serialize() }
-        // Check that the message isn't from before the group was created
-        // TODO: We should check that formationTimestamp is the sent timestamp of the closed group update that created the group
-        if (group.formationTimestamp > sentTimestamp) {
-            Log.d("Loki", "Ignoring closed group update from before thread was created.")
-            return false
-        }
-        // Check that the sender is a member of the group (before the update)
-        if (senderPublicKey !in oldMembers) {
-            Log.d("Loki", "Ignoring closed group info message from non-member.")
-            return false
-        }
-        return true
-    }
-
-    private fun handleGroupEncryptionKeyPair(context: Context, closedGroupUpdate: DataMessage.ClosedGroupControlMessage, groupPublicKey: String, senderPublicKey: String) {
-        // Prepare
-        val userPublicKey = TextSecurePreferences.getLocalNumber(context)
-        val apiDB = DatabaseFactory.getLokiAPIDatabase(context)
-        val userKeyPair = apiDB.getUserX25519KeyPair()
-        // Unwrap the message
-        val groupDB = DatabaseFactory.getGroupDatabase(context)
-        val groupPublicKeyToUse = when {
-            groupPublicKey.isNotEmpty() -> groupPublicKey
-            !closedGroupUpdate.publicKey.isEmpty -> closedGroupUpdate.publicKey.toByteArray().toHexString()
-            else -> ""
-        }
-        val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKeyToUse)
-        val group = groupDB.getGroup(groupID).orNull()
-        if (group == null) {
-            Log.d("Loki", "Ignoring closed group encryption key pair message for nonexistent group.")
-            return
-        }
-        if (!group.admins.map { it.toString() }.contains(senderPublicKey)) {
-            Log.d("Loki", "Ignoring closed group encryption key pair from non-admin.")
-            return
-        }
-        // Find our wrapper and decrypt it if possible
-        val wrapper = closedGroupUpdate.wrappersList.firstOrNull { it.publicKey.toByteArray().toHexString() == userPublicKey } ?: return
-        val encryptedKeyPair = wrapper.encryptedKeyPair.toByteArray()
-        val plaintext = MessageDecrypter.decrypt(encryptedKeyPair, userKeyPair).first
-        // Parse it
-        val proto = SignalServiceProtos.KeyPair.parseFrom(plaintext)
-        val keyPair = ECKeyPair(DjbECPublicKey(proto.publicKey.toByteArray().removing05PrefixIfNeeded()), DjbECPrivateKey(proto.privateKey.toByteArray()))
-        // Store it
-        apiDB.addClosedGroupEncryptionKeyPair(keyPair, groupPublicKeyToUse)
-        Log.d("Loki", "Received a new closed group encryption key pair")
-    }
-
-    // region Deprecated
-    private fun handleClosedGroupUpdate(context: Context, closedGroupUpdate: DataMessage.ClosedGroupControlMessage, sentTimestamp: Long, groupPublicKey: String, senderPublicKey: String) {
-        // Prepare
-        val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
-        val apiDB = DatabaseFactory.getLokiAPIDatabase(context)
-        // Unwrap the message
-        val name = closedGroupUpdate.name
-        val members = closedGroupUpdate.membersList.map { it.toByteArray().toHexString() }
-        val groupDB = DatabaseFactory.getGroupDatabase(context)
-        val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey)
-        val group = groupDB.getGroup(groupID).orNull()
-        if (group == null || !group.isActive) {
-            Log.d("Loki", "Ignoring closed group info message for nonexistent or inactive group.")
-            return
-        }
-        val oldMembers = group.members.map { it.serialize() }
-        // Check common group update logic
-        if (!isValidGroupUpdate(group, sentTimestamp, senderPublicKey)) {
-            return
-        }
-        // Check that the admin wasn't removed unless the group was destroyed entirely
-        if (!members.contains(group.admins.first().toString()) && members.isNotEmpty()) {
-            Log.d("Loki", "Ignoring invalid closed group update message.")
-            return
-        }
-        // Remove the group from the user's set of public keys to poll for if the current user was removed
-        val wasCurrentUserRemoved = !members.contains(userPublicKey)
-        if (wasCurrentUserRemoved) {
-            disableLocalGroupAndUnsubscribe(context, apiDB, groupPublicKey, groupDB, groupID, userPublicKey)
-        }
-        // Generate and distribute a new encryption key pair if needed
-        val wasAnyUserRemoved = (members.toSet().intersect(oldMembers) != oldMembers.toSet())
-        val isCurrentUserAdmin = group.admins.map { it.toString() }.contains(userPublicKey)
-        if (wasAnyUserRemoved && isCurrentUserAdmin) {
-            MessageSender.generateAndSendNewEncryptionKeyPair(groupPublicKey, members)
-        }
-        // Update the group
-        groupDB.updateTitle(groupID, name)
-        if (!wasCurrentUserRemoved) {
-            // The call below sets isActive to true, so if the user is leaving we have to use groupDB.remove(...) instead
-            groupDB.updateMembers(groupID, members.map { Address.fromSerialized(it) })
-        }
-        // Notify the user
-        val wasSenderRemoved = !members.contains(senderPublicKey)
-        val type = if (wasSenderRemoved) SignalServiceGroup.Type.QUIT else SignalServiceGroup.Type.UPDATE
-        val admins = group.admins.map { it.toString() }
-        if (userPublicKey == senderPublicKey) {
-            val threadID = DatabaseFactory.getLokiThreadDatabase(context).getThreadID(groupID)
-            DatabaseFactory.getStorage(context).insertOutgoingInfoMessage(context, groupID, type, name, members, admins, threadID, sentTimestamp)
-        } else {
-            DatabaseFactory.getStorage(context).insertIncomingInfoMessage(context, senderPublicKey, groupID, type, name, members, admins, sentTimestamp)
-        }
-    }
-    // endregion
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt
deleted file mode 100644
index 76f5dee9c4..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt
+++ /dev/null
@@ -1,335 +0,0 @@
-package org.thoughtcrime.securesms.loki.views
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.graphics.PorterDuff
-import android.graphics.drawable.AnimatedVectorDrawable
-import android.util.AttributeSet
-import android.view.View
-import android.view.View.OnTouchListener
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.ProgressBar
-import android.widget.TextView
-import androidx.annotation.ColorInt
-import androidx.core.content.ContextCompat
-import kotlinx.coroutines.*
-import network.loki.messenger.R
-import org.greenrobot.eventbus.EventBus
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
-import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress
-import org.thoughtcrime.securesms.ApplicationContext
-import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment
-import org.thoughtcrime.securesms.audio.AudioSlidePlayer
-import org.thoughtcrime.securesms.components.AnimatingToggle
-import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.events.PartProgressEvent
-import org.session.libsignal.utilities.Log
-import org.thoughtcrime.securesms.loki.api.PrepareAttachmentAudioExtrasJob
-import org.thoughtcrime.securesms.loki.utilities.getColorWithID
-import org.thoughtcrime.securesms.mms.AudioSlide
-import org.thoughtcrime.securesms.mms.SlideClickListener
-import java.io.IOException
-import java.util.*
-import java.util.concurrent.TimeUnit
-
-class MessageAudioView: FrameLayout, AudioSlidePlayer.Listener {
-
-    companion object {
-        private const val TAG = "AudioViewKt"
-    }
-
-    private val controlToggle: AnimatingToggle
-    private val container: ViewGroup
-    private val playButton: ImageView
-    private val pauseButton: ImageView
-    private val downloadButton: ImageView
-    private val downloadProgress: ProgressBar
-    private val seekBar: WaveformSeekBar
-    private val totalDuration: TextView
-
-    private var downloadListener: SlideClickListener? = null
-    private var audioSlidePlayer: AudioSlidePlayer? = null
-
-    /** Background coroutine scope that is available when the view is attached to a window. */
-    private var asyncCoroutineScope: CoroutineScope? = null
-
-    private val loadingAnimation: SeekBarLoadingAnimation
-
-    constructor(context: Context): this(context, null)
-
-    constructor(context: Context, attrs: AttributeSet?): this(context, attrs, 0)
-
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int): super(context, attrs, defStyleAttr) {
-        View.inflate(context, R.layout.message_audio_view, this)
-        container = findViewById(R.id.audio_widget_container)
-        controlToggle = findViewById(R.id.control_toggle)
-        playButton = findViewById(R.id.play)
-        pauseButton = findViewById(R.id.pause)
-        downloadButton = findViewById(R.id.download)
-        downloadProgress = findViewById(R.id.download_progress)
-        seekBar = findViewById(R.id.seek)
-        totalDuration = findViewById(R.id.total_duration)
-
-        playButton.setOnClickListener {
-            try {
-                Log.d(TAG, "playbutton onClick")
-                if (audioSlidePlayer != null) {
-                    togglePlayToPause()
-
-                    // Restart the playback if progress bar is nearly at the end.
-                    val progress = if (seekBar.progress < 0.99f) seekBar.progress.toDouble() else 0.0
-
-                    audioSlidePlayer!!.play(progress)
-                }
-            } catch (e: IOException) {
-                Log.w(TAG, e)
-            }
-        }
-        pauseButton.setOnClickListener {
-            Log.d(TAG, "pausebutton onClick")
-            if (audioSlidePlayer != null) {
-                togglePauseToPlay()
-                audioSlidePlayer!!.stop()
-            }
-        }
-        seekBar.isEnabled = false
-        seekBar.progressChangeListener = object : WaveformSeekBar.ProgressChangeListener {
-            override fun onProgressChanged(waveformSeekBar: WaveformSeekBar, progress: Float, fromUser: Boolean) {
-                if (fromUser && audioSlidePlayer != null) {
-                    synchronized(audioSlidePlayer!!) {
-                        audioSlidePlayer!!.seekTo(progress.toDouble())
-                    }
-                }
-            }
-        }
-
-        playButton.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.play_icon))
-        pauseButton.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.pause_icon))
-        playButton.background = ContextCompat.getDrawable(context, R.drawable.ic_circle_fill_white_48dp)
-        pauseButton.background = ContextCompat.getDrawable(context, R.drawable.ic_circle_fill_white_48dp)
-
-        if (attrs != null) {
-            val typedArray = context.theme.obtainStyledAttributes(attrs, R.styleable.MessageAudioView, 0, 0)
-            setTint(typedArray.getColor(R.styleable.MessageAudioView_foregroundTintColor, Color.WHITE),
-                    typedArray.getColor(R.styleable.MessageAudioView_waveformFillColor, Color.WHITE),
-                    typedArray.getColor(R.styleable.MessageAudioView_waveformBackgroundColor, Color.WHITE))
-            container.setBackgroundColor(typedArray.getColor(R.styleable.MessageAudioView_widgetBackground, Color.TRANSPARENT))
-            typedArray.recycle()
-        }
-
-        loadingAnimation = SeekBarLoadingAnimation(this, seekBar)
-        loadingAnimation.start()
-    }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        if (!EventBus.getDefault().isRegistered(this)) EventBus.getDefault().register(this)
-
-        asyncCoroutineScope = CoroutineScope(Job() + Dispatchers.IO)
-    }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-        EventBus.getDefault().unregister(this)
-
-        // Cancel all the background operations.
-        asyncCoroutineScope!!.cancel()
-        asyncCoroutineScope = null
-    }
-
-    fun setAudio(audio: AudioSlide, showControls: Boolean) {
-        when {
-            showControls && audio.isPendingDownload -> {
-                controlToggle.displayQuick(downloadButton)
-                seekBar.isEnabled = false
-                downloadButton.setOnClickListener { v -> downloadListener?.onClick(v, audio) }
-                if (downloadProgress.isIndeterminate) {
-                    downloadProgress.isIndeterminate = false
-                    downloadProgress.progress = 0
-                }
-            }
-            (showControls && audio.transferState == AttachmentTransferProgress.TRANSFER_PROGRESS_STARTED) -> {
-                controlToggle.displayQuick(downloadProgress)
-                seekBar.isEnabled = false
-                downloadProgress.isIndeterminate = true
-            }
-            else -> {
-                controlToggle.displayQuick(playButton)
-                seekBar.isEnabled = true
-                if (downloadProgress.isIndeterminate) {
-                    downloadProgress.isIndeterminate = false
-                    downloadProgress.progress = 100
-                }
-
-                // Post to make sure it executes only when the view is attached to a window.
-                post(::updateFromAttachmentAudioExtras)
-            }
-        }
-        audioSlidePlayer = AudioSlidePlayer.createFor(context, audio, this)
-    }
-
-    fun cleanup() {
-        if (audioSlidePlayer != null && pauseButton.visibility == View.VISIBLE) {
-            audioSlidePlayer!!.stop()
-        }
-    }
-
-    fun setDownloadClickListener(listener: SlideClickListener?) {
-        downloadListener = listener
-    }
-
-    fun setTint(@ColorInt foregroundTint: Int, @ColorInt waveformFill: Int, @ColorInt waveformBackground: Int) {
-        playButton.backgroundTintList = ColorStateList.valueOf(resources.getColorWithID(R.color.white, context.theme))
-        playButton.imageTintList = ColorStateList.valueOf(resources.getColorWithID(R.color.black, context.theme))
-        pauseButton.backgroundTintList = ColorStateList.valueOf(resources.getColorWithID(R.color.white, context.theme))
-        pauseButton.imageTintList = ColorStateList.valueOf(resources.getColorWithID(R.color.black, context.theme))
-
-        downloadButton.setColorFilter(foregroundTint, PorterDuff.Mode.SRC_IN)
-
-        downloadProgress.backgroundTintList = ColorStateList.valueOf(resources.getColorWithID(R.color.white, context.theme))
-        downloadProgress.progressTintList = ColorStateList.valueOf(resources.getColorWithID(R.color.black, context.theme))
-        downloadProgress.indeterminateTintList = ColorStateList.valueOf(resources.getColorWithID(R.color.black, context.theme))
-
-        totalDuration.setTextColor(foregroundTint)
-
-        seekBar.barProgressColor = waveformFill
-        seekBar.barBackgroundColor = waveformBackground
-    }
-
-    override fun onPlayerStart(player: AudioSlidePlayer) {
-        if (pauseButton.visibility != View.VISIBLE) {
-            togglePlayToPause()
-        }
-    }
-
-    override fun onPlayerStop(player: AudioSlidePlayer) {
-        if (playButton.visibility != View.VISIBLE) {
-            togglePauseToPlay()
-        }
-    }
-
-    override fun onPlayerProgress(player: AudioSlidePlayer, progress: Double, millis: Long) {
-        seekBar.progress = progress.toFloat()
-    }
-
-    override fun setFocusable(focusable: Boolean) {
-        super.setFocusable(focusable)
-        playButton.isFocusable = focusable
-        pauseButton.isFocusable = focusable
-        seekBar.isFocusable = focusable
-        seekBar.isFocusableInTouchMode = focusable
-        downloadButton.isFocusable = focusable
-    }
-
-    override fun setClickable(clickable: Boolean) {
-        super.setClickable(clickable)
-        playButton.isClickable = clickable
-        pauseButton.isClickable = clickable
-        seekBar.isClickable = clickable
-        seekBar.setOnTouchListener(if (clickable) null else
-            OnTouchListener { _, _ -> return@OnTouchListener true }) // Suppress touch events.
-        downloadButton.isClickable = clickable
-    }
-
-    override fun setEnabled(enabled: Boolean) {
-        super.setEnabled(enabled)
-        playButton.isEnabled = enabled
-        pauseButton.isEnabled = enabled
-        downloadButton.isEnabled = enabled
-    }
-
-    private fun togglePlayToPause() {
-        controlToggle.displayQuick(pauseButton)
-        val playToPauseDrawable = ContextCompat.getDrawable(context, R.drawable.play_to_pause_animation) as AnimatedVectorDrawable
-        pauseButton.setImageDrawable(playToPauseDrawable)
-        playToPauseDrawable.start()
-    }
-
-    private fun togglePauseToPlay() {
-        controlToggle.displayQuick(playButton)
-        val pauseToPlayDrawable = ContextCompat.getDrawable(context, R.drawable.pause_to_play_animation) as AnimatedVectorDrawable
-        playButton.setImageDrawable(pauseToPlayDrawable)
-        pauseToPlayDrawable.start()
-    }
-
-    private fun obtainDatabaseAttachment(): DatabaseAttachment? {
-        audioSlidePlayer ?: return null
-        val attachment = audioSlidePlayer!!.audioSlide.asAttachment()
-        return if (attachment is DatabaseAttachment) attachment else null
-    }
-
-    private fun updateFromAttachmentAudioExtras() {
-        val attachment = obtainDatabaseAttachment() ?: return
-
-        val audioExtras = DatabaseFactory.getAttachmentDatabase(context)
-                .getAttachmentAudioExtras(attachment.attachmentId)
-
-        // Schedule a job request if no audio extras were generated yet.
-        if (audioExtras == null) {
-            ApplicationContext.getInstance(context).jobManager
-                    .add(PrepareAttachmentAudioExtrasJob(attachment.attachmentId))
-            return
-        }
-
-        loadingAnimation.stop()
-        seekBar.sampleData = audioExtras.visualSamples
-
-        if (audioExtras.durationMs > 0) {
-            totalDuration.visibility = View.VISIBLE
-            totalDuration.text = String.format("%02d:%02d",
-                    TimeUnit.MILLISECONDS.toMinutes(audioExtras.durationMs),
-                    TimeUnit.MILLISECONDS.toSeconds(audioExtras.durationMs))
-        }
-    }
-
-    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
-    fun onEvent(event: PartProgressEvent) {
-        if (audioSlidePlayer != null && event.attachment == audioSlidePlayer!!.audioSlide.asAttachment()) {
-            val progress = ((event.progress.toFloat() / event.total) * 100f).toInt()
-            downloadProgress.progress = progress
-        }
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onEvent(event: PrepareAttachmentAudioExtrasJob.AudioExtrasUpdatedEvent) {
-        if (event.attachmentId == obtainDatabaseAttachment()?.attachmentId) {
-            updateFromAttachmentAudioExtras()
-        }
-    }
-
-    private class SeekBarLoadingAnimation(
-            private val hostView: View,
-            private val seekBar: WaveformSeekBar): Runnable {
-
-        private var active = false
-
-        companion object {
-            private const val UPDATE_PERIOD = 250L // In milliseconds.
-            private val random = Random()
-        }
-
-        fun start() {
-            stop()
-            active = true
-            hostView.postDelayed(this, UPDATE_PERIOD)
-        }
-
-        fun stop() {
-            active = false
-            hostView.removeCallbacks(this)
-        }
-
-        override fun run() {
-            if (!active) return
-
-            // Generate a random samples with values up to the 50% of the maximum value.
-            seekBar.sampleData = ByteArray(PrepareAttachmentAudioExtrasJob.VISUAL_RMS_FRAMES)
-                { (random.nextInt(127) - 64).toByte() }
-            hostView.postDelayed(this, UPDATE_PERIOD)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt
deleted file mode 100644
index edfc81cf79..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.thoughtcrime.securesms.loki.views
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import android.widget.*
-import androidx.appcompat.app.AlertDialog
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import network.loki.messenger.R
-import org.session.libsession.utilities.OpenGroupUrlParser
-import org.session.libsignal.utilities.Log
-import org.thoughtcrime.securesms.loki.api.OpenGroupManager
-import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol
-import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities
-
-class OpenGroupInvitationView : FrameLayout {
-    private val joinButton: ImageView
-    private val openGroupIconContainer: RelativeLayout
-    private val openGroupIconImageView: ImageView
-    private val nameTextView: TextView
-    private val urlTextView: TextView
-    private var url: String = ""
-
-    constructor(context: Context): this(context, null)
-
-    constructor(context: Context, attrs: AttributeSet?): this(context, attrs, 0)
-
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int): super(context, attrs, defStyleAttr) {
-        View.inflate(context, R.layout.open_group_invitation_view, this)
-        joinButton = findViewById(R.id.join_open_group_button)
-        openGroupIconContainer = findViewById(R.id.open_group_icon_image_view_container)
-        openGroupIconImageView = findViewById(R.id.open_group_icon_image_view)
-        nameTextView = findViewById(R.id.name_text_view)
-        urlTextView = findViewById(R.id.url_text_view)
-        joinButton.setOnClickListener { joinOpenGroup(url) }
-    }
-
-    fun setOpenGroup(name: String, url: String, isOutgoing: Boolean = false) {
-        nameTextView.text = name
-        urlTextView.text = OpenGroupUrlParser.trimQueryParameter(url)
-        this.url = url
-        joinButton.visibility = if (isOutgoing) View.GONE else View.VISIBLE
-        openGroupIconContainer.visibility = if (isOutgoing) View.VISIBLE else View.GONE
-    }
-
-    private fun joinOpenGroup(url: String) {
-        val openGroup = OpenGroupUrlParser.parseUrl(url)
-        val builder = AlertDialog.Builder(context)
-        builder.setTitle(context.getString(R.string.ConversationActivity_join_open_group, nameTextView.text.toString()))
-        builder.setCancelable(true)
-        val message: String =
-            context.getString(R.string.ConversationActivity_join_open_group_confirmation_message, nameTextView.text.toString())
-        builder.setMessage(message)
-        builder.setPositiveButton(R.string.yes) { dialog, _ ->
-            GlobalScope.launch(Dispatchers.IO) {
-                try {
-                    dialog.dismiss()
-                    OpenGroupManager.add(openGroup.server, openGroup.room, openGroup.serverPublicKey, context)
-                    MultiDeviceProtocol.forceSyncConfigurationNowIfNeeded(context)
-                } catch (e: Exception) {
-                    Log.e("Loki", "Failed to join open group.", e)
-                    Toast.makeText(context, R.string.activity_join_public_chat_error, Toast.LENGTH_SHORT).show()
-                }
-            }
-        }
-        builder.setNegativeButton(R.string.no, null)
-        builder.show()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/WaveformSeekBar.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/WaveformSeekBar.kt
deleted file mode 100644
index df74bd9ca0..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/WaveformSeekBar.kt
+++ /dev/null
@@ -1,315 +0,0 @@
-package org.thoughtcrime.securesms.loki.views
-
-import android.animation.ValueAnimator
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.Paint
-import android.graphics.RectF
-import android.util.AttributeSet
-import android.util.TypedValue
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewConfiguration
-import android.view.animation.DecelerateInterpolator
-import androidx.core.math.MathUtils
-import network.loki.messenger.R
-import org.session.libsession.utilities.byteToNormalizedFloat
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.roundToInt
-
-class WaveformSeekBar : View {
-
-    companion object {
-        @JvmStatic
-        fun dp(context: Context, dp: Float): Float {
-            return TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    dp,
-                    context.resources.displayMetrics
-            )
-        }
-    }
-
-    private val sampleDataHolder = SampleDataHolder(::invalidate)
-    /** An array of signed byte values representing the audio signal. */
-    var sampleData: ByteArray?
-        get() {
-            return sampleDataHolder.getSamples()
-        }
-        set(value) {
-            sampleDataHolder.setSamples(value)
-            invalidate()
-        }
-
-    /** Indicates whether the user is currently interacting with the view and performing a seeking gesture. */
-    private var userSeeking = false
-    private var _progress: Float = 0f
-    /** In [0..1] range. */
-    var progress: Float
-        set(value) {
-            // Do not let to modify the progress value from the outside
-            // when the user is currently interacting with the view.
-            if (userSeeking) return
-
-            _progress = value
-            invalidate()
-            progressChangeListener?.onProgressChanged(this, _progress, false)
-        }
-        get() {
-            return _progress
-        }
-
-    var barBackgroundColor: Int = Color.LTGRAY
-        set(value) {
-            field = value
-            invalidate()
-        }
-
-    var barProgressColor: Int = Color.WHITE
-        set(value) {
-            field = value
-            invalidate()
-        }
-
-    var barGap: Float = dp(context, 2f)
-        set(value) {
-            field = value
-            invalidate()
-        }
-
-    var barWidth: Float = dp(context, 5f)
-        set(value) {
-            field = value
-            invalidate()
-        }
-
-    var barMinHeight: Float = barWidth
-        set(value) {
-            field = value
-            invalidate()
-        }
-
-    var barCornerRadius: Float = dp(context, 2.5f)
-        set(value) {
-            field = value
-            invalidate()
-        }
-
-    var barGravity: WaveGravity = WaveGravity.CENTER
-        set(value) {
-            field = value
-            invalidate()
-        }
-
-    var progressChangeListener: ProgressChangeListener? = null
-
-    private val barPaint = Paint(Paint.ANTI_ALIAS_FLAG)
-    private val barRect = RectF()
-
-    private var canvasWidth = 0
-    private var canvasHeight = 0
-
-    private var touchDownX = 0f
-    private var touchDownProgress: Float = 0f
-    private var scaledTouchSlop = ViewConfiguration.get(context).scaledTouchSlop
-
-    constructor(context: Context) : this(context, null)
-
-    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
-
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int)
-            : super(context, attrs, defStyleAttr) {
-
-        val typedAttrs = context.obtainStyledAttributes(attrs, R.styleable.WaveformSeekBar)
-        barWidth = typedAttrs.getDimension(R.styleable.WaveformSeekBar_bar_width, barWidth)
-        barGap = typedAttrs.getDimension(R.styleable.WaveformSeekBar_bar_gap, barGap)
-        barCornerRadius = typedAttrs.getDimension(
-                R.styleable.WaveformSeekBar_bar_corner_radius,
-                barCornerRadius)
-        barMinHeight =
-                typedAttrs.getDimension(R.styleable.WaveformSeekBar_bar_min_height, barMinHeight)
-        barBackgroundColor = typedAttrs.getColor(
-                R.styleable.WaveformSeekBar_bar_background_color,
-                barBackgroundColor)
-        barProgressColor =
-                typedAttrs.getColor(R.styleable.WaveformSeekBar_bar_progress_color, barProgressColor)
-        progress = typedAttrs.getFloat(R.styleable.WaveformSeekBar_progress, progress)
-        barGravity = WaveGravity.fromString(
-                typedAttrs.getString(R.styleable.WaveformSeekBar_bar_gravity))
-
-        typedAttrs.recycle()
-    }
-
-    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
-        super.onSizeChanged(w, h, oldw, oldh)
-        canvasWidth = w
-        canvasHeight = h
-        invalidate()
-    }
-
-    override fun onDraw(canvas: Canvas) {
-        super.onDraw(canvas)
-
-        val totalWidth = getAvailableWidth()
-        val barAmount = (totalWidth / (barWidth + barGap)).toInt()
-
-        var lastBarRight = paddingLeft.toFloat()
-
-        (0 until barAmount).forEach { barIdx ->
-            // Convert a signed byte to a [0..1] float.
-            val barValue = byteToNormalizedFloat(sampleDataHolder.computeBarValue(barIdx, barAmount))
-
-            val barHeight = max(barMinHeight, getAvailableHeight() * barValue)
-
-            val top: Float = when (barGravity) {
-                WaveGravity.TOP -> paddingTop.toFloat()
-                WaveGravity.CENTER -> paddingTop + getAvailableHeight() * 0.5f - barHeight * 0.5f
-                WaveGravity.BOTTOM -> canvasHeight - paddingBottom - barHeight
-            }
-
-            barRect.set(lastBarRight, top, lastBarRight + barWidth, top + barHeight)
-
-            barPaint.color = if (barRect.right <= totalWidth * progress)
-                barProgressColor else barBackgroundColor
-
-            canvas.drawRoundRect(barRect, barCornerRadius, barCornerRadius, barPaint)
-
-            lastBarRight = barRect.right + barGap
-        }
-    }
-
-    override fun onTouchEvent(event: MotionEvent): Boolean {
-        if (!isEnabled) return false
-
-        when (event.action) {
-            MotionEvent.ACTION_DOWN -> {
-                userSeeking = true
-                touchDownX = event.x
-                touchDownProgress = progress
-                updateProgress(event, false)
-            }
-            MotionEvent.ACTION_MOVE -> {
-                // Prevent any parent scrolling if the user scrolled more
-                // than scaledTouchSlop on horizontal axis.
-                if (abs(event.x - touchDownX) > scaledTouchSlop) {
-                    parent.requestDisallowInterceptTouchEvent(true)
-                }
-                updateProgress(event, false)
-            }
-            MotionEvent.ACTION_UP -> {
-                userSeeking = false
-                updateProgress(event, true)
-                performClick()
-            }
-            MotionEvent.ACTION_CANCEL -> {
-                updateProgress(touchDownProgress, false)
-                userSeeking = false
-            }
-        }
-        return true
-    }
-
-    private fun updateProgress(event: MotionEvent, notify: Boolean) {
-        updateProgress(event.x / getAvailableWidth(), notify)
-    }
-
-    private fun updateProgress(progress: Float, notify: Boolean) {
-        _progress = MathUtils.clamp(progress, 0f, 1f)
-        invalidate()
-
-        if (notify) {
-            progressChangeListener?.onProgressChanged(this, _progress, true)
-        }
-    }
-
-    override fun performClick(): Boolean {
-        super.performClick()
-        return true
-    }
-
-    private fun getAvailableWidth() = canvasWidth - paddingLeft - paddingRight
-    private fun getAvailableHeight() = canvasHeight - paddingTop - paddingBottom
-
-    private class SampleDataHolder(private val invalidateDelegate: () -> Any) {
-
-        private var sampleDataFrom: ByteArray? = null
-        private var sampleDataTo: ByteArray? = null
-        private var progress = 1f // Mix between from and to values.
-
-        private var animation: ValueAnimator? = null
-
-        fun computeBarValue(barIdx: Int, barAmount: Int): Byte {
-            /** @return The array's value at the interpolated index. */
-            fun getSampleValue(sampleData: ByteArray?): Byte {
-                if (sampleData == null || sampleData.isEmpty())
-                    return Byte.MIN_VALUE
-                else {
-                    val sampleIdx = (barIdx * (sampleData.size / barAmount.toFloat())).toInt()
-                    return sampleData[sampleIdx]
-                }
-            }
-
-            if (progress == 1f) {
-                return getSampleValue(sampleDataTo)
-            }
-
-            val fromValue = getSampleValue(sampleDataFrom)
-            val toValue = getSampleValue(sampleDataTo)
-            val rawResultValue = fromValue * (1f - progress) + toValue * progress
-            return rawResultValue.roundToInt().toByte()
-        }
-
-        fun setSamples(sampleData: ByteArray?) {
-            /** @return a mix between [sampleDataFrom] and [sampleDataTo] arrays according to the current [progress] value. */
-            fun computeNewDataFromArray(): ByteArray? {
-                if (sampleDataTo == null) return null
-                if (sampleDataFrom == null) return sampleDataTo
-
-                val sampleSize = min(sampleDataFrom!!.size, sampleDataTo!!.size)
-                return ByteArray(sampleSize) { i -> computeBarValue(i, sampleSize) }
-            }
-
-            sampleDataFrom = computeNewDataFromArray()
-            sampleDataTo = sampleData
-            progress = 0f
-
-            animation?.cancel()
-            animation = ValueAnimator.ofFloat(0f, 1f).apply {
-                addUpdateListener { animation ->
-                    progress = animation.animatedValue as Float
-                    invalidateDelegate()
-                }
-                interpolator = DecelerateInterpolator(3f)
-                duration = 500
-                start()
-            }
-        }
-
-        fun getSamples(): ByteArray? {
-            return sampleDataTo
-        }
-    }
-
-    enum class WaveGravity {
-        TOP,
-        CENTER,
-        BOTTOM,
-        ;
-
-        companion object {
-            @JvmStatic
-            fun fromString(gravity: String?): WaveGravity = when (gravity) {
-                "1" -> TOP
-                "2" -> CENTER
-                else -> BOTTOM
-            }
-        }
-    }
-
-    interface ProgressChangeListener {
-        fun onProgressChanged(waveformSeekBar: WaveformSeekBar, progress: Float, fromUser: Boolean)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
index adb8a921b5..04edf1194a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
@@ -15,7 +15,7 @@ import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
-import org.thoughtcrime.securesms.loki.utilities.MentionUtilities;
+import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities;
 
 import network.loki.messenger.R;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/BackgroundPollWorker.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
rename to app/src/main/java/org/thoughtcrime/securesms/notifications/BackgroundPollWorker.kt
index d070c25f2f..1674caf629 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/BackgroundPollWorker.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.api
+package org.thoughtcrime.securesms.notifications
 
 import android.content.BroadcastReceiver
 import android.content.Context
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index c02663843e..c5bf55d800 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -57,9 +57,8 @@ import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
-import org.thoughtcrime.securesms.loki.api.OpenGroupManager;
-import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol;
-import org.thoughtcrime.securesms.loki.utilities.MentionUtilities;
+import org.thoughtcrime.securesms.util.SessionMetaProtocol;
+import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.SpanUtil;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/FcmUtils.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/FcmUtils.kt
similarity index 92%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/FcmUtils.kt
rename to app/src/main/java/org/thoughtcrime/securesms/notifications/FcmUtils.kt
index 25b41f0d5e..87a9efc0de 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/FcmUtils.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/FcmUtils.kt
@@ -1,5 +1,5 @@
 @file:JvmName("FcmUtils")
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.notifications
 
 import com.google.android.gms.tasks.Task
 import com.google.firebase.iid.FirebaseInstanceId
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/LokiPushNotificationManager.kt
similarity index 99%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt
rename to app/src/main/java/org/thoughtcrime/securesms/notifications/LokiPushNotificationManager.kt
index 05c6c768f4..64e67b4b68 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/LokiPushNotificationManager.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.api
+package org.thoughtcrime.securesms.notifications
 
 import android.content.Context
 import nl.komponents.kovenant.functional.map
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
index c12a3f196b..068cbac3e4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.database.MessagingDatabase.ExpirationInfo;
 import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo;
 import org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId;
 import org.session.libsignal.utilities.Log;
-import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol;
+import org.thoughtcrime.securesms.util.SessionMetaProtocol;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 
 import java.util.LinkedList;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
index 5165e87ff9..24374ddd0f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
@@ -16,8 +16,8 @@ import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.loki.activities.HomeActivity;
-import org.thoughtcrime.securesms.loki.database.SessionContactDatabase;
+import org.thoughtcrime.securesms.home.HomeActivity;
+import org.thoughtcrime.securesms.database.SessionContactDatabase;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java
index aac737add2..4a72d7757c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java
@@ -10,10 +10,9 @@ import org.session.libsession.messaging.sending_receiving.notifications.MessageN
 import org.session.libsession.messaging.sending_receiving.pollers.Poller;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.Debouncer;
-import org.session.libsignal.utilities.Log;
 import org.session.libsignal.utilities.ThreadUtils;
 import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.loki.api.OpenGroupManager;
+import org.thoughtcrime.securesms.groups.OpenGroupManager;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java
index efd040a26d..1d19c2c8e3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java
@@ -7,7 +7,7 @@ import android.content.Intent;
 import androidx.core.app.NotificationCompat;
 
 import org.session.libsession.utilities.recipients.Recipient;
-import org.thoughtcrime.securesms.loki.activities.HomeActivity;
+import org.thoughtcrime.securesms.home.HomeActivity;
 import org.session.libsession.utilities.NotificationPrivacyPreference;
 import org.session.libsession.utilities.TextSecurePreferences;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushNotificationService.kt
similarity index 95%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt
rename to app/src/main/java/org/thoughtcrime/securesms/notifications/PushNotificationService.kt
index 74f6f25c88..e035bbb7ea 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushNotificationService.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.api
+package org.thoughtcrime.securesms.notifications
 
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -10,7 +10,6 @@ import org.session.libsession.messaging.utilities.MessageWrapper
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.utilities.Base64
 import org.session.libsignal.utilities.Log
-import org.thoughtcrime.securesms.notifications.NotificationChannels
 
 class PushNotificationService : FirebaseMessagingService() {
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
index 0b38783be8..80dd7d2602 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
@@ -28,8 +28,8 @@ import org.session.libsession.avatars.GeneratedContactPhoto;
 import org.session.libsession.messaging.contacts.Contact;
 import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.loki.database.SessionContactDatabase;
-import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator;
+import org.thoughtcrime.securesms.database.SessionContactDatabase;
+import org.thoughtcrime.securesms.util.AvatarPlaceholderGenerator;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.Slide;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/DisplayNameActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/DisplayNameActivity.kt
similarity index 92%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/DisplayNameActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/onboarding/DisplayNameActivity.kt
index 50403dca9c..885878c5ff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/DisplayNameActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/DisplayNameActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.onboarding
 
 import android.content.Intent
 import android.os.Bundle
@@ -11,8 +11,8 @@ import kotlinx.android.synthetic.main.activity_display_name.*
 import network.loki.messenger.R
 import org.session.libsession.utilities.SSKEnvironment.ProfileManagerProtocol
 import org.thoughtcrime.securesms.BaseActionBarActivity
-import org.thoughtcrime.securesms.loki.utilities.push
-import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo
+import org.thoughtcrime.securesms.util.push
+import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo
 import org.session.libsession.utilities.TextSecurePreferences
 
 class DisplayNameActivity : BaseActionBarActivity() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/FakeChatView.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/FakeChatView.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
rename to app/src/main/java/org/thoughtcrime/securesms/onboarding/FakeChatView.kt
index 5f84df4913..68c4edd596 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/FakeChatView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.views
+package org.thoughtcrime.securesms.onboarding
 
 import android.animation.FloatEvaluator
 import android.animation.ValueAnimator
@@ -12,7 +12,7 @@ import android.widget.LinearLayout
 import android.widget.ScrollView
 import kotlinx.android.synthetic.main.view_fake_chat.view.*
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.loki.utilities.disableClipping
+import org.thoughtcrime.securesms.util.disableClipping
 
 class FakeChatView : ScrollView {
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LandingActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt
similarity index 81%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/LandingActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt
index 50080956ba..3ca0632482 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LandingActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt
@@ -1,18 +1,15 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.onboarding
 
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.BaseActionBarActivity
-import org.session.libsession.utilities.IdentityKeyUtil
-import org.thoughtcrime.securesms.loki.utilities.push
-import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo
-import org.thoughtcrime.securesms.loki.views.FakeChatView
-import org.thoughtcrime.securesms.service.KeyCachingService
-import org.thoughtcrime.securesms.util.Util
-
 import org.session.libsession.utilities.TextSecurePreferences
+import org.thoughtcrime.securesms.BaseActionBarActivity
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
+import org.thoughtcrime.securesms.util.push
+import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo
+import org.thoughtcrime.securesms.service.KeyCachingService
 
 class LandingActivity : BaseActionBarActivity() {
 
@@ -25,7 +22,6 @@ class LandingActivity : BaseActionBarActivity() {
         findViewById<View>(R.id.restoreButton).setOnClickListener { restore() }
         findViewById<View>(R.id.linkButton).setOnClickListener { link() }
         IdentityKeyUtil.generateIdentityKeyPair(this)
-        TextSecurePreferences.setLastExperienceVersionCode(this, Util.getCanonicalVersionCode())
         TextSecurePreferences.setPasswordDisabled(this, true)
         TextSecurePreferences.setReadReceiptsEnabled(this, true)
         TextSecurePreferences.setTypingIndicatorsEnabled(this, true)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt
index 8cfa9d9e3e..24701e461c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.onboarding
 
 import android.content.Context
 import android.content.Intent
@@ -21,7 +21,6 @@ import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch
 import network.loki.messenger.R
-import org.session.libsession.utilities.KeyPairUtilities
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.crypto.MnemonicCodec
 import org.session.libsignal.utilities.Hex
@@ -30,11 +29,12 @@ import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.hexEncodedPublicKey
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.BaseActionBarActivity
-import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment
-import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragmentDelegate
-import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities
-import org.thoughtcrime.securesms.loki.utilities.push
-import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo
+import org.thoughtcrime.securesms.crypto.KeyPairUtilities
+import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragment
+import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragmentDelegate
+import org.thoughtcrime.securesms.crypto.MnemonicUtilities
+import org.thoughtcrime.securesms.util.push
+import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo
 
 class LinkDeviceActivity : BaseActionBarActivity(), ScanQRCodeWrapperFragmentDelegate {
     private val adapter = LinkDeviceActivityAdapter(this)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt
index 5ddc8b9682..cbfd5bcc93 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.onboarding
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
@@ -19,12 +19,13 @@ import network.loki.messenger.R
 import org.session.libsession.utilities.TextSecurePreferences
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.BaseActionBarActivity
-import org.thoughtcrime.securesms.loki.utilities.disableClipping
-import org.thoughtcrime.securesms.loki.utilities.getColorWithID
-import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo
-import org.thoughtcrime.securesms.loki.utilities.show
-import org.thoughtcrime.securesms.loki.views.GlowViewUtilities
-import org.thoughtcrime.securesms.loki.views.PNModeView
+import org.thoughtcrime.securesms.home.HomeActivity
+import org.thoughtcrime.securesms.util.disableClipping
+import org.thoughtcrime.securesms.util.getColorWithID
+import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo
+import org.thoughtcrime.securesms.util.show
+import org.thoughtcrime.securesms.util.GlowViewUtilities
+import org.thoughtcrime.securesms.util.PNModeView
 
 class PNModeActivity : BaseActionBarActivity() {
     private var selectedOptionView: PNModeView? = null
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/RecoveryPhraseRestoreActivity.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/onboarding/RecoveryPhraseRestoreActivity.kt
index c3e01217d9..968b3d0ddc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/RecoveryPhraseRestoreActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.onboarding
 
 import android.content.Intent
 import android.graphics.Typeface
@@ -14,15 +14,15 @@ import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_recovery_phrase_restore.*
 import network.loki.messenger.R
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsignal.utilities.KeyHelper
 import org.session.libsignal.crypto.MnemonicCodec
-import org.session.libsignal.utilities.hexEncodedPublicKey
 import org.session.libsignal.utilities.Hex
+import org.session.libsignal.utilities.KeyHelper
+import org.session.libsignal.utilities.hexEncodedPublicKey
 import org.thoughtcrime.securesms.BaseActionBarActivity
-import org.session.libsession.utilities.KeyPairUtilities
-import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities
-import org.thoughtcrime.securesms.loki.utilities.push
-import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo
+import org.thoughtcrime.securesms.crypto.KeyPairUtilities
+import org.thoughtcrime.securesms.crypto.MnemonicUtilities
+import org.thoughtcrime.securesms.util.push
+import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo
 
 class RecoveryPhraseRestoreActivity : BaseActionBarActivity() {
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/RegisterActivity.kt
similarity index 95%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/onboarding/RegisterActivity.kt
index c9e5bd83cc..9dac8875d3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/RegisterActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.onboarding
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -18,14 +18,14 @@ import android.widget.Toast
 import com.goterl.lazysodium.utils.KeyPair
 import kotlinx.android.synthetic.main.activity_register.*
 import network.loki.messenger.R
-import org.session.libsession.utilities.KeyPairUtilities
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.crypto.ecc.ECKeyPair
 import org.session.libsignal.utilities.KeyHelper
 import org.session.libsignal.utilities.hexEncodedPublicKey
 import org.thoughtcrime.securesms.BaseActionBarActivity
-import org.thoughtcrime.securesms.loki.utilities.push
-import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo
+import org.thoughtcrime.securesms.crypto.KeyPairUtilities
+import org.thoughtcrime.securesms.util.push
+import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo
 import java.util.*
 
 class RegisterActivity : BaseActionBarActivity() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/SeedActivity.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/onboarding/SeedActivity.kt
index a7f10da4a8..ad8d3a29c7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/SeedActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.onboarding
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -11,13 +11,13 @@ import android.widget.LinearLayout
 import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_seed.*
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.BaseActionBarActivity
-import org.session.libsession.utilities.IdentityKeyUtil
-import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities
-import org.thoughtcrime.securesms.loki.utilities.getColorWithID
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.crypto.MnemonicCodec
 import org.session.libsignal.utilities.hexEncodedPrivateKey
+import org.thoughtcrime.securesms.BaseActionBarActivity
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
+import org.thoughtcrime.securesms.crypto.MnemonicUtilities
+import org.thoughtcrime.securesms.util.getColorWithID
 
 class SeedActivity : BaseActionBarActivity() {
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/SeedReminderView.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/SeedReminderView.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/views/SeedReminderView.kt
rename to app/src/main/java/org/thoughtcrime/securesms/onboarding/SeedReminderView.kt
index 591a458227..199ed7a5a1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/SeedReminderView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/SeedReminderView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.views
+package org.thoughtcrime.securesms.onboarding
 
 import android.content.Context
 import android.os.Build
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ChangeUiModeDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/ChangeUiModeDialog.kt
similarity index 86%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ChangeUiModeDialog.kt
rename to app/src/main/java/org/thoughtcrime/securesms/preferences/ChangeUiModeDialog.kt
index 77d8bfe8c0..594d1b47f7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ChangeUiModeDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ChangeUiModeDialog.kt
@@ -1,12 +1,12 @@
-package org.thoughtcrime.securesms.loki.dialogs
+package org.thoughtcrime.securesms.preferences
 
 import android.app.Dialog
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.loki.utilities.UiMode
-import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities
+import org.thoughtcrime.securesms.util.UiMode
+import org.thoughtcrime.securesms.util.UiModeUtilities
 
 class ChangeUiModeDialog : DialogFragment() {
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/ChatSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/ChatSettingsActivity.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/ChatSettingsActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/preferences/ChatSettingsActivity.kt
index 67a2c4f2d5..67faa9da46 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/ChatSettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ChatSettingsActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.preferences
 
 import android.os.Bundle
 import network.loki.messenger.R
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt
similarity index 74%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt
rename to app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt
index 9db4533c9a..239b42c644 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt
@@ -1,19 +1,13 @@
-package org.thoughtcrime.securesms.loki.dialogs
+package org.thoughtcrime.securesms.preferences
 
-import android.app.Dialog
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
+import androidx.appcompat.app.AlertDialog
 import kotlinx.android.synthetic.main.dialog_clear_all_data.view.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.ApplicationContext
-import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol
-import org.session.libsession.utilities.KeyPairUtilities
+import org.thoughtcrime.securesms.crypto.KeyPairUtilities
+import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
-import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities
 
 class ClearAllDataDialog : BaseDialog() {
 
@@ -26,7 +20,7 @@ class ClearAllDataDialog : BaseDialog() {
 
     private fun clearAllData() {
         if (KeyPairUtilities.hasV2KeyPair(requireContext())) {
-            MultiDeviceProtocol.forceSyncConfigurationNowIfNeeded(requireContext())
+            ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(requireContext())
             ApplicationContext.getInstance(context).clearAllData(false)
         } else {
             val dialog = AlertDialog.Builder(requireContext())
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/NotificationSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationSettingsActivity.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/NotificationSettingsActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationSettingsActivity.kt
index 1468539a72..af039a4fdb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/NotificationSettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationSettingsActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.preferences
 
 import android.os.Bundle
 import network.loki.messenger.R
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PrivacySettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsActivity.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/PrivacySettingsActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsActivity.kt
index 966dd9b437..bf277dc17f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PrivacySettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.preferences
 
 import android.os.Bundle
 import network.loki.messenger.R
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt
index 2f5638d952..07a1d60590 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.preferences
 
 import android.content.Intent
 import android.graphics.Bitmap
@@ -16,12 +16,11 @@ import network.loki.messenger.R
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 
 import org.session.libsession.utilities.Address
-import org.session.libsession.utilities.DistributionTypes
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment
-import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragmentDelegate
-import org.thoughtcrime.securesms.loki.utilities.QRCodeUtilities
-import org.thoughtcrime.securesms.loki.utilities.toPx
+import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragment
+import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragmentDelegate
+import org.thoughtcrime.securesms.util.QRCodeUtilities
+import org.thoughtcrime.securesms.util.toPx
 import org.session.libsession.utilities.recipients.Recipient
 import org.thoughtcrime.securesms.util.FileProviderUtil
 import org.session.libsession.utilities.TextSecurePreferences
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt
similarity index 91%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
rename to app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt
index ab847ec2c1..19fffc343f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.dialogs
+package org.thoughtcrime.securesms.preferences
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -8,10 +8,10 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import kotlinx.android.synthetic.main.dialog_seed.view.*
 import network.loki.messenger.R
-import org.session.libsession.utilities.IdentityKeyUtil
-import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities
 import org.session.libsignal.crypto.MnemonicCodec
 import org.session.libsignal.utilities.hexEncodedPrivateKey
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
+import org.thoughtcrime.securesms.crypto.MnemonicUtilities
 import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
 
 class SeedDialog : BaseDialog() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
index 2078e15dc1..5bd91655b7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.activities
+package org.thoughtcrime.securesms.preferences
 
 import android.Manifest
 import android.app.Activity
@@ -33,12 +33,9 @@ import org.session.libsession.utilities.SSKEnvironment.ProfileManagerProtocol
 import org.session.libsession.utilities.TextSecurePreferences
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.avatar.AvatarSelection
-import org.thoughtcrime.securesms.loki.dialogs.ChangeUiModeDialog
-import org.thoughtcrime.securesms.loki.dialogs.ClearAllDataDialog
-import org.thoughtcrime.securesms.loki.dialogs.SeedDialog
-import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol
-import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities
-import org.thoughtcrime.securesms.loki.utilities.push
+import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
+import org.thoughtcrime.securesms.util.UiModeUtilities
+import org.thoughtcrime.securesms.util.push
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.permissions.Permissions
@@ -90,6 +87,8 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         helpTranslateButton.setOnClickListener { helpTranslate() }
         seedButton.setOnClickListener { showSeed() }
         clearAllDataButton.setOnClickListener { clearAllData() }
+        val isLightMode = UiModeUtilities.isDayUiMode(this)
+        oxenLogoImageView.setImageResource(if (isLightMode) R.drawable.oxen_light_mode else R.drawable.oxen_dark_mode)
         versionTextView.text = String.format(getString(R.string.version_s), "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
     }
 
@@ -192,7 +191,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
                 ProfileKeyUtil.setEncodedProfileKey(this, encodedProfileKey)
             }
             if (profilePicture != null || displayName != null) {
-                MultiDeviceProtocol.forceSyncConfigurationNowIfNeeded(this@SettingsActivity)
+                ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(this@SettingsActivity)
             }
         }
         compoundPromise.alwaysUi {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
index 58ed5d7d75..0581883c5e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
@@ -13,7 +13,7 @@ import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
 
 import org.session.libsignal.utilities.Log;
-import org.thoughtcrime.securesms.loki.activities.HomeActivity;
+import org.thoughtcrime.securesms.home.HomeActivity;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.session.libsignal.utilities.guava.Preconditions;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
index c4507cd766..9e79b93d60 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
@@ -37,7 +37,7 @@ import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.DatabaseUpgradeActivity;
 import org.thoughtcrime.securesms.DummyActivity;
 import org.session.libsignal.utilities.Log;
-import org.thoughtcrime.securesms.loki.activities.HomeActivity;
+import org.thoughtcrime.securesms.home.HomeActivity;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.session.libsession.utilities.ServiceUtil;
 import org.session.libsession.utilities.TextSecurePreferences;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ActivityUtilities.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/ActivityUtilities.kt
index fbddffa5db..d5daba5872 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ActivityUtilities.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.util
 
 import android.annotation.SuppressLint
 import android.app.Activity
diff --git a/app/src/main/java/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java b/app/src/main/java/org/thoughtcrime/securesms/util/AnimationCompleteListener.java
similarity index 90%
rename from app/src/main/java/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java
rename to app/src/main/java/org/thoughtcrime/securesms/util/AnimationCompleteListener.java
index 3063a04c91..c5da069cce 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/AnimationCompleteListener.java
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.animation;
+package org.thoughtcrime.securesms.util;
 
 
 import android.animation.Animator;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/AvatarPlaceholderGenerator.kt b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarPlaceholderGenerator.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/AvatarPlaceholderGenerator.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/AvatarPlaceholderGenerator.kt
index a8bcb4852b..b93a4a0905 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/AvatarPlaceholderGenerator.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarPlaceholderGenerator.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.util
 
 import android.content.Context
 import android.graphics.*
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt
index b597835e05..74014bc819 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt
@@ -21,9 +21,9 @@ import org.thoughtcrime.securesms.backup.BackupPassphrase
 import org.thoughtcrime.securesms.backup.BackupProtos.SharedPreference
 import org.thoughtcrime.securesms.backup.FullBackupExporter
 import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider
-import org.session.libsession.utilities.IdentityKeyUtil
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.loki.database.BackupFileRecord
+import org.thoughtcrime.securesms.database.BackupFileRecord
 import org.thoughtcrime.securesms.service.LocalBackupListener
 import java.io.IOException
 import java.security.MessageDigest
@@ -118,7 +118,7 @@ object BackupUtil {
         if (timestamp == null) {
             return context.getString(R.string.BackupUtil_never)
         }
-        return DateUtils.getExtendedRelativeTimeSpanString(context, locale, timestamp.time)
+        return DateUtils.getDisplayFormattedTimeSpanString(context, locale, timestamp.time)
     }
 
     @JvmStatic
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt b/app/src/main/java/org/thoughtcrime/securesms/util/Broadcaster.kt
similarity index 92%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/Broadcaster.kt
index 74429f394a..6060c00c81 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/Broadcaster.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.util
 
 import android.content.Context
 import android.content.Intent
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ConfigurationMessageUtilities.kt
similarity index 89%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/ConfigurationMessageUtilities.kt
index e9e88215ea..354fa31f79 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ConfigurationMessageUtilities.kt
@@ -1,16 +1,13 @@
-package org.thoughtcrime.securesms.loki.protocol
+package org.thoughtcrime.securesms.util
 
 import android.content.Context
-import com.google.protobuf.ByteString
-import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.messages.Destination
 import org.session.libsession.messaging.messages.control.ConfigurationMessage
 import org.session.libsession.messaging.sending_receiving.MessageSender
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.TextSecurePreferences
-import org.thoughtcrime.securesms.loki.utilities.ContactUtilities
 
-object MultiDeviceProtocol {
+object ConfigurationMessageUtilities {
 
     @JvmStatic
     fun syncConfigurationIfNeeded(context: Context) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ContactUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ContactUtilities.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ContactUtilities.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/ContactUtilities.kt
index 39a5c68c67..4820d005f6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ContactUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ContactUtilities.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.util
 
 import android.content.Context
 import org.thoughtcrime.securesms.database.DatabaseFactory
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java
index cb822f1eeb..7860e46242 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java
@@ -28,6 +28,7 @@ import org.session.libsignal.utilities.Log;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
@@ -40,8 +41,9 @@ import network.loki.messenger.R;
 public class DateUtils extends android.text.format.DateUtils {
 
   @SuppressWarnings("unused")
-  private static final String           TAG         = DateUtils.class.getSimpleName();
-  private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMdd");
+  private static final String TAG = DateUtils.class.getSimpleName();
+  private static final SimpleDateFormat DAY_PRECISION_DATE_FORMAT = new SimpleDateFormat("yyyyMMdd");
+  private static final SimpleDateFormat HOUR_PRECISION_DATE_FORMAT = new SimpleDateFormat("yyyyMMddHH");
 
   private static boolean isWithin(final long millis, final long span, final TimeUnit unit) {
     return System.currentTimeMillis() - millis <= unit.toMillis(span);
@@ -60,6 +62,91 @@ public class DateUtils extends android.text.format.DateUtils {
     return new SimpleDateFormat(localizedPattern, locale).format(new Date(time));
   }
 
+  public static String getHourFormat(Context c) {
+    return (DateFormat.is24HourFormat(c)) ? "HH:mm" : "hh:mm a";
+  }
+
+  public static String getDisplayFormattedTimeSpanString(final Context c, final Locale locale, final long timestamp) {
+    if (isWithin(timestamp, 1, TimeUnit.MINUTES)) {
+      return c.getString(R.string.DateUtils_just_now);
+    } else if (isToday(timestamp)) {
+      return getFormattedDateTime(timestamp, getHourFormat(c), locale);
+    } else if (isWithin(timestamp, 6, TimeUnit.DAYS)) {
+      return getFormattedDateTime(timestamp, "EEE " + getHourFormat(c), locale);
+    } else if (isWithin(timestamp, 365, TimeUnit.DAYS)) {
+      return getFormattedDateTime(timestamp, "MMM d " + getHourFormat(c), locale);
+    } else {
+      return getFormattedDateTime(timestamp, "MMM d " + getHourFormat(c) + ", yyyy", locale);
+    }
+  }
+
+  public static SimpleDateFormat getDetailedDateFormatter(Context context, Locale locale) {
+    String dateFormatPattern;
+
+    if (DateFormat.is24HourFormat(context)) {
+      dateFormatPattern = getLocalizedPattern("MMM d, yyyy HH:mm:ss zzz", locale);
+    } else {
+      dateFormatPattern = getLocalizedPattern("MMM d, yyyy hh:mm:ss a zzz", locale);
+    }
+
+    return new SimpleDateFormat(dateFormatPattern, locale);
+  }
+
+  public static String getRelativeDate(@NonNull Context context,
+                                       @NonNull Locale locale,
+                                       long timestamp)
+  {
+    if (isToday(timestamp)) {
+      return context.getString(R.string.DateUtils_today);
+    } else if (isYesterday(timestamp)) {
+      return context.getString(R.string.DateUtils_yesterday);
+    } else {
+      return getFormattedDateTime(timestamp, "EEE, MMM d, yyyy", locale);
+    }
+  }
+
+  public static boolean isSameDay(long t1, long t2) {
+    return DAY_PRECISION_DATE_FORMAT.format(new Date(t1)).equals(DAY_PRECISION_DATE_FORMAT.format(new Date(t2)));
+  }
+
+  public static boolean isSameHour(long t1, long t2) {
+    return HOUR_PRECISION_DATE_FORMAT.format(new Date(t1)).equals(HOUR_PRECISION_DATE_FORMAT.format(new Date(t2)));
+  }
+
+  private static String getLocalizedPattern(String template, Locale locale) {
+    return DateFormat.getBestDateTimePattern(locale, template);
+  }
+
+  /**
+   * e.g. 2020-09-04T19:17:51Z
+   * https://www.iso.org/iso-8601-date-and-time-format.html
+   *
+   * Note: SDK_INT == 0 check needed to pass unit tests due to JVM date parser differences.
+   *
+   * @return The timestamp if able to be parsed, otherwise -1.
+   */
+  @SuppressLint("ObsoleteSdkInt")
+  public static long parseIso8601(@Nullable String date) {
+    SimpleDateFormat format;
+    if (Build.VERSION.SDK_INT == 0 || Build.VERSION.SDK_INT >= 24) {
+      format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX", Locale.getDefault());
+    } else {
+      format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.getDefault());
+    }
+
+    if (date.isEmpty()) {
+      return -1;
+    }
+
+    try {
+      return format.parse(date).getTime();
+    } catch (ParseException e) {
+      Log.w(TAG, "Failed to parse date.", e);
+      return -1;
+    }
+  }
+
+  // region Deprecated
   public static String getBriefRelativeTimeSpanString(final Context c, final Locale locale, final long timestamp) {
     if (isWithin(timestamp, 1, TimeUnit.MINUTES)) {
       return c.getString(R.string.DateUtils_just_now);
@@ -96,86 +183,5 @@ public class DateUtils extends android.text.format.DateUtils {
       return getFormattedDateTime(timestamp, format.toString(), locale);
     }
   }
-
-  public static String getDayPrecisionTimeSpanString(Context context, Locale locale, long timestamp) {
-    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
-
-    if (simpleDateFormat.format(System.currentTimeMillis()).equals(simpleDateFormat.format(timestamp))) {
-      return context.getString(R.string.DeviceListItem_today);
-    } else {
-      String format;
-
-      if      (isWithin(timestamp, 6, TimeUnit.DAYS))   format = "EEE ";
-      else if (isWithin(timestamp, 365, TimeUnit.DAYS)) format = "MMM d";
-      else                                              format = "MMM d, yyy";
-
-      return getFormattedDateTime(timestamp, format, locale);
-    }
-  }
-
-  public static SimpleDateFormat getDetailedDateFormatter(Context context, Locale locale) {
-    String dateFormatPattern;
-
-    if (DateFormat.is24HourFormat(context)) {
-      dateFormatPattern = getLocalizedPattern("MMM d, yyyy HH:mm:ss zzz", locale);
-    } else {
-      dateFormatPattern = getLocalizedPattern("MMM d, yyyy hh:mm:ss a zzz", locale);
-    }
-
-    return new SimpleDateFormat(dateFormatPattern, locale);
-  }
-
-  public static String getRelativeDate(@NonNull Context context,
-                                       @NonNull Locale locale,
-                                       long timestamp)
-  {
-    if (isToday(timestamp)) {
-      return context.getString(R.string.DateUtils_today);
-    } else if (isYesterday(timestamp)) {
-      return context.getString(R.string.DateUtils_yesterday);
-    } else {
-      return getFormattedDateTime(timestamp, "EEE, MMM d, yyyy", locale);
-    }
-  }
-
-  public static boolean isSameDay(long t1, long t2) {
-    return DATE_FORMAT.format(new Date(t1)).equals(DATE_FORMAT.format(new Date(t2)));
-  }
-
-  public static boolean isSameExtendedRelativeTimestamp(@NonNull Context context, @NonNull Locale locale, long t1, long t2) {
-    return getExtendedRelativeTimeSpanString(context, locale, t1).equals(getExtendedRelativeTimeSpanString(context, locale, t2));
-  }
-
-  private static String getLocalizedPattern(String template, Locale locale) {
-    return DateFormat.getBestDateTimePattern(locale, template);
-  }
-
-  /**
-   * e.g. 2020-09-04T19:17:51Z
-   * https://www.iso.org/iso-8601-date-and-time-format.html
-   *
-   * Note: SDK_INT == 0 check needed to pass unit tests due to JVM date parser differences.
-   *
-   * @return The timestamp if able to be parsed, otherwise -1.
-   */
-  @SuppressLint("ObsoleteSdkInt")
-  public static long parseIso8601(@Nullable String date) {
-    SimpleDateFormat format;
-    if (Build.VERSION.SDK_INT == 0 || Build.VERSION.SDK_INT >= 24) {
-      format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX", Locale.getDefault());
-    } else {
-      format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.getDefault());
-    }
-
-    if (date.isEmpty()) {
-      return -1;
-    }
-
-    try {
-      return format.parse(date).getTime();
-    } catch (ParseException e) {
-      Log.w(TAG, "Failed to parse date.", e);
-      return -1;
-    }
-  }
+  // endregion
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/GeneralUtilities.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/GeneralUtilities.kt
index 798f937d9a..00e3e44418 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/GeneralUtilities.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.util
 
 import android.content.res.Resources
 import android.os.Build
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/GlowView.kt b/app/src/main/java/org/thoughtcrime/securesms/util/GlowView.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/views/GlowView.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/GlowView.kt
index c2619a6044..16151fd6c4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/GlowView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/GlowView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.views
+package org.thoughtcrime.securesms.util
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
@@ -11,8 +11,8 @@ import android.widget.RelativeLayout
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.loki.utilities.getColorWithID
-import org.thoughtcrime.securesms.loki.utilities.toPx
+import org.thoughtcrime.securesms.util.getColorWithID
+import org.thoughtcrime.securesms.util.toPx
 import kotlin.math.roundToInt
 
 interface GlowView {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt b/app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt
index c3070a16e4..5f8678a58c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.util
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -51,7 +51,7 @@ class IP2Country private constructor(private val context: Context) {
 
         public lateinit var shared: IP2Country
 
-        public val isInitialized: Boolean get() = ::shared.isInitialized
+        public val isInitialized: Boolean get() = Companion::shared.isInitialized
 
         public fun configureIfNeeded(context: Context) {
             if (isInitialized) { return; }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/PointFUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/PointFUtilities.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/PointFUtilities.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/PointFUtilities.kt
index c05e3fe1cd..2cbe20aa00 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/PointFUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/PointFUtilities.kt
@@ -1,7 +1,8 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.util
 
 import android.graphics.PointF
 import android.view.View
+import org.thoughtcrime.securesms.util.hitRect
 
 fun PointF.distanceTo(other: PointF): Float {
     return Math.sqrt(Math.pow(this.x.toDouble() - other.x.toDouble(), 2.toDouble()) + Math.pow(this.y.toDouble() - other.y.toDouble(), 2.toDouble())).toFloat()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/QRCodeUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/QRCodeUtilities.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/QRCodeUtilities.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/QRCodeUtilities.kt
index 26d3f163b5..f7d1e3e8ad 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/QRCodeUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/QRCodeUtilities.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.util
 
 import android.graphics.Bitmap
 import android.graphics.Color
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodeFragment.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodeFragment.kt
index d0c6af135e..9eecc15b75 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodeFragment.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.fragments
+package org.thoughtcrime.securesms.util
 
 import android.content.res.Configuration
 import android.os.Bundle
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodePlaceholderFragment.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodePlaceholderFragment.kt
index 13e46b6fe1..5b36de7aea 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodePlaceholderFragment.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.fragments
+package org.thoughtcrime.securesms.util
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodeWrapperFragment.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodeWrapperFragment.kt
index 52414bef9c..6913e3cb8a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodeWrapperFragment.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.fragments
+package org.thoughtcrime.securesms.util
 
 import android.Manifest
 import android.content.pm.PackageManager
@@ -11,6 +11,7 @@ import androidx.fragment.app.Fragment
 import com.tbruyelle.rxpermissions2.RxPermissions
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.qr.ScanListener
+import org.thoughtcrime.securesms.util.ScanQRCodeFragment
 
 class ScanQRCodeWrapperFragment : Fragment(), ScanQRCodePlaceholderFragmentDelegate, ScanListener {
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt
index 1f8bdca7ad..fcfa1d082b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.protocol
+package org.thoughtcrime.securesms.util
 
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.recipients.Recipient
@@ -22,7 +22,7 @@ object SessionMetaProtocol {
     }
 
     fun removeTimestamps(timestamps: Set<Long>) {
-        this.timestamps.removeAll(timestamps)
+        SessionMetaProtocol.timestamps.removeAll(timestamps)
     }
 
     @JvmStatic
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/viewmodel/State.kt b/app/src/main/java/org/thoughtcrime/securesms/util/State.kt
similarity index 78%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/viewmodel/State.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/State.kt
index 94227d0e0c..2372c107b0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/viewmodel/State.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/State.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.viewmodel
+package org.thoughtcrime.securesms.util
 
 sealed class State<out T> {
     object Loading : State<Nothing>()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/UiModeUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/UiModeUtilities.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/UiModeUtilities.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/UiModeUtilities.kt
index 70368b85e2..39df0fccca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/UiModeUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/UiModeUtilities.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.util
 
 import android.content.Context
 import android.content.res.Configuration
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewGroupUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ViewGroupUtilities.kt
similarity index 74%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewGroupUtilities.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/ViewGroupUtilities.kt
index 3e9144206c..29aef9853d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewGroupUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ViewGroupUtilities.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.util
 
 import android.view.ViewGroup
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt
rename to app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt
index 67a137bc48..6d4d053b6d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities
+package org.thoughtcrime.securesms.util
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
diff --git a/app/src/main/res/drawable-xxxhdpi/oxen_dark_mode.png b/app/src/main/res/drawable-xxxhdpi/oxen_dark_mode.png
new file mode 100644
index 0000000000..84c7bb1059
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/oxen_dark_mode.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/oxen_light_mode.png b/app/src/main/res/drawable-xxxhdpi/oxen_light_mode.png
new file mode 100644
index 0000000000..f2c7e60fbc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/oxen_light_mode.png differ
diff --git a/app/src/main/res/layout-sw400dp/activity_landing.xml b/app/src/main/res/layout-sw400dp/activity_landing.xml
index dc36e5fa57..d1cbc8f2f3 100644
--- a/app/src/main/res/layout-sw400dp/activity_landing.xml
+++ b/app/src/main/res/layout-sw400dp/activity_landing.xml
@@ -19,7 +19,7 @@
         android:textStyle="bold"
         android:text="@string/activity_landing_title_2" />
     
-    <org.thoughtcrime.securesms.loki.views.FakeChatView
+    <org.thoughtcrime.securesms.onboarding.FakeChatView
         android:id="@+id/fakeChatView"
         android:layout_width="match_parent"
         android:layout_height="@dimen/fake_chat_view_height"
diff --git a/app/src/main/res/layout-sw400dp/activity_pn_mode.xml b/app/src/main/res/layout-sw400dp/activity_pn_mode.xml
index 71cfc81180..577a2eddc7 100644
--- a/app/src/main/res/layout-sw400dp/activity_pn_mode.xml
+++ b/app/src/main/res/layout-sw400dp/activity_pn_mode.xml
@@ -31,7 +31,7 @@
             android:textColor="@color/text"
             android:text="@string/activity_pn_mode_explanation" />
 
-        <org.thoughtcrime.securesms.loki.views.PNModeView
+        <org.thoughtcrime.securesms.util.PNModeView
             android:id="@+id/fcmOptionView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -67,9 +67,9 @@
                 android:textStyle="bold"
                 android:text="@string/activity_pn_mode_recommended_option_tag" />
 
-        </org.thoughtcrime.securesms.loki.views.PNModeView>
+        </org.thoughtcrime.securesms.util.PNModeView>
 
-        <org.thoughtcrime.securesms.loki.views.PNModeView
+        <org.thoughtcrime.securesms.util.PNModeView
             android:id="@+id/backgroundPollingOptionView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -96,7 +96,7 @@
                 android:textColor="@color/text"
                 android:text="@string/activity_pn_mode_slow_mode_explanation" />
 
-        </org.thoughtcrime.securesms.loki.views.PNModeView>
+        </org.thoughtcrime.securesms.util.PNModeView>
 
         <Button
             style="@style/Widget.Session.Button.Common.ProminentFilled"
diff --git a/app/src/main/res/layout-sw400dp/activity_seed.xml b/app/src/main/res/layout-sw400dp/activity_seed.xml
index 3592134df9..1d984a84d8 100644
--- a/app/src/main/res/layout-sw400dp/activity_seed.xml
+++ b/app/src/main/res/layout-sw400dp/activity_seed.xml
@@ -6,7 +6,7 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
-    <org.thoughtcrime.securesms.loki.views.SeedReminderView
+    <org.thoughtcrime.securesms.onboarding.SeedReminderView
         android:id="@+id/seedReminderView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout-sw400dp/fragment_enter_public_key.xml b/app/src/main/res/layout-sw400dp/fragment_enter_public_key.xml
index ad8de37b72..33b8133db2 100644
--- a/app/src/main/res/layout-sw400dp/fragment_enter_public_key.xml
+++ b/app/src/main/res/layout-sw400dp/fragment_enter_public_key.xml
@@ -48,7 +48,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <org.thoughtcrime.securesms.loki.views.LabeledSeparatorView
+        <org.thoughtcrime.securesms.components.LabeledSeparatorView
             android:id="@+id/separatorView"
             android:layout_width="match_parent"
             android:layout_height="32dp"
diff --git a/app/src/main/res/layout/activity_conversation_v2_action_bar.xml b/app/src/main/res/layout/activity_conversation_v2_action_bar.xml
index bd8374eb21..287ed9ffe3 100644
--- a/app/src/main/res/layout/activity_conversation_v2_action_bar.xml
+++ b/app/src/main/res/layout/activity_conversation_v2_action_bar.xml
@@ -8,7 +8,7 @@
     android:orientation="horizontal"
     android:gravity="center_vertical">
 
-    <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+    <org.thoughtcrime.securesms.components.ProfilePictureView
         android:id="@+id/profilePictureView"
         android:layout_width="@dimen/medium_profile_picture_size"
         android:layout_height="@dimen/medium_profile_picture_size" />
diff --git a/app/src/main/res/layout/activity_edit_closed_group.xml b/app/src/main/res/layout/activity_edit_closed_group.xml
index 3c22720c20..f95cc2d184 100644
--- a/app/src/main/res/layout/activity_edit_closed_group.xml
+++ b/app/src/main/res/layout/activity_edit_closed_group.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context="org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity">
+    tools:context="org.thoughtcrime.securesms.groups.EditClosedGroupActivity">
 
     <LinearLayout
         android:id="@+id/mainContentContainer"
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index a732ad3a59..4a3e300d94 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -7,7 +7,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="org.thoughtcrime.securesms.loki.activities.HomeActivity">
+    tools:context="org.thoughtcrime.securesms.home.HomeActivity">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
@@ -27,7 +27,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginRight="20dp">
 
-                <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+                <org.thoughtcrime.securesms.components.ProfilePictureView
                     android:id="@+id/profileButton"
                     android:layout_width="@dimen/small_profile_picture_size"
                     android:layout_height="@dimen/small_profile_picture_size"
@@ -53,7 +53,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true">
 
-                    <org.thoughtcrime.securesms.loki.views.PathStatusView
+                    <org.thoughtcrime.securesms.home.PathStatusView
                         android:layout_width="@dimen/path_status_view_size"
                         android:layout_height="@dimen/path_status_view_size"
                         android:layout_alignParentRight="true"
@@ -70,7 +70,7 @@
                 android:background="?android:dividerHorizontal"
                 android:elevation="1dp" />
 
-            <org.thoughtcrime.securesms.loki.views.SeedReminderView
+            <org.thoughtcrime.securesms.onboarding.SeedReminderView
                 android:id="@+id/seedReminderView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
@@ -124,7 +124,7 @@
 
         </LinearLayout>
 
-        <org.thoughtcrime.securesms.loki.views.NewConversationButtonSetView
+        <org.thoughtcrime.securesms.home.NewConversationButtonSetView
             android:id="@+id/newConversationButtonSet"
             android:layout_width="276dp"
             android:layout_height="236dp"
diff --git a/app/src/main/res/layout/activity_landing.xml b/app/src/main/res/layout/activity_landing.xml
index 2858913c18..f22cb15551 100644
--- a/app/src/main/res/layout/activity_landing.xml
+++ b/app/src/main/res/layout/activity_landing.xml
@@ -19,7 +19,7 @@
         android:textStyle="bold"
         android:text="@string/activity_landing_title_2" />
     
-    <org.thoughtcrime.securesms.loki.views.FakeChatView
+    <org.thoughtcrime.securesms.onboarding.FakeChatView
         android:id="@+id/fakeChatView"
         android:layout_width="match_parent"
         android:layout_height="@dimen/fake_chat_view_height"
diff --git a/app/src/main/res/layout/activity_pn_mode.xml b/app/src/main/res/layout/activity_pn_mode.xml
index 3e53a88b1c..5c0f032e7b 100644
--- a/app/src/main/res/layout/activity_pn_mode.xml
+++ b/app/src/main/res/layout/activity_pn_mode.xml
@@ -31,7 +31,7 @@
             android:textColor="@color/text"
             android:text="@string/activity_pn_mode_explanation" />
 
-        <org.thoughtcrime.securesms.loki.views.PNModeView
+        <org.thoughtcrime.securesms.util.PNModeView
             android:id="@+id/fcmOptionView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -67,9 +67,9 @@
                 android:textStyle="bold"
                 android:text="@string/activity_pn_mode_recommended_option_tag" />
 
-        </org.thoughtcrime.securesms.loki.views.PNModeView>
+        </org.thoughtcrime.securesms.util.PNModeView>
 
-        <org.thoughtcrime.securesms.loki.views.PNModeView
+        <org.thoughtcrime.securesms.util.PNModeView
             android:id="@+id/backgroundPollingOptionView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -96,7 +96,7 @@
                 android:textColor="@color/text"
                 android:text="@string/activity_pn_mode_slow_mode_explanation" />
 
-        </org.thoughtcrime.securesms.loki.views.PNModeView>
+        </org.thoughtcrime.securesms.util.PNModeView>
 
         <Button
             style="@style/Widget.Session.Button.Common.ProminentFilled"
diff --git a/app/src/main/res/layout/activity_seed.xml b/app/src/main/res/layout/activity_seed.xml
index 60a61b7860..a650d147f3 100644
--- a/app/src/main/res/layout/activity_seed.xml
+++ b/app/src/main/res/layout/activity_seed.xml
@@ -6,7 +6,7 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
-    <org.thoughtcrime.securesms.loki.views.SeedReminderView
+    <org.thoughtcrime.securesms.onboarding.SeedReminderView
         android:id="@+id/seedReminderView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index bafea51469..f562538791 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="org.thoughtcrime.securesms.loki.activities.SettingsActivity"
+    tools:context="org.thoughtcrime.securesms.preferences.SettingsActivity"
     tools:theme="@style/Theme.Session.DayNight.NoActionBar"
     tools:menu="@menu/settings_general">
 
@@ -20,7 +20,7 @@
             android:orientation="vertical"
             android:gravity="center_horizontal">
 
-            <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+            <org.thoughtcrime.securesms.components.ProfilePictureView
                 android:id="@+id/profilePictureView"
                 android:layout_width="@dimen/large_profile_picture_size"
                 android:layout_height="@dimen/large_profile_picture_size"
@@ -57,7 +57,7 @@
 
             </RelativeLayout>
 
-            <org.thoughtcrime.securesms.loki.views.LabeledSeparatorView
+            <org.thoughtcrime.securesms.components.LabeledSeparatorView
                 android:id="@+id/separatorView"
                 android:layout_width="match_parent"
                 android:layout_height="32dp"
@@ -213,11 +213,18 @@
                 android:gravity="center"
                 android:text="@string/activity_settings_help_translate_session" />
 
+            <ImageView
+                android:id="@+id/oxenLogoImageView"
+                android:layout_width="80dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:src="@drawable/oxen_light_mode" />
+
             <TextView
                 android:id="@+id/versionTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/medium_spacing"
+                android:layout_marginTop="4dp"
                 android:layout_marginBottom="@dimen/medium_spacing"
                 android:gravity="center"
                 android:text="@string/version_s"
diff --git a/app/src/main/res/layout/fragment_enter_public_key.xml b/app/src/main/res/layout/fragment_enter_public_key.xml
index ad8de37b72..33b8133db2 100644
--- a/app/src/main/res/layout/fragment_enter_public_key.xml
+++ b/app/src/main/res/layout/fragment_enter_public_key.xml
@@ -48,7 +48,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <org.thoughtcrime.securesms.loki.views.LabeledSeparatorView
+        <org.thoughtcrime.securesms.components.LabeledSeparatorView
             android:id="@+id/separatorView"
             android:layout_width="match_parent"
             android:layout_height="32dp"
diff --git a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
index 000eba7aab..4c43adcd1e 100644
--- a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
@@ -12,7 +12,7 @@
     app:behavior_hideable="true"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
-    <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+    <org.thoughtcrime.securesms.components.ProfilePictureView
         android:id="@+id/profilePictureView"
         android:layout_width="@dimen/large_profile_picture_size"
         android:layout_height="@dimen/large_profile_picture_size"
diff --git a/app/src/main/res/layout/open_group_invitation_view.xml b/app/src/main/res/layout/open_group_invitation_view.xml
deleted file mode 100644
index 2a360a4a62..0000000000
--- a/app/src/main/res/layout/open_group_invitation_view.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="org.thoughtcrime.securesms.loki.views.OpenGroupInvitationView">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:paddingHorizontal="@dimen/medium_spacing"
-        android:orientation="horizontal">
-
-        <ImageButton
-            android:id="@+id/join_open_group_button"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="@drawable/circle_tintable"
-            android:backgroundTint="#00E076"
-            android:contentDescription="@string/open_group_invitation_view__join_accessibility_description"
-            app:srcCompat="@drawable/ic_add_white_original_24dp" />
-
-        <RelativeLayout
-            android:id="@+id/open_group_icon_image_view_container"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="@drawable/circle_tintable"
-            android:backgroundTint="#00E076">
-
-            <ImageView
-                android:id="@+id/open_group_icon_image_view"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_centerInParent="true"
-                android:contentDescription="@string/open_group_invitation_view__join_accessibility_description"
-                android:src="@drawable/ic_globe" />
-
-        </RelativeLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/small_spacing"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/name_text_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textStyle="bold"
-                android:textSize="@dimen/large_font_size"
-                android:maxLines="1"
-                tools:text="Open group" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/small_font_size"
-                android:maxLines="1"
-                android:text="@string/open_group_invitation_view__open_group_invitation" />
-
-            <TextView
-                android:id="@+id/url_text_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/small_font_size"
-                android:maxLines="1"
-                tools:text="http://1.1.1.1" />
-        </LinearLayout>
-
-    </LinearLayout>
-
-</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/share_activity.xml b/app/src/main/res/layout/share_activity.xml
index 4d7db2c603..78bb2822aa 100644
--- a/app/src/main/res/layout/share_activity.xml
+++ b/app/src/main/res/layout/share_activity.xml
@@ -47,7 +47,7 @@
               android:layout_below="@id/toolbar"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              android:name="org.thoughtcrime.securesms.loki.fragments.ContactSelectionListFragment" />
+              android:name="org.thoughtcrime.securesms.contacts.ContactSelectionListFragment" />
 
     <org.thoughtcrime.securesms.components.SearchToolbar
             android:id="@+id/search_toolbar"
diff --git a/app/src/main/res/layout/view_conversation.xml b/app/src/main/res/layout/view_conversation.xml
index 56f818d827..c6b5a9abe4 100644
--- a/app/src/main/res/layout/view_conversation.xml
+++ b/app/src/main/res/layout/view_conversation.xml
@@ -15,7 +15,7 @@
         android:layout_height="match_parent"
         android:background="@color/accent" />
 
-    <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+    <org.thoughtcrime.securesms.components.ProfilePictureView
         android:id="@+id/profilePictureView"
         android:layout_width="@dimen/medium_profile_picture_size"
         android:layout_height="@dimen/medium_profile_picture_size"
diff --git a/app/src/main/res/layout/view_mention_candidate.xml b/app/src/main/res/layout/view_mention_candidate.xml
index fa4cc225f7..435a4537af 100644
--- a/app/src/main/res/layout/view_mention_candidate.xml
+++ b/app/src/main/res/layout/view_mention_candidate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.loki.views.MentionCandidateView
+<org.thoughtcrime.securesms.conversation.v2.components.MentionCandidateView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="44dp"
@@ -13,7 +13,7 @@
         android:layout_width="26dp"
         android:layout_height="32dp">
 
-        <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+        <org.thoughtcrime.securesms.components.ProfilePictureView
             android:id="@+id/profilePictureView"
             android:layout_width="@dimen/very_small_profile_picture_size"
             android:layout_height="@dimen/very_small_profile_picture_size"
@@ -39,4 +39,4 @@
         android:maxLines="1"
         android:ellipsize="end" />
 
-</org.thoughtcrime.securesms.loki.views.MentionCandidateView>
\ No newline at end of file
+</org.thoughtcrime.securesms.conversation.v2.components.MentionCandidateView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_mention_candidate_v2.xml b/app/src/main/res/layout/view_mention_candidate_v2.xml
index 48264489e4..058dc7285e 100644
--- a/app/src/main/res/layout/view_mention_candidate_v2.xml
+++ b/app/src/main/res/layout/view_mention_candidate_v2.xml
@@ -17,7 +17,7 @@
             android:layout_width="26dp"
             android:layout_height="32dp">
 
-            <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+            <org.thoughtcrime.securesms.components.ProfilePictureView
                 android:id="@+id/profilePictureView"
                 android:layout_width="@dimen/very_small_profile_picture_size"
                 android:layout_height="@dimen/very_small_profile_picture_size"
diff --git a/app/src/main/res/layout/view_user.xml b/app/src/main/res/layout/view_user.xml
index 23b51b1ebd..47e817c368 100644
--- a/app/src/main/res/layout/view_user.xml
+++ b/app/src/main/res/layout/view_user.xml
@@ -14,7 +14,7 @@
         android:gravity="center_vertical"
         android:padding="@dimen/medium_spacing">
 
-        <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+        <org.thoughtcrime.securesms.components.ProfilePictureView
             android:id="@+id/profilePictureView"
             android:layout_width="@dimen/medium_profile_picture_size"
             android:layout_height="@dimen/medium_profile_picture_size" />
diff --git a/app/src/main/res/layout/view_visible_message.xml b/app/src/main/res/layout/view_visible_message.xml
index 71264b05c0..195a81d020 100644
--- a/app/src/main/res/layout/view_visible_message.xml
+++ b/app/src/main/res/layout/view_visible_message.xml
@@ -35,7 +35,7 @@
                 android:layout_width="26dp"
                 android:layout_height="32dp" >
 
-                <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+                <org.thoughtcrime.securesms.components.ProfilePictureView
                     android:id="@+id/profilePictureView"
                     android:layout_width="@dimen/very_small_profile_picture_size"
                     android:layout_height="@dimen/very_small_profile_picture_size"
diff --git a/libsession/src/main/java/org/session/libsession/messaging/MessagingModuleConfiguration.kt b/libsession/src/main/java/org/session/libsession/messaging/MessagingModuleConfiguration.kt
index f6e4445dde..f887a8f383 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/MessagingModuleConfiguration.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/MessagingModuleConfiguration.kt
@@ -1,24 +1,27 @@
 package org.session.libsession.messaging
 
 import android.content.Context
+import com.goterl.lazysodium.utils.KeyPair
 import org.session.libsession.database.MessageDataProvider
 import org.session.libsession.database.StorageProtocol
 
 class MessagingModuleConfiguration(
     val context: Context,
     val storage: StorageProtocol,
-    val messageDataProvider: MessageDataProvider
+    val messageDataProvider: MessageDataProvider,
+    val keyPairProvider: ()-> KeyPair?
 ) {
 
     companion object {
         lateinit var shared: MessagingModuleConfiguration
 
         fun configure(context: Context,
-            storage: StorageProtocol,
-            messageDataProvider: MessageDataProvider
+                      storage: StorageProtocol,
+                      messageDataProvider: MessageDataProvider,
+                      keyPairProvider: () -> KeyPair?
         ) {
             if (Companion::shared.isInitialized) { return }
-            shared = MessagingModuleConfiguration(context, storage, messageDataProvider)
+            shared = MessagingModuleConfiguration(context, storage, messageDataProvider, keyPairProvider)
         }
     }
 }
\ No newline at end of file
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt
index ef91eae598..cbd97e12f7 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt
@@ -6,7 +6,6 @@ import com.goterl.lazysodium.interfaces.Box
 import com.goterl.lazysodium.interfaces.Sign
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.sending_receiving.MessageSender.Error
-import org.session.libsession.utilities.KeyPairUtilities
 import org.session.libsignal.utilities.Hex
 import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.removing05PrefixIfNeeded
@@ -25,7 +24,7 @@ object MessageEncrypter {
      */
     internal fun encrypt(plaintext: ByteArray, recipientHexEncodedX25519PublicKey: String): ByteArray{
         val context = MessagingModuleConfiguration.shared.context
-        val userED25519KeyPair = KeyPairUtilities.getUserED25519KeyPair(context) ?: throw Error.NoUserED25519KeyPair
+        val userED25519KeyPair = MessagingModuleConfiguration.shared.keyPairProvider() ?: throw Error.NoUserED25519KeyPair
         val recipientX25519PublicKey = Hex.fromStringCondensed(recipientHexEncodedX25519PublicKey.removing05PrefixIfNeeded())
 
         val verificationData = plaintext + userED25519KeyPair.publicKey.asBytes + recipientX25519PublicKey
diff --git a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
index 47e187cddc..7ac0feae6d 100644
--- a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
+++ b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
@@ -22,13 +22,10 @@ object TextSecurePreferences {
     val events get() = _events.asSharedFlow()
 
     const val DISABLE_PASSPHRASE_PREF = "pref_disable_passphrase"
-    const val THEME_PREF = "pref_theme"
     const val LANGUAGE_PREF = "pref_language"
     const val THREAD_TRIM_LENGTH = "pref_trim_length"
     const val THREAD_TRIM_NOW = "pref_trim_now"
-
     private const val LAST_VERSION_CODE_PREF = "last_version_code"
-    private const val LAST_EXPERIENCE_VERSION_PREF = "last_experience_version_code"
     const val RINGTONE_PREF = "pref_key_ringtone"
     const val VIBRATE_PREF = "pref_key_vibrate"
     private const val NOTIFICATION_PREF = "pref_key_enable_notifications"
@@ -46,20 +43,15 @@ object TextSecurePreferences {
     private const val UPDATE_APK_REFRESH_TIME_PREF = "pref_update_apk_refresh_time"
     private const val UPDATE_APK_DOWNLOAD_ID = "pref_update_apk_download_id"
     private const val UPDATE_APK_DIGEST = "pref_update_apk_digest"
-
     private const val IN_THREAD_NOTIFICATION_PREF = "pref_key_inthread_notifications"
     const val MESSAGE_BODY_TEXT_SIZE_PREF = "pref_message_body_text_size"
-
     const val LOCAL_REGISTRATION_ID_PREF = "pref_local_registration_id"
-
     const val REPEAT_ALERTS_PREF = "pref_repeat_alerts"
     const val NOTIFICATION_PRIVACY_PREF = "pref_notification_privacy"
     const val NOTIFICATION_PRIORITY_PREF = "pref_notification_priority"
-
     const val MEDIA_DOWNLOAD_MOBILE_PREF = "pref_media_download_mobile"
     const val MEDIA_DOWNLOAD_WIFI_PREF = "pref_media_download_wifi"
     const val MEDIA_DOWNLOAD_ROAMING_PREF = "pref_media_download_roaming"
-
     const val SYSTEM_EMOJI_PREF = "pref_system_emoji"
     const val DIRECT_CAPTURE_CAMERA_ID = "pref_direct_capture_camera_id"
     const val PROFILE_KEY_PREF = "pref_profile_key"
@@ -68,45 +60,33 @@ object TextSecurePreferences {
     const val PROFILE_AVATAR_URL_PREF = "pref_profile_avatar_url"
     const val READ_RECEIPTS_PREF = "pref_read_receipts"
     const val INCOGNITO_KEYBORAD_PREF = "pref_incognito_keyboard"
-
     private const val DATABASE_ENCRYPTED_SECRET = "pref_database_encrypted_secret"
     private const val DATABASE_UNENCRYPTED_SECRET = "pref_database_unencrypted_secret"
     private const val ATTACHMENT_ENCRYPTED_SECRET = "pref_attachment_encrypted_secret"
     private const val ATTACHMENT_UNENCRYPTED_SECRET = "pref_attachment_unencrypted_secret"
     private const val NEEDS_SQLCIPHER_MIGRATION = "pref_needs_sql_cipher_migration"
-
     const val BACKUP_ENABLED = "pref_backup_enabled_v3"
     private const val BACKUP_PASSPHRASE = "pref_backup_passphrase"
     private const val ENCRYPTED_BACKUP_PASSPHRASE = "pref_encrypted_backup_passphrase"
     private const val BACKUP_TIME = "pref_backup_next_time"
     const val BACKUP_NOW = "pref_backup_create"
     private const val BACKUP_SAVE_DIR = "pref_save_dir"
-
     const val SCREEN_LOCK = "pref_android_screen_lock"
     const val SCREEN_LOCK_TIMEOUT = "pref_android_screen_lock_timeout"
-
     private const val LOG_ENCRYPTED_SECRET = "pref_log_encrypted_secret"
     private const val LOG_UNENCRYPTED_SECRET = "pref_log_unencrypted_secret"
-
     private const val NOTIFICATION_CHANNEL_VERSION = "pref_notification_channel_version"
     private const val NOTIFICATION_MESSAGES_CHANNEL_VERSION = "pref_notification_messages_channel_version"
-
     const val UNIVERSAL_UNIDENTIFIED_ACCESS = "pref_universal_unidentified_access"
-
     const val TYPING_INDICATORS = "pref_typing_indicators"
-
     const val LINK_PREVIEWS = "pref_link_previews"
-
     private const val GIF_GRID_LAYOUT = "pref_gif_grid_layout"
-
     const val IS_USING_FCM = "pref_is_using_fcm"
     private const val FCM_TOKEN = "pref_fcm_token"
     private const val LAST_FCM_TOKEN_UPLOAD_TIME = "pref_last_fcm_token_upload_time_2"
-
     private const val LAST_CONFIGURATION_SYNC_TIME = "pref_last_configuration_sync_time"
     const val CONFIGURATION_SYNCED = "pref_configuration_synced"
     private const val LAST_PROFILE_UPDATE_TIME = "pref_last_profile_update_time"
-
     private const val LAST_OPEN_DATE = "pref_last_open_date"
 
     @JvmStatic
@@ -338,7 +318,7 @@ object TextSecurePreferences {
 
     @JvmStatic
     fun setProfileAvatarId(context: Context, id: Int) {
-        setIntegerPrefrence(context, PROFILE_AVATAR_ID_PREF, id)
+        setIntegerPreference(context, PROFILE_AVATAR_ID_PREF, id)
     }
 
     @JvmStatic
@@ -367,7 +347,7 @@ object TextSecurePreferences {
 
     @JvmStatic
     fun setDirectCaptureCameraId(context: Context, value: Int) {
-        setIntegerPrefrence(context, DIRECT_CAPTURE_CAMERA_ID, value)
+        setIntegerPreference(context, DIRECT_CAPTURE_CAMERA_ID, value)
     }
 
     @JvmStatic
@@ -395,7 +375,7 @@ object TextSecurePreferences {
     }
 
     fun setLocalRegistrationId(context: Context, registrationId: Int) {
-        setIntegerPrefrence(context, LOCAL_REGISTRATION_ID_PREF, registrationId)
+        setIntegerPreference(context, LOCAL_REGISTRATION_ID_PREF, registrationId)
     }
 
     @JvmStatic
@@ -476,24 +456,11 @@ object TextSecurePreferences {
 
     @Throws(IOException::class)
     fun setLastVersionCode(context: Context, versionCode: Int) {
-        if (!setIntegerPrefrenceBlocking(context, LAST_VERSION_CODE_PREF, versionCode)) {
+        if (!setIntegerPreferenceBlocking(context, LAST_VERSION_CODE_PREF, versionCode)) {
             throw IOException("couldn't write version code to sharedpreferences")
         }
     }
 
-    fun setLastExperienceVersionCode(context: Context, versionCode: Int) {
-        setIntegerPrefrence(context, LAST_EXPERIENCE_VERSION_PREF, versionCode)
-    }
-
-    fun getTheme(context: Context): String? {
-        return getStringPreference(context, THEME_PREF, "light")
-    }
-
-    @JvmStatic
-    fun isPushRegistered(context: Context): Boolean {
-        return getBooleanPreference(context, REGISTERED_GCM_PREF, false)
-    }
-
     @JvmStatic
     fun isPassphraseTimeoutEnabled(context: Context): Boolean {
         return getBooleanPreference(context, PASSPHRASE_TIMEOUT_PREF, false)
@@ -601,19 +568,14 @@ object TextSecurePreferences {
         return getStringSetPreference(context, key, HashSet(Arrays.asList(*context.resources.getStringArray(defaultValuesRes))))
     }
 
-    @JvmStatic
-    fun setLogEncryptedSecret(context: Context, base64Secret: String?) {
-        setStringPreference(context, LOG_ENCRYPTED_SECRET, base64Secret)
-    }
-
     @JvmStatic
     fun getLogEncryptedSecret(context: Context): String? {
         return getStringPreference(context, LOG_ENCRYPTED_SECRET, null)
     }
 
     @JvmStatic
-    fun setLogUnencryptedSecret(context: Context, base64Secret: String?) {
-        setStringPreference(context, LOG_UNENCRYPTED_SECRET, base64Secret)
+    fun setLogEncryptedSecret(context: Context, base64Secret: String?) {
+        setStringPreference(context, LOG_ENCRYPTED_SECRET, base64Secret)
     }
 
     @JvmStatic
@@ -621,6 +583,11 @@ object TextSecurePreferences {
         return getStringPreference(context, LOG_UNENCRYPTED_SECRET, null)
     }
 
+    @JvmStatic
+    fun setLogUnencryptedSecret(context: Context, base64Secret: String?) {
+        setStringPreference(context, LOG_UNENCRYPTED_SECRET, base64Secret)
+    }
+
     @JvmStatic
     fun getNotificationChannelVersion(context: Context): Int {
         return getIntegerPreference(context, NOTIFICATION_CHANNEL_VERSION, 1)
@@ -628,7 +595,7 @@ object TextSecurePreferences {
 
     @JvmStatic
     fun setNotificationChannelVersion(context: Context, version: Int) {
-        setIntegerPrefrence(context, NOTIFICATION_CHANNEL_VERSION, version)
+        setIntegerPreference(context, NOTIFICATION_CHANNEL_VERSION, version)
     }
 
     @JvmStatic
@@ -638,12 +605,7 @@ object TextSecurePreferences {
 
     @JvmStatic
     fun setNotificationMessagesChannelVersion(context: Context, version: Int) {
-        setIntegerPrefrence(context, NOTIFICATION_MESSAGES_CHANNEL_VERSION, version)
-    }
-
-    @JvmStatic
-    fun setBooleanPreference(context: Context, key: String?, value: Boolean) {
-        getDefaultSharedPreferences(context).edit().putBoolean(key, value).apply()
+        setIntegerPreference(context, NOTIFICATION_MESSAGES_CHANNEL_VERSION, version)
     }
 
     @JvmStatic
@@ -652,8 +614,8 @@ object TextSecurePreferences {
     }
 
     @JvmStatic
-    fun setStringPreference(context: Context, key: String?, value: String?) {
-        getDefaultSharedPreferences(context).edit().putString(key, value).apply()
+    fun setBooleanPreference(context: Context, key: String?, value: Boolean) {
+        getDefaultSharedPreferences(context).edit().putBoolean(key, value).apply()
     }
 
     @JvmStatic
@@ -661,15 +623,20 @@ object TextSecurePreferences {
         return getDefaultSharedPreferences(context).getString(key, defaultValue)
     }
 
+    @JvmStatic
+    fun setStringPreference(context: Context, key: String?, value: String?) {
+        getDefaultSharedPreferences(context).edit().putString(key, value).apply()
+    }
+
     private fun getIntegerPreference(context: Context, key: String, defaultValue: Int): Int {
         return getDefaultSharedPreferences(context).getInt(key, defaultValue)
     }
 
-    private fun setIntegerPrefrence(context: Context, key: String, value: Int) {
+    private fun setIntegerPreference(context: Context, key: String, value: Int) {
         getDefaultSharedPreferences(context).edit().putInt(key, value).apply()
     }
 
-    private fun setIntegerPrefrenceBlocking(context: Context, key: String, value: Int): Boolean {
+    private fun setIntegerPreferenceBlocking(context: Context, key: String, value: Int): Boolean {
         return getDefaultSharedPreferences(context).edit().putInt(key, value).commit()
     }
 
@@ -694,9 +661,6 @@ object TextSecurePreferences {
         }
     }
 
-    // region Loki
-    @JvmStatic
-
     fun getHasViewedSeed(context: Context): Boolean {
         return getBooleanPreference(context, "has_viewed_seed", false)
     }
@@ -723,21 +687,6 @@ object TextSecurePreferences {
         setLongPreference(context, "last_profile_picture_upload", newValue)
     }
 
-    @JvmStatic
-    fun hasSeenGIFMetaDataWarning(context: Context): Boolean {
-        return getBooleanPreference(context, "has_seen_gif_metadata_warning", false)
-    }
-
-    @JvmStatic
-    fun setHasSeenGIFMetaDataWarning(context: Context) {
-        setBooleanPreference(context, "has_seen_gif_metadata_warning", true)
-    }
-
-    @JvmStatic
-    fun clearAll(context: Context) {
-        getDefaultSharedPreferences(context).edit().clear().commit()
-    }
-
     fun getLastSnodePoolRefreshDate(context: Context?): Long {
         return getLongPreference(context!!, "last_snode_pool_refresh_date", 0)
     }
@@ -746,13 +695,9 @@ object TextSecurePreferences {
         setLongPreference(context!!, "last_snode_pool_refresh_date", date.time)
     }
 
-    fun getIsMigratingKeyPair(context: Context?): Boolean {
-        return getBooleanPreference(context!!, "is_migrating_key_pair", false)
-    }
-
     @JvmStatic
-    fun setIsMigratingKeyPair(context: Context?, newValue: Boolean) {
-        setBooleanPreference(context!!, "is_migrating_key_pair", newValue)
+    fun shouldUpdateProfile(context: Context, profileUpdateTime: Long): Boolean {
+        return profileUpdateTime > getLongPreference(context, LAST_PROFILE_UPDATE_TIME, 0)
     }
 
     @JvmStatic
@@ -760,18 +705,6 @@ object TextSecurePreferences {
         setLongPreference(context, LAST_PROFILE_UPDATE_TIME, profileUpdateTime)
     }
 
-    @JvmStatic
-    fun shouldUpdateProfile(context: Context, profileUpdateTime: Long) =
-            profileUpdateTime > getLongPreference(context, LAST_PROFILE_UPDATE_TIME, 0)
-
-    fun hasPerformedContactMigration(context: Context): Boolean {
-        return getBooleanPreference(context, "has_performed_contact_migration", false)
-    }
-
-    fun setPerformedContactMigration(context: Context) {
-        setBooleanPreference(context, "has_performed_contact_migration", true)
-    }
-
     fun getLastOpenTimeDate(context: Context): Long {
         return getLongPreference(context, LAST_OPEN_DATE, 0)
     }
@@ -787,4 +720,9 @@ object TextSecurePreferences {
     fun setHasSeenLinkPreviewSuggestionDialog(context: Context) {
         setBooleanPreference(context, "has_seen_link_preview_suggestion_dialog", true)
     }
+
+    @JvmStatic
+    fun clearAll(context: Context) {
+        getDefaultSharedPreferences(context).edit().clear().commit()
+    }
 }
\ No newline at end of file
diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/HTTP.kt b/libsignal/src/main/java/org/session/libsignal/utilities/HTTP.kt
index 31038a4574..8937bee708 100644
--- a/libsignal/src/main/java/org/session/libsignal/utilities/HTTP.kt
+++ b/libsignal/src/main/java/org/session/libsignal/utilities/HTTP.kt
@@ -89,6 +89,8 @@ object HTTP {
      */
     fun execute(verb: Verb, url: String, body: ByteArray?, timeout: Long = HTTP.timeout, useSeedNodeConnection: Boolean = false): Map<*, *> {
         val request = Request.Builder().url(url)
+            .removeHeader("User-Agent").addHeader("User-Agent", "WhatsApp") // Set a fake value
+            .removeHeader("Accept-Language").addHeader("Accept-Language", "en-us") // Set a fake value
         when (verb) {
             Verb.GET -> request.get()
             Verb.PUT, Verb.POST -> {