diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9f4d5198..12562841 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$USER_HOME$/.sdkman/candidates/gradle/current" />
diff --git a/app/src/androidTest/java/com/zeapo/pwdstore/model/PasswordEntryAndroidTest.kt b/app/src/androidTest/java/dev/msfjarvis/aps/data/password/PasswordEntryAndroidTest.kt
similarity index 97%
rename from app/src/androidTest/java/com/zeapo/pwdstore/model/PasswordEntryAndroidTest.kt
rename to app/src/androidTest/java/dev/msfjarvis/aps/data/password/PasswordEntryAndroidTest.kt
index 53df8209..521b4c4f 100644
--- a/app/src/androidTest/java/com/zeapo/pwdstore/model/PasswordEntryAndroidTest.kt
+++ b/app/src/androidTest/java/dev/msfjarvis/aps/data/password/PasswordEntryAndroidTest.kt
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.model
+package dev.msfjarvis.aps.data.password
 
 import com.github.michaelbull.result.get
-import com.zeapo.pwdstore.utils.Otp
-import com.zeapo.pwdstore.utils.UriTotpFinder
+import dev.msfjarvis.aps.util.totp.Otp
+import dev.msfjarvis.aps.util.totp.UriTotpFinder
 import java.util.Date
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
diff --git a/app/src/androidTest/java/com/zeapo/pwdstore/MigrationsTest.kt b/app/src/androidTest/java/dev/msfjarvis/aps/util/settings/MigrationsTest.kt
similarity index 94%
rename from app/src/androidTest/java/com/zeapo/pwdstore/MigrationsTest.kt
rename to app/src/androidTest/java/dev/msfjarvis/aps/util/settings/MigrationsTest.kt
index 5ba1b307..d27b4c1c 100644
--- a/app/src/androidTest/java/com/zeapo/pwdstore/MigrationsTest.kt
+++ b/app/src/androidTest/java/dev/msfjarvis/aps/util/settings/MigrationsTest.kt
@@ -5,15 +5,13 @@
 
 @file:Suppress("DEPRECATION")
 
-package com.zeapo.pwdstore
+package dev.msfjarvis.aps.util.settings
 
 import android.content.Context
 import androidx.core.content.edit
-import com.zeapo.pwdstore.git.config.AuthMode
-import com.zeapo.pwdstore.git.config.Protocol
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.getString
-import com.zeapo.pwdstore.utils.sharedPrefs
+import dev.msfjarvis.aps.Application
+import dev.msfjarvis.aps.util.extensions.getString
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test
diff --git a/app/src/androidTest/java/com/zeapo/pwdstore/utils/UriTotpFinderTest.kt b/app/src/androidTest/java/dev/msfjarvis/aps/util/totp/UriTotpFinderTest.kt
similarity index 97%
rename from app/src/androidTest/java/com/zeapo/pwdstore/utils/UriTotpFinderTest.kt
rename to app/src/androidTest/java/dev/msfjarvis/aps/util/totp/UriTotpFinderTest.kt
index 0e4ac51c..6dba51b3 100644
--- a/app/src/androidTest/java/com/zeapo/pwdstore/utils/UriTotpFinderTest.kt
+++ b/app/src/androidTest/java/dev/msfjarvis/aps/util/totp/UriTotpFinderTest.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.utils
+package dev.msfjarvis.aps.util.totp
 
 import kotlin.test.assertEquals
 import org.junit.Test
diff --git a/app/src/androidTest/java/com/zeapo/pwdstore/StrictDomainRegexTest.kt b/app/src/androidTest/java/dev/msfjarvis/aps/util/viewmodel/StrictDomainRegexTest.kt
similarity index 98%
rename from app/src/androidTest/java/com/zeapo/pwdstore/StrictDomainRegexTest.kt
rename to app/src/androidTest/java/dev/msfjarvis/aps/util/viewmodel/StrictDomainRegexTest.kt
index 2631cb41..876a0478 100644
--- a/app/src/androidTest/java/com/zeapo/pwdstore/StrictDomainRegexTest.kt
+++ b/app/src/androidTest/java/dev/msfjarvis/aps/util/viewmodel/StrictDomainRegexTest.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore
+package dev.msfjarvis.aps.util.viewmodel
 
 import kotlin.test.assertFalse
 import kotlin.test.assertNull
diff --git a/app/src/free/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSmsActivity.kt b/app/src/free/java/dev/msfjarvis/aps/autofill/oreo/ui/AutofillSmsActivity.kt
similarity index 94%
rename from app/src/free/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSmsActivity.kt
rename to app/src/free/java/dev/msfjarvis/aps/autofill/oreo/ui/AutofillSmsActivity.kt
index 0734af40..3ed0c1d5 100644
--- a/app/src/free/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSmsActivity.kt
+++ b/app/src/free/java/dev/msfjarvis/aps/autofill/oreo/ui/AutofillSmsActivity.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.autofill.oreo.ui
+package dev.msfjarvis.aps.autofill.oreo.ui
 
 import android.content.Context
 import android.content.IntentSender
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 72714908..609b4c86 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.zeapo.pwdstore"
+    package="dev.msfjarvis.aps"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -25,7 +25,7 @@
         tools:ignore="GoogleAppIndexingWarning">
 
         <activity
-            android:name=".PasswordStore"
+            android:name=".ui.passwords.PasswordStore"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name" />
 
@@ -37,7 +37,7 @@
             android:windowSoftInputMode="adjustResize" />
 
         <activity
-            android:name=".LaunchActivity"
+            android:name=".ui.main.LaunchActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
             android:theme="@style/NoBackgroundTheme">
@@ -56,48 +56,48 @@
             tools:node="replace" />
 
         <activity
-            android:name=".git.GitServerConfigActivity"
+            android:name=".ui.git.config.GitServerConfigActivity"
             android:label="@string/title_activity_git_clone"
             android:windowSoftInputMode="adjustResize" />
 
         <activity
-            android:name=".git.GitConfigActivity"
+            android:name=".ui.git.config.GitConfigActivity"
             android:label="@string/title_activity_git_config"
             android:windowSoftInputMode="adjustResize" />
 
         <activity
-            android:name=".git.log.GitLogActivity"
+            android:name=".ui.git.log.GitLogActivity"
             android:label="@string/title_activity_git_log" />
 
         <activity
-            android:name=".UserPreference"
+            android:name=".ui.settings.UserPreference"
             android:label="@string/action_settings"
-            android:parentActivityName=".PasswordStore" />
+            android:parentActivityName=".ui.passwords.PasswordStore" />
 
         <activity
-            android:name=".crypto.PasswordCreationActivity"
+            android:name=".ui.crypto.PasswordCreationActivity"
             android:label="@string/new_password_title"
-            android:parentActivityName=".PasswordStore"
+            android:parentActivityName=".ui.passwords.PasswordStore"
             android:windowSoftInputMode="adjustResize" />
 
         <activity
-            android:name=".crypto.DecryptActivity"
-            android:parentActivityName=".PasswordStore"
+            android:name=".ui.crypto.DecryptActivity"
+            android:parentActivityName=".ui.passwords.PasswordStore"
             android:windowSoftInputMode="adjustResize" />
 
         <activity
-            android:name=".crypto.GetKeyIdsActivity"
-            android:parentActivityName=".PasswordStore"
+            android:name=".ui.crypto.GetKeyIdsActivity"
+            android:parentActivityName=".ui.passwords.PasswordStore"
             android:theme="@style/NoBackgroundTheme" />
 
         <service
-            android:name=".ClipboardService"
+            android:name=".util.services.ClipboardService"
             android:process=":clipboard_service_process" />
         <service
-            android:name=".PasswordExportService"
+            android:name=".util.services.PasswordExportService"
             android:process=":password_export_service_process" />
         <service
-            android:name=".autofill.oreo.OreoAutofillService"
+            android:name=".util.services.OreoAutofillService"
             android:permission="android.permission.BIND_AUTOFILL_SERVICE">
             <intent-filter>
                 <action android:name="android.service.autofill.AutofillService" />
@@ -107,21 +107,21 @@
                 android:resource="@xml/oreo_autofill_service" />
         </service>
 
-        <activity android:name=".SelectFolderActivity" />
+        <activity android:name=".ui.folderselect.SelectFolderActivity" />
         <activity
-            android:name=".sshkeygen.SshKeyGenActivity"
+            android:name=".ui.sshkeygen.SshKeyGenActivity"
             android:label="@string/pref_ssh_keygen_title"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".autofill.oreo.ui.AutofillDecryptActivity"
+            android:name=".ui.autofill.AutofillDecryptActivity"
             android:theme="@style/NoBackgroundTheme" />
         <activity
-            android:name=".autofill.oreo.ui.AutofillFilterView"
+            android:name=".ui.autofill.AutofillFilterView"
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/DialogLikeTheme"
             android:windowSoftInputMode="adjustNothing" />
         <activity
-            android:name=".autofill.oreo.ui.AutofillSaveActivity"
+            android:name=".ui.autofill.AutofillSaveActivity"
             android:theme="@style/NoBackgroundTheme" />
         <activity
             android:name=".autofill.oreo.ui.AutofillSmsActivity"
@@ -129,7 +129,7 @@
             android:theme="@style/DialogLikeTheme"
             android:windowSoftInputMode="adjustNothing" />
         <activity
-            android:name=".autofill.oreo.ui.AutofillPublisherChangedActivity"
+            android:name=".ui.autofill.AutofillPublisherChangedActivity"
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/DialogLikeTheme"
             android:windowSoftInputMode="adjustNothing" />
diff --git a/app/src/main/java/com/zeapo/pwdstore/Application.kt b/app/src/main/java/dev/msfjarvis/aps/Application.kt
similarity index 84%
rename from app/src/main/java/com/zeapo/pwdstore/Application.kt
rename to app/src/main/java/dev/msfjarvis/aps/Application.kt
index 3f3963d0..ce7164c9 100644
--- a/app/src/main/java/com/zeapo/pwdstore/Application.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/Application.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore
+package dev.msfjarvis.aps
 
 import android.content.SharedPreferences
 import androidx.appcompat.app.AppCompatDelegate
@@ -12,11 +12,12 @@ import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES
 import com.github.ajalt.timberkt.Timber.DebugTree
 import com.github.ajalt.timberkt.Timber.plant
-import com.zeapo.pwdstore.git.sshj.setUpBouncyCastleForSshj
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.ProxyUtils
-import com.zeapo.pwdstore.utils.getString
-import com.zeapo.pwdstore.utils.sharedPrefs
+import dev.msfjarvis.aps.util.git.sshj.setUpBouncyCastleForSshj
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.proxy.ProxyUtils
+import dev.msfjarvis.aps.util.extensions.getString
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
+import dev.msfjarvis.aps.util.settings.runMigrations
 
 @Suppress("Unused")
 class Application : android.app.Application(), SharedPreferences.OnSharedPreferenceChangeListener {
diff --git a/app/src/main/java/com/zeapo/pwdstore/model/PasswordEntry.kt b/app/src/main/java/dev/msfjarvis/aps/data/password/PasswordEntry.kt
similarity index 96%
rename from app/src/main/java/com/zeapo/pwdstore/model/PasswordEntry.kt
rename to app/src/main/java/dev/msfjarvis/aps/data/password/PasswordEntry.kt
index 5727c4ba..3a6d9e2c 100644
--- a/app/src/main/java/com/zeapo/pwdstore/model/PasswordEntry.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/data/password/PasswordEntry.kt
@@ -2,12 +2,12 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.model
+package dev.msfjarvis.aps.data.password
 
 import com.github.michaelbull.result.get
-import com.zeapo.pwdstore.utils.Otp
-import com.zeapo.pwdstore.utils.TotpFinder
-import com.zeapo.pwdstore.utils.UriTotpFinder
+import dev.msfjarvis.aps.util.totp.Otp
+import dev.msfjarvis.aps.util.totp.TotpFinder
+import dev.msfjarvis.aps.util.totp.UriTotpFinder
 import java.io.ByteArrayOutputStream
 import java.io.UnsupportedEncodingException
 import java.util.Date
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.kt b/app/src/main/java/dev/msfjarvis/aps/data/password/PasswordItem.kt
similarity index 95%
rename from app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.kt
rename to app/src/main/java/dev/msfjarvis/aps/data/password/PasswordItem.kt
index ef31324b..75fc475b 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/data/password/PasswordItem.kt
@@ -2,9 +2,9 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.utils
+package dev.msfjarvis.aps.data.password
 
-import com.zeapo.pwdstore.crypto.BasePgpActivity
+import dev.msfjarvis.aps.ui.crypto.BasePgpActivity
 import java.io.File
 
 data class PasswordItem(
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt b/app/src/main/java/dev/msfjarvis/aps/data/repo/PasswordRepository.kt
similarity index 95%
rename from app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt
rename to app/src/main/java/dev/msfjarvis/aps/data/repo/PasswordRepository.kt
index 8b403a56..fecdba86 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/data/repo/PasswordRepository.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.utils
+package dev.msfjarvis.aps.data.repo
 
 import android.os.Build
 import androidx.annotation.RequiresApi
@@ -10,7 +10,12 @@ import androidx.core.content.edit
 import com.github.michaelbull.result.getOrElse
 import com.github.michaelbull.result.onFailure
 import com.github.michaelbull.result.runCatching
-import com.zeapo.pwdstore.Application
+import dev.msfjarvis.aps.Application
+import dev.msfjarvis.aps.data.password.PasswordItem
+import dev.msfjarvis.aps.util.settings.PasswordSortOrder
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.getString
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
 import java.io.File
 import java.io.FileFilter
 import java.nio.file.Files
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/adapters/PasswordItemRecyclerAdapter.kt b/app/src/main/java/dev/msfjarvis/aps/ui/adapters/PasswordItemRecyclerAdapter.kt
similarity index 91%
rename from app/src/main/java/com/zeapo/pwdstore/ui/adapters/PasswordItemRecyclerAdapter.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/adapters/PasswordItemRecyclerAdapter.kt
index 38315876..92b0fe37 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/adapters/PasswordItemRecyclerAdapter.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/adapters/PasswordItemRecyclerAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.ui.adapters
+package dev.msfjarvis.aps.ui.adapters
 
 import android.text.SpannableString
 import android.text.style.RelativeSizeSpan
@@ -13,10 +13,10 @@ import androidx.appcompat.widget.AppCompatTextView
 import androidx.recyclerview.selection.ItemDetailsLookup
 import androidx.recyclerview.selection.Selection
 import androidx.recyclerview.widget.RecyclerView
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.SearchableRepositoryAdapter
-import com.zeapo.pwdstore.stableId
-import com.zeapo.pwdstore.utils.PasswordItem
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.data.password.PasswordItem
+import dev.msfjarvis.aps.util.viewmodel.SearchableRepositoryAdapter
+import dev.msfjarvis.aps.util.viewmodel.stableId
 
 open class PasswordItemRecyclerAdapter :
     SearchableRepositoryAdapter<PasswordItemRecyclerAdapter.PasswordItemViewHolder>(
@@ -57,7 +57,8 @@ open class PasswordItemRecyclerAdapter :
             name.text = spannable
             if (item.type == PasswordItem.TYPE_CATEGORY) {
                 folderIndicator.visibility = View.VISIBLE
-                val count = item.file.listFiles { path -> path.isDirectory || path.extension == "gpg" }?.size ?: 0
+                val count = item.file.listFiles { path -> path.isDirectory || path.extension == "gpg" }?.size
+                    ?: 0
                 childCount.visibility = if (count > 0) View.VISIBLE else View.GONE
                 childCount.text = "$count"
             } else {
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillDecryptActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivity.kt
similarity index 94%
rename from app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillDecryptActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivity.kt
index a5bdcfe0..5d6fb886 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillDecryptActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivity.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.autofill.oreo.ui
+package dev.msfjarvis.aps.ui.autofill
 
 import android.app.PendingIntent
 import android.content.Context
@@ -24,11 +24,11 @@ import com.github.michaelbull.result.onSuccess
 import com.github.michaelbull.result.runCatching
 import com.github.androidpasswordstore.autofillparser.AutofillAction
 import com.github.androidpasswordstore.autofillparser.Credentials
-import com.zeapo.pwdstore.autofill.oreo.AutofillPreferences
-import com.zeapo.pwdstore.autofill.oreo.AutofillResponseBuilder
-import com.zeapo.pwdstore.autofill.oreo.DirectoryStructure
-import com.zeapo.pwdstore.model.PasswordEntry
-import com.zeapo.pwdstore.utils.OPENPGP_PROVIDER
+import dev.msfjarvis.aps.util.autofill.AutofillPreferences
+import dev.msfjarvis.aps.util.autofill.AutofillResponseBuilder
+import dev.msfjarvis.aps.util.autofill.DirectoryStructure
+import dev.msfjarvis.aps.data.password.PasswordEntry
+import dev.msfjarvis.aps.util.extensions.OPENPGP_PROVIDER
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.InputStream
@@ -53,9 +53,9 @@ class AutofillDecryptActivity : AppCompatActivity(), CoroutineScope {
 
     companion object {
 
-        private const val EXTRA_FILE_PATH = "com.zeapo.pwdstore.autofill.oreo.EXTRA_FILE_PATH"
+        private const val EXTRA_FILE_PATH = "dev.msfjarvis.aps.autofill.oreo.EXTRA_FILE_PATH"
         private const val EXTRA_SEARCH_ACTION =
-            "com.zeapo.pwdstore.autofill.oreo.EXTRA_SEARCH_ACTION"
+            "dev.msfjarvis.aps.autofill.oreo.EXTRA_SEARCH_ACTION"
 
         private var decryptFileRequestCode = 1
 
@@ -195,7 +195,7 @@ class AutofillDecryptActivity : AppCompatActivity(), CoroutineScope {
                         runCatching {
                             val entry = withContext(Dispatchers.IO) {
                                 @Suppress("BlockingMethodInNonBlockingContext")
-                                PasswordEntry(decryptedOutput)
+                                (PasswordEntry(decryptedOutput))
                             }
                             AutofillPreferences.credentialsFromStoreEntry(this, file, entry, directoryStructure)
                         }.getOrElse { e ->
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillFilterActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillFilterActivity.kt
similarity index 90%
rename from app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillFilterActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillFilterActivity.kt
index 25919ad5..fe19a636 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillFilterActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillFilterActivity.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.autofill.oreo.ui
+package dev.msfjarvis.aps.ui.autofill
 
 import android.annotation.TargetApi
 import android.app.PendingIntent
@@ -25,18 +25,18 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.github.ajalt.timberkt.e
 import com.github.androidpasswordstore.autofillparser.FormOrigin
-import com.zeapo.pwdstore.FilterMode
-import com.zeapo.pwdstore.ListMode
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.SearchMode
-import com.zeapo.pwdstore.SearchableRepositoryAdapter
-import com.zeapo.pwdstore.SearchableRepositoryViewModel
-import com.zeapo.pwdstore.autofill.oreo.AutofillMatcher
-import com.zeapo.pwdstore.autofill.oreo.AutofillPreferences
-import com.zeapo.pwdstore.autofill.oreo.DirectoryStructure
-import com.zeapo.pwdstore.databinding.ActivityOreoAutofillFilterBinding
-import com.zeapo.pwdstore.utils.PasswordItem
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.autofill.AutofillMatcher
+import dev.msfjarvis.aps.util.autofill.AutofillPreferences
+import dev.msfjarvis.aps.util.autofill.DirectoryStructure
+import dev.msfjarvis.aps.databinding.ActivityOreoAutofillFilterBinding
+import dev.msfjarvis.aps.data.password.PasswordItem
+import dev.msfjarvis.aps.util.extensions.viewBinding
+import dev.msfjarvis.aps.util.viewmodel.FilterMode
+import dev.msfjarvis.aps.util.viewmodel.ListMode
+import dev.msfjarvis.aps.util.viewmodel.SearchMode
+import dev.msfjarvis.aps.util.viewmodel.SearchableRepositoryAdapter
+import dev.msfjarvis.aps.util.viewmodel.SearchableRepositoryViewModel
 
 @TargetApi(Build.VERSION_CODES.O)
 class AutofillFilterView : AppCompatActivity() {
@@ -47,9 +47,9 @@ class AutofillFilterView : AppCompatActivity() {
         private const val WIDTH_PERCENTAGE = 0.75
 
         private const val EXTRA_FORM_ORIGIN_WEB =
-            "com.zeapo.pwdstore.autofill.oreo.ui.EXTRA_FORM_ORIGIN_WEB"
+            "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_FORM_ORIGIN_WEB"
         private const val EXTRA_FORM_ORIGIN_APP =
-            "com.zeapo.pwdstore.autofill.oreo.ui.EXTRA_FORM_ORIGIN_APP"
+            "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_FORM_ORIGIN_APP"
         private var matchAndDecryptFileRequestCode = 1
 
         fun makeMatchAndDecryptFileIntentSender(
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillPublisherChangedActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillPublisherChangedActivity.kt
similarity index 90%
rename from app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillPublisherChangedActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillPublisherChangedActivity.kt
index 34edf8f5..a8edabbe 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillPublisherChangedActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillPublisherChangedActivity.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.autofill.oreo.ui
+package dev.msfjarvis.aps.ui.autofill
 
 import android.annotation.TargetApi
 import android.app.PendingIntent
@@ -22,11 +22,11 @@ import com.github.androidpasswordstore.autofillparser.FormOrigin
 import com.github.androidpasswordstore.autofillparser.computeCertificatesHash
 import com.github.michaelbull.result.onFailure
 import com.github.michaelbull.result.runCatching
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.autofill.oreo.AutofillMatcher
-import com.zeapo.pwdstore.autofill.oreo.AutofillPublisherChangedException
-import com.zeapo.pwdstore.databinding.ActivityOreoAutofillPublisherChangedBinding
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.autofill.AutofillMatcher
+import dev.msfjarvis.aps.util.autofill.AutofillPublisherChangedException
+import dev.msfjarvis.aps.databinding.ActivityOreoAutofillPublisherChangedBinding
+import dev.msfjarvis.aps.util.extensions.viewBinding
 
 @TargetApi(Build.VERSION_CODES.O)
 class AutofillPublisherChangedActivity : AppCompatActivity() {
@@ -34,9 +34,9 @@ class AutofillPublisherChangedActivity : AppCompatActivity() {
     companion object {
 
         private const val EXTRA_APP_PACKAGE =
-            "com.zeapo.pwdstore.autofill.oreo.ui.EXTRA_APP_PACKAGE"
+            "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_APP_PACKAGE"
         private const val EXTRA_FILL_RESPONSE_AFTER_RESET =
-            "com.zeapo.pwdstore.autofill.oreo.ui.EXTRA_FILL_RESPONSE_AFTER_RESET"
+            "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_FILL_RESPONSE_AFTER_RESET"
         private var publisherChangedRequestCode = 1
 
         fun makePublisherChangedIntentSender(
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSaveActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillSaveActivity.kt
similarity index 88%
rename from app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSaveActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillSaveActivity.kt
index bc012d3d..46234c4f 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSaveActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillSaveActivity.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.autofill.oreo.ui
+package dev.msfjarvis.aps.ui.autofill
 
 import android.app.PendingIntent
 import android.content.Context
@@ -19,11 +19,11 @@ import com.github.ajalt.timberkt.e
 import com.github.androidpasswordstore.autofillparser.AutofillAction
 import com.github.androidpasswordstore.autofillparser.Credentials
 import com.github.androidpasswordstore.autofillparser.FormOrigin
-import com.zeapo.pwdstore.autofill.oreo.AutofillMatcher
-import com.zeapo.pwdstore.autofill.oreo.AutofillPreferences
-import com.zeapo.pwdstore.autofill.oreo.AutofillResponseBuilder
-import com.zeapo.pwdstore.crypto.PasswordCreationActivity
-import com.zeapo.pwdstore.utils.PasswordRepository
+import dev.msfjarvis.aps.util.autofill.AutofillMatcher
+import dev.msfjarvis.aps.util.autofill.AutofillPreferences
+import dev.msfjarvis.aps.util.autofill.AutofillResponseBuilder
+import dev.msfjarvis.aps.ui.crypto.PasswordCreationActivity
+import dev.msfjarvis.aps.data.repo.PasswordRepository
 import java.io.File
 
 @RequiresApi(Build.VERSION_CODES.O)
@@ -32,15 +32,15 @@ class AutofillSaveActivity : AppCompatActivity() {
     companion object {
 
         private const val EXTRA_FOLDER_NAME =
-            "com.zeapo.pwdstore.autofill.oreo.ui.EXTRA_FOLDER_NAME"
-        private const val EXTRA_PASSWORD = "com.zeapo.pwdstore.autofill.oreo.ui.EXTRA_PASSWORD"
-        private const val EXTRA_NAME = "com.zeapo.pwdstore.autofill.oreo.ui.EXTRA_NAME"
+            "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_FOLDER_NAME"
+        private const val EXTRA_PASSWORD = "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_PASSWORD"
+        private const val EXTRA_NAME = "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_NAME"
         private const val EXTRA_SHOULD_MATCH_APP =
-            "com.zeapo.pwdstore.autofill.oreo.ui.EXTRA_SHOULD_MATCH_APP"
+            "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_SHOULD_MATCH_APP"
         private const val EXTRA_SHOULD_MATCH_WEB =
-            "com.zeapo.pwdstore.autofill.oreo.ui.EXTRA_SHOULD_MATCH_WEB"
+            "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_SHOULD_MATCH_WEB"
         private const val EXTRA_GENERATE_PASSWORD =
-            "com.zeapo.pwdstore.autofill.oreo.ui.EXTRA_GENERATE_PASSWORD"
+            "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_GENERATE_PASSWORD"
 
         private var saveRequestCode = 1
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/PasswordViewHolder.kt b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/PasswordViewHolder.kt
similarity index 85%
rename from app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/PasswordViewHolder.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/autofill/PasswordViewHolder.kt
index 162362f6..e2fbaf76 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/PasswordViewHolder.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/PasswordViewHolder.kt
@@ -2,12 +2,12 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.autofill.oreo.ui
+package dev.msfjarvis.aps.ui.autofill
 
 import android.view.View
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.zeapo.pwdstore.R
+import dev.msfjarvis.aps.R
 
 class PasswordViewHolder(view: View) : RecyclerView.ViewHolder(view) {
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/BasePgpActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt
similarity index 96%
rename from app/src/main/java/com/zeapo/pwdstore/crypto/BasePgpActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt
index 412a54f2..e75d6f0a 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/BasePgpActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.crypto
+package dev.msfjarvis.aps.ui.crypto
 
 import android.app.PendingIntent
 import android.content.ClipData
@@ -25,14 +25,14 @@ import com.github.michaelbull.result.getOr
 import com.github.michaelbull.result.runCatching
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
-import com.zeapo.pwdstore.ClipboardService
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.utils.OPENPGP_PROVIDER
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.clipboard
-import com.zeapo.pwdstore.utils.getString
-import com.zeapo.pwdstore.utils.sharedPrefs
-import com.zeapo.pwdstore.utils.snackbar
+import dev.msfjarvis.aps.util.services.ClipboardService
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.extensions.OPENPGP_PROVIDER
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.clipboard
+import dev.msfjarvis.aps.util.extensions.getString
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
+import dev.msfjarvis.aps.util.extensions.snackbar
 import java.io.File
 import me.msfjarvis.openpgpktx.util.OpenPgpApi
 import me.msfjarvis.openpgpktx.util.OpenPgpServiceConnection
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt
similarity index 97%
rename from app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt
index cfcecc22..8f36cd25 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.crypto
+package dev.msfjarvis.aps.ui.crypto
 
 import android.content.Intent
 import android.graphics.Typeface
@@ -18,11 +18,11 @@ import androidx.lifecycle.lifecycleScope
 import com.github.ajalt.timberkt.e
 import com.github.michaelbull.result.onFailure
 import com.github.michaelbull.result.runCatching
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.databinding.DecryptLayoutBinding
-import com.zeapo.pwdstore.model.PasswordEntry
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.databinding.DecryptLayoutBinding
+import dev.msfjarvis.aps.data.password.PasswordEntry
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.viewBinding
 import java.io.ByteArrayOutputStream
 import java.io.File
 import kotlin.time.ExperimentalTime
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/GetKeyIdsActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GetKeyIdsActivity.kt
similarity index 98%
rename from app/src/main/java/com/zeapo/pwdstore/crypto/GetKeyIdsActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/crypto/GetKeyIdsActivity.kt
index b6a3e955..f49537aa 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/GetKeyIdsActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GetKeyIdsActivity.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.crypto
+package dev.msfjarvis.aps.ui.crypto
 
 import android.content.Intent
 import android.os.Bundle
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PasswordCreationActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt
similarity index 96%
rename from app/src/main/java/com/zeapo/pwdstore/crypto/PasswordCreationActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt
index 01d85f2b..403f6e2a 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PasswordCreationActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.crypto
+package dev.msfjarvis.aps.ui.crypto
 
 import android.content.Context
 import android.content.Intent
@@ -26,21 +26,21 @@ import com.github.michaelbull.result.runCatching
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.zxing.integration.android.IntentIntegrator
 import com.google.zxing.integration.android.IntentIntegrator.QR_CODE
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.autofill.oreo.AutofillPreferences
-import com.zeapo.pwdstore.autofill.oreo.DirectoryStructure
-import com.zeapo.pwdstore.databinding.PasswordCreationActivityBinding
-import com.zeapo.pwdstore.model.PasswordEntry
-import com.zeapo.pwdstore.ui.dialogs.PasswordGeneratorDialogFragment
-import com.zeapo.pwdstore.ui.dialogs.XkPasswordGeneratorDialogFragment
-import com.zeapo.pwdstore.utils.PasswordRepository
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.base64
-import com.zeapo.pwdstore.utils.commitChange
-import com.zeapo.pwdstore.utils.getString
-import com.zeapo.pwdstore.utils.isInsideRepository
-import com.zeapo.pwdstore.utils.snackbar
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.data.password.PasswordEntry
+import dev.msfjarvis.aps.util.autofill.AutofillPreferences
+import dev.msfjarvis.aps.util.autofill.DirectoryStructure
+import dev.msfjarvis.aps.ui.dialogs.PasswordGeneratorDialogFragment
+import dev.msfjarvis.aps.ui.dialogs.XkPasswordGeneratorDialogFragment
+import dev.msfjarvis.aps.data.repo.PasswordRepository
+import dev.msfjarvis.aps.databinding.PasswordCreationActivityBinding
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.base64
+import dev.msfjarvis.aps.util.extensions.commitChange
+import dev.msfjarvis.aps.util.extensions.getString
+import dev.msfjarvis.aps.util.extensions.isInsideRepository
+import dev.msfjarvis.aps.util.extensions.snackbar
+import dev.msfjarvis.aps.util.extensions.viewBinding
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/BasicBottomSheet.kt b/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/BasicBottomSheet.kt
similarity index 96%
rename from app/src/main/java/com/zeapo/pwdstore/ui/dialogs/BasicBottomSheet.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/dialogs/BasicBottomSheet.kt
index 6f028009..c2577443 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/BasicBottomSheet.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/BasicBottomSheet.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.ui.dialogs
+package dev.msfjarvis.aps.ui.dialogs
 
 import android.content.Context
 import android.graphics.drawable.GradientDrawable
@@ -18,10 +18,10 @@ import androidx.core.view.isVisible
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.databinding.BasicBottomSheetBinding
-import com.zeapo.pwdstore.utils.resolveAttribute
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.databinding.BasicBottomSheetBinding
+import dev.msfjarvis.aps.util.extensions.resolveAttribute
+import dev.msfjarvis.aps.util.extensions.viewBinding
 
 /**
  * [BottomSheetDialogFragment] that exposes a simple [androidx.appcompat.app.AlertDialog] like
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/FolderCreationDialogFragment.kt b/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/FolderCreationDialogFragment.kt
similarity index 91%
rename from app/src/main/java/com/zeapo/pwdstore/ui/dialogs/FolderCreationDialogFragment.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/dialogs/FolderCreationDialogFragment.kt
index d5dd9b43..7f50a619 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/FolderCreationDialogFragment.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/FolderCreationDialogFragment.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.ui.dialogs
+package dev.msfjarvis.aps.ui.dialogs
 
 import android.app.Dialog
 import android.content.Intent
@@ -17,13 +17,13 @@ import com.google.android.material.checkbox.MaterialCheckBox
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import com.zeapo.pwdstore.PasswordStore
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.crypto.BasePgpActivity
-import com.zeapo.pwdstore.crypto.GetKeyIdsActivity
-import com.zeapo.pwdstore.utils.PasswordRepository
-import com.zeapo.pwdstore.utils.commitChange
-import com.zeapo.pwdstore.utils.requestInputFocusOnView
+import dev.msfjarvis.aps.ui.passwords.PasswordStore
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.ui.crypto.BasePgpActivity
+import dev.msfjarvis.aps.ui.crypto.GetKeyIdsActivity
+import dev.msfjarvis.aps.data.repo.PasswordRepository
+import dev.msfjarvis.aps.util.extensions.commitChange
+import dev.msfjarvis.aps.util.extensions.requestInputFocusOnView
 import java.io.File
 import kotlinx.coroutines.launch
 import me.msfjarvis.openpgpktx.util.OpenPgpApi
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/ItemCreationBottomSheet.kt b/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/ItemCreationBottomSheet.kt
similarity index 86%
rename from app/src/main/java/com/zeapo/pwdstore/ui/dialogs/ItemCreationBottomSheet.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/dialogs/ItemCreationBottomSheet.kt
index 5acc8091..4889f1e5 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/ItemCreationBottomSheet.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/ItemCreationBottomSheet.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.ui.dialogs
+package dev.msfjarvis.aps.ui.dialogs
 
 import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
@@ -16,12 +16,12 @@ import androidx.fragment.app.setFragmentResult
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.zeapo.pwdstore.PasswordFragment.Companion.ACTION_FOLDER
-import com.zeapo.pwdstore.PasswordFragment.Companion.ACTION_KEY
-import com.zeapo.pwdstore.PasswordFragment.Companion.ACTION_PASSWORD
-import com.zeapo.pwdstore.PasswordFragment.Companion.ITEM_CREATION_REQUEST_KEY
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.utils.resolveAttribute
+import dev.msfjarvis.aps.ui.passwords.PasswordFragment.Companion.ACTION_FOLDER
+import dev.msfjarvis.aps.ui.passwords.PasswordFragment.Companion.ACTION_KEY
+import dev.msfjarvis.aps.ui.passwords.PasswordFragment.Companion.ACTION_PASSWORD
+import dev.msfjarvis.aps.ui.passwords.PasswordFragment.Companion.ITEM_CREATION_REQUEST_KEY
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.extensions.resolveAttribute
 
 class ItemCreationBottomSheet : BottomSheetDialogFragment() {
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/PasswordGeneratorDialogFragment.kt b/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/PasswordGeneratorDialogFragment.kt
similarity index 92%
rename from app/src/main/java/com/zeapo/pwdstore/ui/dialogs/PasswordGeneratorDialogFragment.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/dialogs/PasswordGeneratorDialogFragment.kt
index 7aa66a03..0676ef1c 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/PasswordGeneratorDialogFragment.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/PasswordGeneratorDialogFragment.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.ui.dialogs
+package dev.msfjarvis.aps.ui.dialogs
 
 import android.annotation.SuppressLint
 import android.app.AlertDialog
@@ -20,12 +20,12 @@ import androidx.fragment.app.DialogFragment
 import com.github.michaelbull.result.getOrElse
 import com.github.michaelbull.result.runCatching
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.pwgen.PasswordGenerator
-import com.zeapo.pwdstore.pwgen.PasswordGenerator.generate
-import com.zeapo.pwdstore.pwgen.PasswordGenerator.setPrefs
-import com.zeapo.pwdstore.pwgen.PasswordOption
-import com.zeapo.pwdstore.utils.PreferenceKeys
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.pwgen.PasswordGenerator
+import dev.msfjarvis.aps.util.pwgen.PasswordGenerator.generate
+import dev.msfjarvis.aps.util.pwgen.PasswordGenerator.setPrefs
+import dev.msfjarvis.aps.util.pwgen.PasswordOption
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
 
 class PasswordGeneratorDialogFragment : DialogFragment() {
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/XkPasswordGeneratorDialogFragment.kt b/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/XkPasswordGeneratorDialogFragment.kt
similarity index 95%
rename from app/src/main/java/com/zeapo/pwdstore/ui/dialogs/XkPasswordGeneratorDialogFragment.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/dialogs/XkPasswordGeneratorDialogFragment.kt
index 274330bb..995c7e2f 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/XkPasswordGeneratorDialogFragment.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/XkPasswordGeneratorDialogFragment.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.ui.dialogs
+package dev.msfjarvis.aps.ui.dialogs
 
 import android.app.Dialog
 import android.content.Context
@@ -20,11 +20,11 @@ import com.github.michaelbull.result.fold
 import com.github.michaelbull.result.getOr
 import com.github.michaelbull.result.runCatching
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.databinding.FragmentXkpwgenBinding
-import com.zeapo.pwdstore.pwgenxkpwd.CapsType
-import com.zeapo.pwdstore.pwgenxkpwd.PasswordBuilder
-import com.zeapo.pwdstore.utils.getString
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.databinding.FragmentXkpwgenBinding
+import dev.msfjarvis.aps.util.pwgenxkpwd.CapsType
+import dev.msfjarvis.aps.util.pwgenxkpwd.PasswordBuilder
+import dev.msfjarvis.aps.util.extensions.getString
 
 /** A placeholder fragment containing a simple view.  */
 class XkPasswordGeneratorDialogFragment : DialogFragment() {
diff --git a/app/src/main/java/com/zeapo/pwdstore/SelectFolderActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderActivity.kt
similarity index 88%
rename from app/src/main/java/com/zeapo/pwdstore/SelectFolderActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderActivity.kt
index 13b6dcd3..f2d655bb 100644
--- a/app/src/main/java/com/zeapo/pwdstore/SelectFolderActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderActivity.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore
+package dev.msfjarvis.aps.ui.folderselect
 
 import android.os.Bundle
 import android.view.Menu
@@ -10,7 +10,10 @@ import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.commit
-import com.zeapo.pwdstore.utils.PasswordRepository
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.data.repo.PasswordRepository
+import dev.msfjarvis.aps.ui.passwords.PASSWORD_FRAGMENT_TAG
+import dev.msfjarvis.aps.ui.passwords.PasswordStore
 
 
 class SelectFolderActivity : AppCompatActivity(R.layout.select_folder_layout) {
diff --git a/app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.kt b/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderFragment.kt
similarity index 85%
rename from app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderFragment.kt
index e0aeaad7..597b968c 100644
--- a/app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderFragment.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore
+package dev.msfjarvis.aps.ui.folderselect
 
 import android.content.Context
 import android.os.Bundle
@@ -13,10 +13,14 @@ import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.github.michaelbull.result.onFailure
 import com.github.michaelbull.result.runCatching
-import com.zeapo.pwdstore.databinding.PasswordRecyclerViewBinding
-import com.zeapo.pwdstore.ui.adapters.PasswordItemRecyclerAdapter
-import com.zeapo.pwdstore.utils.PasswordItem
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.util.viewmodel.ListMode
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.viewmodel.SearchableRepositoryViewModel
+import dev.msfjarvis.aps.databinding.PasswordRecyclerViewBinding
+import dev.msfjarvis.aps.ui.adapters.PasswordItemRecyclerAdapter
+import dev.msfjarvis.aps.data.password.PasswordItem
+import dev.msfjarvis.aps.ui.passwords.PasswordStore
+import dev.msfjarvis.aps.util.extensions.viewBinding
 import java.io.File
 import me.zhanghai.android.fastscroll.FastScrollerBuilder
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt
similarity index 87%
rename from app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt
index b47647c1..89455c90 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git
+package dev.msfjarvis.aps.ui.git.base
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.edit
@@ -12,18 +12,19 @@ import com.github.michaelbull.result.Result
 import com.github.michaelbull.result.andThen
 import com.github.michaelbull.result.mapError
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.git.config.GitSettings
-import com.zeapo.pwdstore.git.operation.BreakOutOfDetached
-import com.zeapo.pwdstore.git.operation.CloneOperation
-import com.zeapo.pwdstore.git.operation.PullOperation
-import com.zeapo.pwdstore.git.operation.PushOperation
-import com.zeapo.pwdstore.git.operation.ResetToRemoteOperation
-import com.zeapo.pwdstore.git.operation.SyncOperation
-import com.zeapo.pwdstore.git.sshj.ContinuationContainerActivity
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.getEncryptedGitPrefs
-import com.zeapo.pwdstore.utils.sharedPrefs
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.settings.GitSettings
+import dev.msfjarvis.aps.util.git.operation.BreakOutOfDetached
+import dev.msfjarvis.aps.util.git.operation.CloneOperation
+import dev.msfjarvis.aps.util.git.operation.PullOperation
+import dev.msfjarvis.aps.util.git.operation.PushOperation
+import dev.msfjarvis.aps.util.git.operation.ResetToRemoteOperation
+import dev.msfjarvis.aps.util.git.operation.SyncOperation
+import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.getEncryptedGitPrefs
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
+import dev.msfjarvis.aps.util.git.ErrorMessages
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import net.schmizz.sshj.common.DisconnectReason
@@ -40,6 +41,7 @@ abstract class BaseGitActivity : ContinuationContainerActivity() {
      * Enum of possible Git operations than can be run through [launchGitOperation].
      */
     enum class GitOp {
+
         BREAK_OUT_OF_DETACHED,
         CLONE,
         PULL,
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt
similarity index 74%
rename from app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt
index 8c6c7d59..4067fda9 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git
+package dev.msfjarvis.aps.ui.git.config
 
 import android.content.Intent
 import android.os.Bundle
@@ -19,12 +19,13 @@ import com.github.michaelbull.result.onFailure
 import com.github.michaelbull.result.runCatching
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.databinding.ActivityGitConfigBinding
-import com.zeapo.pwdstore.git.config.GitSettings
-import com.zeapo.pwdstore.git.log.GitLogActivity
-import com.zeapo.pwdstore.utils.PasswordRepository
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.databinding.ActivityGitConfigBinding
+import dev.msfjarvis.aps.util.settings.GitSettings
+import dev.msfjarvis.aps.ui.git.log.GitLogActivity
+import dev.msfjarvis.aps.data.repo.PasswordRepository
+import dev.msfjarvis.aps.ui.git.base.BaseGitActivity
+import dev.msfjarvis.aps.util.extensions.viewBinding
 import kotlinx.coroutines.launch
 import org.eclipse.jgit.lib.Constants
 import org.eclipse.jgit.lib.Repository
@@ -93,36 +94,36 @@ class GitConfigActivity : BaseGitActivity() {
         binding.gitAbortRebase.setOnClickListener {
             lifecycleScope.launch {
                 launchGitOperation(GitOp.BREAK_OUT_OF_DETACHED).fold(
-                  success = {
-                      MaterialAlertDialogBuilder(this@GitConfigActivity).run {
-                          setTitle(resources.getString(R.string.git_abort_and_push_title))
-                          setMessage(resources.getString(
-                            R.string.git_break_out_of_detached_success,
-                            GitSettings.branch,
-                            "conflicting-${GitSettings.branch}-...",
-                          ))
-                          setOnDismissListener() { finish() }
-                          setPositiveButton(resources.getString(R.string.dialog_ok)) { _, _ -> }
-                          show()
-                      }
-                  },
-                  failure = { err ->
-                      promptOnErrorHandler(err) {
-                          finish()
-                      }
-                  },
+                    success = {
+                        MaterialAlertDialogBuilder(this@GitConfigActivity).run {
+                            setTitle(resources.getString(R.string.git_abort_and_push_title))
+                            setMessage(resources.getString(
+                                R.string.git_break_out_of_detached_success,
+                                GitSettings.branch,
+                                "conflicting-${GitSettings.branch}-...",
+                            ))
+                            setOnDismissListener { finish() }
+                            setPositiveButton(resources.getString(R.string.dialog_ok)) { _, _ -> }
+                            show()
+                        }
+                    },
+                    failure = { err ->
+                        promptOnErrorHandler(err) {
+                            finish()
+                        }
+                    },
                 )
             }
         }
         binding.gitResetToRemote.setOnClickListener {
             lifecycleScope.launch {
                 launchGitOperation(GitOp.RESET).fold(
-                  success = ::finishOnSuccessHandler,
-                  failure = { err ->
-                      promptOnErrorHandler(err) {
-                          finish()
-                      }
-                  },
+                    success = ::finishOnSuccessHandler,
+                    failure = { err ->
+                        promptOnErrorHandler(err) {
+                            finish()
+                        }
+                    },
                 )
             }
         }
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt
similarity index 95%
rename from app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt
index af6540a4..a0750eeb 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git
+package dev.msfjarvis.aps.ui.git.config
 
 import android.content.Context
 import android.content.Intent
@@ -21,15 +21,16 @@ import com.github.michaelbull.result.onFailure
 import com.github.michaelbull.result.runCatching
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.databinding.ActivityGitCloneBinding
-import com.zeapo.pwdstore.git.config.AuthMode
-import com.zeapo.pwdstore.git.config.GitSettings
-import com.zeapo.pwdstore.git.config.Protocol
-import com.zeapo.pwdstore.ui.dialogs.BasicBottomSheet
-import com.zeapo.pwdstore.utils.PasswordRepository
-import com.zeapo.pwdstore.utils.snackbar
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.databinding.ActivityGitCloneBinding
+import dev.msfjarvis.aps.util.settings.AuthMode
+import dev.msfjarvis.aps.util.settings.GitSettings
+import dev.msfjarvis.aps.util.settings.Protocol
+import dev.msfjarvis.aps.ui.dialogs.BasicBottomSheet
+import dev.msfjarvis.aps.data.repo.PasswordRepository
+import dev.msfjarvis.aps.ui.git.base.BaseGitActivity
+import dev.msfjarvis.aps.util.extensions.snackbar
+import dev.msfjarvis.aps.util.extensions.viewBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -254,6 +255,7 @@ class GitServerConfigActivity : BaseGitActivity() {
     }
 
     companion object {
+
         private val PORT_REGEX = ":[0-9]{1,5}/".toRegex()
 
         fun createCloneIntent(context: Context): Intent {
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/log/GitLogActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogActivity.kt
similarity index 86%
rename from app/src/main/java/com/zeapo/pwdstore/git/log/GitLogActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogActivity.kt
index 1e616bae..b02733fd 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/log/GitLogActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogActivity.kt
@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.git.log
+package dev.msfjarvis.aps.ui.git.log
 
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.zeapo.pwdstore.databinding.ActivityGitLogBinding
-import com.zeapo.pwdstore.git.BaseGitActivity
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.databinding.ActivityGitLogBinding
+import dev.msfjarvis.aps.ui.git.base.BaseGitActivity
+import dev.msfjarvis.aps.util.extensions.viewBinding
 
 /**
  * Displays the repository's git commits in git-log fashion.
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/log/GitLogAdapter.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt
similarity index 89%
rename from app/src/main/java/com/zeapo/pwdstore/git/log/GitLogAdapter.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt
index a15e7f7e..bccbe3b4 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/log/GitLogAdapter.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt
@@ -3,13 +3,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.git.log
+package dev.msfjarvis.aps.ui.git.log
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.github.ajalt.timberkt.e
-import com.zeapo.pwdstore.databinding.GitLogRowLayoutBinding
+import dev.msfjarvis.aps.databinding.GitLogRowLayoutBinding
+import dev.msfjarvis.aps.util.git.GitCommit
+import dev.msfjarvis.aps.util.git.GitLogModel
 import java.text.DateFormat
 import java.util.Date
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/LaunchActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt
similarity index 87%
rename from app/src/main/java/com/zeapo/pwdstore/LaunchActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt
index 3ad6346d..a7eee919 100644
--- a/app/src/main/java/com/zeapo/pwdstore/LaunchActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore
+package dev.msfjarvis.aps.ui.main
 
 import android.content.Intent
 import android.os.Bundle
@@ -10,10 +10,11 @@ import android.os.Handler
 import android.os.Looper
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.edit
-import com.zeapo.pwdstore.crypto.DecryptActivity
-import com.zeapo.pwdstore.utils.BiometricAuthenticator
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.sharedPrefs
+import dev.msfjarvis.aps.ui.crypto.DecryptActivity
+import dev.msfjarvis.aps.ui.passwords.PasswordStore
+import dev.msfjarvis.aps.util.auth.BiometricAuthenticator
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
 
 class LaunchActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/activity/OnboardingActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/activity/OnboardingActivity.kt
similarity index 88%
rename from app/src/main/java/com/zeapo/pwdstore/ui/onboarding/activity/OnboardingActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/onboarding/activity/OnboardingActivity.kt
index b81efb4c..b0443447 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/activity/OnboardingActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/activity/OnboardingActivity.kt
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.ui.onboarding.activity
+package dev.msfjarvis.aps.ui.onboarding.activity
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.zeapo.pwdstore.R
+import dev.msfjarvis.aps.R
 
 class OnboardingActivity : AppCompatActivity(R.layout.activity_onboarding) {
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/CloneFragment.kt b/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/CloneFragment.kt
similarity index 77%
rename from app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/CloneFragment.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/CloneFragment.kt
index acd0151c..aed0b7a3 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/CloneFragment.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/CloneFragment.kt
@@ -4,7 +4,7 @@
  *
  */
 
-package com.zeapo.pwdstore.ui.onboarding.fragments
+package dev.msfjarvis.aps.ui.onboarding.fragments
 
 import android.os.Bundle
 import android.view.View
@@ -12,14 +12,14 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.edit
 import androidx.fragment.app.Fragment
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.databinding.FragmentCloneBinding
-import com.zeapo.pwdstore.git.GitServerConfigActivity
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.finish
-import com.zeapo.pwdstore.utils.performTransactionWithBackStack
-import com.zeapo.pwdstore.utils.sharedPrefs
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.databinding.FragmentCloneBinding
+import dev.msfjarvis.aps.ui.git.config.GitServerConfigActivity
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.finish
+import dev.msfjarvis.aps.util.extensions.performTransactionWithBackStack
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
+import dev.msfjarvis.aps.util.extensions.viewBinding
 
 class CloneFragment : Fragment(R.layout.fragment_clone) {
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/KeySelectionFragment.kt b/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/KeySelectionFragment.kt
similarity index 81%
rename from app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/KeySelectionFragment.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/KeySelectionFragment.kt
index 3dc03954..5df830b1 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/KeySelectionFragment.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/KeySelectionFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.ui.onboarding.fragments
+package dev.msfjarvis.aps.ui.onboarding.fragments
 
 import android.content.Intent
 import android.os.Bundle
@@ -13,15 +13,15 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.edit
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.crypto.GetKeyIdsActivity
-import com.zeapo.pwdstore.databinding.FragmentKeySelectionBinding
-import com.zeapo.pwdstore.utils.PasswordRepository
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.commitChange
-import com.zeapo.pwdstore.utils.finish
-import com.zeapo.pwdstore.utils.sharedPrefs
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.ui.crypto.GetKeyIdsActivity
+import dev.msfjarvis.aps.databinding.FragmentKeySelectionBinding
+import dev.msfjarvis.aps.data.repo.PasswordRepository
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.commitChange
+import dev.msfjarvis.aps.util.extensions.finish
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
+import dev.msfjarvis.aps.util.extensions.viewBinding
 import java.io.File
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/RepoLocationFragment.kt b/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/RepoLocationFragment.kt
similarity index 90%
rename from app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/RepoLocationFragment.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/RepoLocationFragment.kt
index bea0ce3e..08090d1b 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/RepoLocationFragment.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/RepoLocationFragment.kt
@@ -4,7 +4,7 @@
  *
  */
 
-package com.zeapo.pwdstore.ui.onboarding.fragments
+package dev.msfjarvis.aps.ui.onboarding.fragments
 
 import android.Manifest
 import android.os.Bundle
@@ -18,19 +18,19 @@ import com.github.ajalt.timberkt.e
 import com.github.michaelbull.result.onFailure
 import com.github.michaelbull.result.runCatching
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.UserPreference
-import com.zeapo.pwdstore.databinding.FragmentRepoLocationBinding
-import com.zeapo.pwdstore.utils.PasswordRepository
-import com.zeapo.pwdstore.utils.PasswordSortOrder
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.finish
-import com.zeapo.pwdstore.utils.getString
-import com.zeapo.pwdstore.utils.isPermissionGranted
-import com.zeapo.pwdstore.utils.listFilesRecursively
-import com.zeapo.pwdstore.utils.performTransactionWithBackStack
-import com.zeapo.pwdstore.utils.sharedPrefs
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.ui.settings.UserPreference
+import dev.msfjarvis.aps.databinding.FragmentRepoLocationBinding
+import dev.msfjarvis.aps.data.repo.PasswordRepository
+import dev.msfjarvis.aps.util.settings.PasswordSortOrder
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.finish
+import dev.msfjarvis.aps.util.extensions.getString
+import dev.msfjarvis.aps.util.extensions.isPermissionGranted
+import dev.msfjarvis.aps.util.extensions.listFilesRecursively
+import dev.msfjarvis.aps.util.extensions.performTransactionWithBackStack
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
+import dev.msfjarvis.aps.util.extensions.viewBinding
 import java.io.File
 
 class RepoLocationFragment : Fragment(R.layout.fragment_repo_location) {
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/WelcomeFragment.kt b/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/WelcomeFragment.kt
similarity index 72%
rename from app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/WelcomeFragment.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/WelcomeFragment.kt
index 2ebab29f..696aba17 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/WelcomeFragment.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/WelcomeFragment.kt
@@ -3,18 +3,18 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.ui.onboarding.fragments
+package dev.msfjarvis.aps.ui.onboarding.fragments
 
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.Keep
 import androidx.fragment.app.Fragment
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.UserPreference
-import com.zeapo.pwdstore.databinding.FragmentWelcomeBinding
-import com.zeapo.pwdstore.utils.performTransactionWithBackStack
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.ui.settings.UserPreference
+import dev.msfjarvis.aps.databinding.FragmentWelcomeBinding
+import dev.msfjarvis.aps.util.extensions.performTransactionWithBackStack
+import dev.msfjarvis.aps.util.extensions.viewBinding
 
 @Keep
 @Suppress("unused")
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt b/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordFragment.kt
similarity index 92%
rename from app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordFragment.kt
index ffbe5bc8..9d880de8 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordFragment.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore
+package dev.msfjarvis.aps.ui.passwords
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -24,23 +24,25 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.github.michaelbull.result.fold
 import com.github.michaelbull.result.runCatching
 import com.github.michaelbull.result.onFailure
-import com.zeapo.pwdstore.databinding.PasswordRecyclerViewBinding
-import com.zeapo.pwdstore.git.BaseGitActivity
-import com.zeapo.pwdstore.git.GitServerConfigActivity
-import com.zeapo.pwdstore.git.config.AuthMode
-import com.zeapo.pwdstore.git.config.GitSettings
-import com.zeapo.pwdstore.ui.OnOffItemAnimator
-import com.zeapo.pwdstore.ui.adapters.PasswordItemRecyclerAdapter
-import com.zeapo.pwdstore.ui.dialogs.BasicBottomSheet
-import com.zeapo.pwdstore.ui.dialogs.ItemCreationBottomSheet
-import com.zeapo.pwdstore.utils.PasswordItem
-import com.zeapo.pwdstore.utils.PasswordRepository
-import com.zeapo.pwdstore.utils.PasswordSortOrder
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.base64
-import com.zeapo.pwdstore.utils.getString
-import com.zeapo.pwdstore.utils.sharedPrefs
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.viewmodel.SearchableRepositoryViewModel
+import dev.msfjarvis.aps.databinding.PasswordRecyclerViewBinding
+import dev.msfjarvis.aps.ui.git.base.BaseGitActivity
+import dev.msfjarvis.aps.ui.git.config.GitServerConfigActivity
+import dev.msfjarvis.aps.util.settings.AuthMode
+import dev.msfjarvis.aps.util.settings.GitSettings
+import dev.msfjarvis.aps.ui.util.OnOffItemAnimator
+import dev.msfjarvis.aps.ui.adapters.PasswordItemRecyclerAdapter
+import dev.msfjarvis.aps.ui.dialogs.BasicBottomSheet
+import dev.msfjarvis.aps.ui.dialogs.ItemCreationBottomSheet
+import dev.msfjarvis.aps.data.password.PasswordItem
+import dev.msfjarvis.aps.data.repo.PasswordRepository
+import dev.msfjarvis.aps.util.settings.PasswordSortOrder
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.base64
+import dev.msfjarvis.aps.util.extensions.getString
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
+import dev.msfjarvis.aps.util.extensions.viewBinding
 import java.io.File
 import kotlinx.coroutines.launch
 import me.zhanghai.android.fastscroll.FastScrollerBuilder
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.kt b/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt
similarity index 94%
rename from app/src/main/java/com/zeapo/pwdstore/PasswordStore.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt
index b0f8602c..c7ed5ee9 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore
+package dev.msfjarvis.aps.ui.passwords
 
 import android.Manifest
 import android.annotation.SuppressLint
@@ -38,28 +38,33 @@ import com.github.michaelbull.result.onFailure
 import com.github.michaelbull.result.runCatching
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputEditText
-import com.zeapo.pwdstore.autofill.oreo.AutofillMatcher
-import com.zeapo.pwdstore.crypto.BasePgpActivity.Companion.getLongName
-import com.zeapo.pwdstore.crypto.DecryptActivity
-import com.zeapo.pwdstore.crypto.PasswordCreationActivity
-import com.zeapo.pwdstore.git.BaseGitActivity
-import com.zeapo.pwdstore.git.config.AuthMode
-import com.zeapo.pwdstore.git.config.GitSettings
-import com.zeapo.pwdstore.ui.dialogs.BasicBottomSheet
-import com.zeapo.pwdstore.ui.dialogs.FolderCreationDialogFragment
-import com.zeapo.pwdstore.ui.onboarding.activity.OnboardingActivity
-import com.zeapo.pwdstore.utils.PasswordItem
-import com.zeapo.pwdstore.utils.PasswordRepository
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.base64
-import com.zeapo.pwdstore.utils.commitChange
-import com.zeapo.pwdstore.utils.contains
-import com.zeapo.pwdstore.utils.getString
-import com.zeapo.pwdstore.utils.isInsideRepository
-import com.zeapo.pwdstore.utils.isPermissionGranted
-import com.zeapo.pwdstore.utils.listFilesRecursively
-import com.zeapo.pwdstore.utils.requestInputFocusOnView
-import com.zeapo.pwdstore.utils.sharedPrefs
+import dev.msfjarvis.aps.ui.main.LaunchActivity
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.viewmodel.SearchableRepositoryViewModel
+import dev.msfjarvis.aps.ui.folderselect.SelectFolderActivity
+import dev.msfjarvis.aps.ui.settings.UserPreference
+import dev.msfjarvis.aps.util.autofill.AutofillMatcher
+import dev.msfjarvis.aps.ui.crypto.BasePgpActivity.Companion.getLongName
+import dev.msfjarvis.aps.ui.crypto.DecryptActivity
+import dev.msfjarvis.aps.ui.crypto.PasswordCreationActivity
+import dev.msfjarvis.aps.ui.git.base.BaseGitActivity
+import dev.msfjarvis.aps.util.settings.AuthMode
+import dev.msfjarvis.aps.util.settings.GitSettings
+import dev.msfjarvis.aps.ui.dialogs.BasicBottomSheet
+import dev.msfjarvis.aps.ui.dialogs.FolderCreationDialogFragment
+import dev.msfjarvis.aps.ui.onboarding.activity.OnboardingActivity
+import dev.msfjarvis.aps.data.password.PasswordItem
+import dev.msfjarvis.aps.data.repo.PasswordRepository
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.base64
+import dev.msfjarvis.aps.util.extensions.commitChange
+import dev.msfjarvis.aps.util.extensions.contains
+import dev.msfjarvis.aps.util.extensions.getString
+import dev.msfjarvis.aps.util.extensions.isInsideRepository
+import dev.msfjarvis.aps.util.extensions.isPermissionGranted
+import dev.msfjarvis.aps.util.extensions.listFilesRecursively
+import dev.msfjarvis.aps.util.extensions.requestInputFocusOnView
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
 import java.io.File
 import java.lang.Character.UnicodeBlock
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/proxy/ProxySelectorActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/proxy/ProxySelectorActivity.kt
similarity index 84%
rename from app/src/main/java/com/zeapo/pwdstore/ui/proxy/ProxySelectorActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/proxy/ProxySelectorActivity.kt
index 29c4d53a..7154f217 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/proxy/ProxySelectorActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/proxy/ProxySelectorActivity.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.ui.proxy
+package dev.msfjarvis.aps.ui.proxy
 
 import android.os.Bundle
 import android.os.Handler
@@ -13,14 +13,14 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.edit
 import androidx.core.os.postDelayed
 import androidx.core.widget.doOnTextChanged
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.databinding.ActivityProxySelectorBinding
-import com.zeapo.pwdstore.git.config.GitSettings
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.ProxyUtils
-import com.zeapo.pwdstore.utils.getEncryptedProxyPrefs
-import com.zeapo.pwdstore.utils.getString
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.databinding.ActivityProxySelectorBinding
+import dev.msfjarvis.aps.util.settings.GitSettings
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.proxy.ProxyUtils
+import dev.msfjarvis.aps.util.extensions.getEncryptedProxyPrefs
+import dev.msfjarvis.aps.util.extensions.getString
+import dev.msfjarvis.aps.util.extensions.viewBinding
 
 private val IP_ADDRESS_REGEX = Patterns.IP_ADDRESS.toRegex()
 private val WEB_ADDRESS_REGEX = Patterns.WEB_URL.toRegex()
diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/UserPreference.kt
similarity index 96%
rename from app/src/main/java/com/zeapo/pwdstore/UserPreference.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/settings/UserPreference.kt
index 66873426..df51562f 100644
--- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/settings/UserPreference.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore
+package dev.msfjarvis.aps.ui.settings
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -41,21 +41,24 @@ import com.github.michaelbull.result.getOr
 import com.github.michaelbull.result.onFailure
 import com.github.michaelbull.result.runCatching
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.zeapo.pwdstore.crypto.BasePgpActivity
-import com.zeapo.pwdstore.git.GitConfigActivity
-import com.zeapo.pwdstore.git.GitServerConfigActivity
-import com.zeapo.pwdstore.git.sshj.SshKey
-import com.zeapo.pwdstore.pwgenxkpwd.XkpwdDictionary
-import com.zeapo.pwdstore.sshkeygen.ShowSshKeyFragment
-import com.zeapo.pwdstore.sshkeygen.SshKeyGenActivity
-import com.zeapo.pwdstore.ui.proxy.ProxySelectorActivity
-import com.zeapo.pwdstore.utils.BiometricAuthenticator
-import com.zeapo.pwdstore.utils.PasswordRepository
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.autofillManager
-import com.zeapo.pwdstore.utils.getEncryptedGitPrefs
-import com.zeapo.pwdstore.utils.getString
-import com.zeapo.pwdstore.utils.sharedPrefs
+import dev.msfjarvis.aps.BuildConfig
+import dev.msfjarvis.aps.util.services.PasswordExportService
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.ui.crypto.BasePgpActivity
+import dev.msfjarvis.aps.ui.git.config.GitConfigActivity
+import dev.msfjarvis.aps.ui.git.config.GitServerConfigActivity
+import dev.msfjarvis.aps.util.git.sshj.SshKey
+import dev.msfjarvis.aps.util.pwgenxkpwd.XkpwdDictionary
+import dev.msfjarvis.aps.ui.sshkeygen.ShowSshKeyFragment
+import dev.msfjarvis.aps.ui.sshkeygen.SshKeyGenActivity
+import dev.msfjarvis.aps.ui.proxy.ProxySelectorActivity
+import dev.msfjarvis.aps.util.auth.BiometricAuthenticator
+import dev.msfjarvis.aps.data.repo.PasswordRepository
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.autofillManager
+import dev.msfjarvis.aps.util.extensions.getEncryptedGitPrefs
+import dev.msfjarvis.aps.util.extensions.getString
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
 import java.io.File
 
 typealias ClickListener = Preference.OnPreferenceClickListener
diff --git a/app/src/main/java/com/zeapo/pwdstore/sshkeygen/ShowSshKeyFragment.kt b/app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/ShowSshKeyFragment.kt
similarity index 92%
rename from app/src/main/java/com/zeapo/pwdstore/sshkeygen/ShowSshKeyFragment.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/ShowSshKeyFragment.kt
index bfa7e1c8..0486b452 100644
--- a/app/src/main/java/com/zeapo/pwdstore/sshkeygen/ShowSshKeyFragment.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/ShowSshKeyFragment.kt
@@ -2,15 +2,15 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.sshkeygen
+package dev.msfjarvis.aps.ui.sshkeygen
 
 import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.git.sshj.SshKey
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.git.sshj.SshKey
 
 class ShowSshKeyFragment : DialogFragment() {
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/sshkeygen/SshKeyGenActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyGenActivity.kt
similarity index 94%
rename from app/src/main/java/com/zeapo/pwdstore/sshkeygen/SshKeyGenActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyGenActivity.kt
index d2fdab61..39819988 100644
--- a/app/src/main/java/com/zeapo/pwdstore/sshkeygen/SshKeyGenActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyGenActivity.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.sshkeygen
+package dev.msfjarvis.aps.ui.sshkeygen
 
 import android.os.Bundle
 import android.security.keystore.UserNotAuthenticatedException
@@ -16,13 +16,13 @@ import androidx.lifecycle.lifecycleScope
 import com.github.michaelbull.result.fold
 import com.github.michaelbull.result.runCatching
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.databinding.ActivitySshKeygenBinding
-import com.zeapo.pwdstore.git.sshj.SshKey
-import com.zeapo.pwdstore.utils.BiometricAuthenticator
-import com.zeapo.pwdstore.utils.getEncryptedGitPrefs
-import com.zeapo.pwdstore.utils.keyguardManager
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.databinding.ActivitySshKeygenBinding
+import dev.msfjarvis.aps.util.git.sshj.SshKey
+import dev.msfjarvis.aps.util.auth.BiometricAuthenticator
+import dev.msfjarvis.aps.util.extensions.getEncryptedGitPrefs
+import dev.msfjarvis.aps.util.extensions.keyguardManager
+import dev.msfjarvis.aps.util.extensions.viewBinding
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/OnOffItemAnimator.kt b/app/src/main/java/dev/msfjarvis/aps/ui/util/OnOffItemAnimator.kt
similarity index 98%
rename from app/src/main/java/com/zeapo/pwdstore/ui/OnOffItemAnimator.kt
rename to app/src/main/java/dev/msfjarvis/aps/ui/util/OnOffItemAnimator.kt
index e394e656..356a914c 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/OnOffItemAnimator.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/util/OnOffItemAnimator.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.ui
+package dev.msfjarvis.aps.ui.util
 
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/BiometricAuthenticator.kt b/app/src/main/java/dev/msfjarvis/aps/util/auth/BiometricAuthenticator.kt
similarity index 98%
rename from app/src/main/java/com/zeapo/pwdstore/utils/BiometricAuthenticator.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/auth/BiometricAuthenticator.kt
index 12ba84f1..4b987ebe 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/BiometricAuthenticator.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/auth/BiometricAuthenticator.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.utils
+package dev.msfjarvis.aps.util.auth
 
 import android.app.KeyguardManager
 import androidx.annotation.StringRes
@@ -14,7 +14,7 @@ import androidx.core.content.getSystemService
 import androidx.fragment.app.FragmentActivity
 import com.github.ajalt.timberkt.Timber.tag
 import com.github.ajalt.timberkt.d
-import com.zeapo.pwdstore.R
+import dev.msfjarvis.aps.R
 
 object BiometricAuthenticator {
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/Api30AutofillResponseBuilder.kt b/app/src/main/java/dev/msfjarvis/aps/util/autofill/Api30AutofillResponseBuilder.kt
similarity index 95%
rename from app/src/main/java/com/zeapo/pwdstore/autofill/oreo/Api30AutofillResponseBuilder.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/autofill/Api30AutofillResponseBuilder.kt
index a69e51a7..2b0d56a3 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/Api30AutofillResponseBuilder.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/autofill/Api30AutofillResponseBuilder.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.autofill.oreo
+package dev.msfjarvis.aps.util.autofill
 
 import android.content.Context
 import android.content.IntentSender
@@ -20,11 +20,11 @@ import com.github.androidpasswordstore.autofillparser.AutofillAction
 import com.github.androidpasswordstore.autofillparser.FillableForm
 import com.github.androidpasswordstore.autofillparser.fillWith
 import com.github.michaelbull.result.fold
-import com.zeapo.pwdstore.autofill.oreo.ui.AutofillDecryptActivity
-import com.zeapo.pwdstore.autofill.oreo.ui.AutofillFilterView
-import com.zeapo.pwdstore.autofill.oreo.ui.AutofillPublisherChangedActivity
-import com.zeapo.pwdstore.autofill.oreo.ui.AutofillSaveActivity
-import com.zeapo.pwdstore.autofill.oreo.ui.AutofillSmsActivity
+import dev.msfjarvis.aps.ui.autofill.AutofillDecryptActivity
+import dev.msfjarvis.aps.ui.autofill.AutofillFilterView
+import dev.msfjarvis.aps.ui.autofill.AutofillPublisherChangedActivity
+import dev.msfjarvis.aps.ui.autofill.AutofillSaveActivity
+import dev.msfjarvis.aps.autofill.oreo.ui.AutofillSmsActivity
 import java.io.File
 
 /**
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillMatcher.kt b/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillMatcher.kt
similarity index 99%
rename from app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillMatcher.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillMatcher.kt
index 601be34a..52f74087 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillMatcher.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillMatcher.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.autofill.oreo
+package dev.msfjarvis.aps.util.autofill
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -16,7 +16,7 @@ import com.github.michaelbull.result.Ok
 import com.github.michaelbull.result.Result
 import com.github.androidpasswordstore.autofillparser.FormOrigin
 import com.github.androidpasswordstore.autofillparser.computeCertificatesHash
-import com.zeapo.pwdstore.R
+import dev.msfjarvis.aps.R
 import java.io.File
 
 private const val PREFERENCES_AUTOFILL_APP_MATCHES = "oreo_autofill_app_matches"
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillPreferences.kt b/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillPreferences.kt
similarity index 96%
rename from app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillPreferences.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillPreferences.kt
index cc0875f3..aa70bacb 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillPreferences.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillPreferences.kt
@@ -2,14 +2,15 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.autofill.oreo
+package dev.msfjarvis.aps.util.autofill
 
 import android.content.Context
 import android.os.Build
 import androidx.annotation.RequiresApi
 import com.github.androidpasswordstore.autofillparser.Credentials
-import com.zeapo.pwdstore.model.PasswordEntry
-import com.zeapo.pwdstore.utils.sharedPrefs
+import dev.msfjarvis.aps.data.password.PasswordEntry
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
+import dev.msfjarvis.aps.util.services.getDefaultUsername
 import java.io.File
 import java.nio.file.Paths
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillResponseBuilder.kt b/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillResponseBuilder.kt
similarity index 95%
rename from app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillResponseBuilder.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillResponseBuilder.kt
index d73373e3..eecfc81b 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillResponseBuilder.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillResponseBuilder.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.autofill.oreo
+package dev.msfjarvis.aps.util.autofill
 
 import android.content.Context
 import android.content.IntentSender
@@ -20,15 +20,16 @@ import com.github.androidpasswordstore.autofillparser.Credentials
 import com.github.androidpasswordstore.autofillparser.FillableForm
 import com.github.androidpasswordstore.autofillparser.fillWith
 import com.github.michaelbull.result.fold
-import com.zeapo.pwdstore.autofill.oreo.ui.AutofillDecryptActivity
-import com.zeapo.pwdstore.autofill.oreo.ui.AutofillFilterView
-import com.zeapo.pwdstore.autofill.oreo.ui.AutofillPublisherChangedActivity
-import com.zeapo.pwdstore.autofill.oreo.ui.AutofillSaveActivity
-import com.zeapo.pwdstore.autofill.oreo.ui.AutofillSmsActivity
+import dev.msfjarvis.aps.ui.autofill.AutofillDecryptActivity
+import dev.msfjarvis.aps.ui.autofill.AutofillFilterView
+import dev.msfjarvis.aps.ui.autofill.AutofillPublisherChangedActivity
+import dev.msfjarvis.aps.ui.autofill.AutofillSaveActivity
+import dev.msfjarvis.aps.autofill.oreo.ui.AutofillSmsActivity
 import java.io.File
 
 @RequiresApi(Build.VERSION_CODES.O)
 class AutofillResponseBuilder(form: FillableForm) {
+
     private val formOrigin = form.formOrigin
     private val scenario = form.scenario
     private val ignoredIds = form.ignoredIds
@@ -175,6 +176,7 @@ class AutofillResponseBuilder(form: FillableForm) {
     }
 
     companion object {
+
         fun makeFillInDataset(
             context: Context,
             credentials: Credentials,
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillViewUtils.kt b/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillViewUtils.kt
similarity index 95%
rename from app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillViewUtils.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillViewUtils.kt
index 49e0d3e3..6055c837 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillViewUtils.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillViewUtils.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.autofill.oreo
+package dev.msfjarvis.aps.util.autofill
 
 import android.annotation.SuppressLint
 import android.app.PendingIntent
@@ -18,9 +18,9 @@ import android.widget.inline.InlinePresentationSpec
 import androidx.annotation.DrawableRes
 import androidx.autofill.inline.UiVersions
 import androidx.autofill.inline.v1.InlineSuggestionUi
-import com.zeapo.pwdstore.PasswordStore
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.utils.PasswordRepository
+import dev.msfjarvis.aps.ui.passwords.PasswordStore
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.data.repo.PasswordRepository
 import java.io.File
 
 data class DatasetMetadata(val title: String, val subtitle: String?, @DrawableRes val iconRes: Int)
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/AndroidExtensions.kt b/app/src/main/java/dev/msfjarvis/aps/util/extensions/AndroidExtensions.kt
similarity index 96%
rename from app/src/main/java/com/zeapo/pwdstore/utils/AndroidExtensions.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/extensions/AndroidExtensions.kt
index 408e9d5e..308c5966 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/AndroidExtensions.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/extensions/AndroidExtensions.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.utils
+package dev.msfjarvis.aps.util.extensions
 
 import android.app.KeyguardManager
 import android.content.ClipboardManager
@@ -29,8 +29,9 @@ import com.github.ajalt.timberkt.d
 import com.github.michaelbull.result.Ok
 import com.github.michaelbull.result.Result
 import com.google.android.material.snackbar.Snackbar
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.git.operation.GitOperation
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.data.repo.PasswordRepository
+import dev.msfjarvis.aps.util.git.operation.GitOperation
 
 /**
  * Extension function for [AlertDialog] that requests focus for the
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/Extensions.kt b/app/src/main/java/dev/msfjarvis/aps/util/extensions/Extensions.kt
similarity index 96%
rename from app/src/main/java/com/zeapo/pwdstore/utils/Extensions.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/extensions/Extensions.kt
index 7a439e94..dbfc0f63 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/Extensions.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/extensions/Extensions.kt
@@ -2,10 +2,11 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.utils
+package dev.msfjarvis.aps.util.extensions
 
 import com.github.michaelbull.result.getOrElse
 import com.github.michaelbull.result.runCatching
+import dev.msfjarvis.aps.data.repo.PasswordRepository
 import java.io.File
 import java.util.Date
 import org.eclipse.jgit.lib.ObjectId
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/FragmentExtensions.kt b/app/src/main/java/dev/msfjarvis/aps/util/extensions/FragmentExtensions.kt
similarity index 94%
rename from app/src/main/java/com/zeapo/pwdstore/utils/FragmentExtensions.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/extensions/FragmentExtensions.kt
index 251f5259..642e0f22 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/FragmentExtensions.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/extensions/FragmentExtensions.kt
@@ -1,10 +1,10 @@
-package com.zeapo.pwdstore.utils
+package dev.msfjarvis.aps.util.extensions
 
 import androidx.annotation.IdRes
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.commit
-import com.zeapo.pwdstore.R
+import dev.msfjarvis.aps.R
 
 /**
  * Check if [permission] is granted to the app. Aliases to [isPermissionGranted] internally.
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/FragmentViewBindingDelegate.kt b/app/src/main/java/dev/msfjarvis/aps/util/extensions/FragmentViewBindingDelegate.kt
similarity index 98%
rename from app/src/main/java/com/zeapo/pwdstore/utils/FragmentViewBindingDelegate.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/extensions/FragmentViewBindingDelegate.kt
index 55d654e0..03342d31 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/FragmentViewBindingDelegate.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/extensions/FragmentViewBindingDelegate.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.utils
+package dev.msfjarvis.aps.util.extensions
 
 
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/ErrorMessages.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/ErrorMessages.kt
similarity index 95%
rename from app/src/main/java/com/zeapo/pwdstore/git/ErrorMessages.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/ErrorMessages.kt
index 89676c7a..44eb11e1 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/ErrorMessages.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/ErrorMessages.kt
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.git
+package dev.msfjarvis.aps.util.git
 
 import android.os.RemoteException
 import androidx.annotation.StringRes
-import com.zeapo.pwdstore.Application
-import com.zeapo.pwdstore.R
+import dev.msfjarvis.aps.Application
+import dev.msfjarvis.aps.R
 import java.net.UnknownHostException
 
 /**
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitCommandExecutor.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/GitCommandExecutor.kt
similarity index 93%
rename from app/src/main/java/com/zeapo/pwdstore/git/GitCommandExecutor.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/GitCommandExecutor.kt
index a86e8c54..429ea2c5 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitCommandExecutor.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/GitCommandExecutor.kt
@@ -3,19 +3,19 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.git
+package dev.msfjarvis.aps.util.git
 
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
 import com.github.michaelbull.result.Result
 import com.github.michaelbull.result.runCatching
 import com.google.android.material.snackbar.Snackbar
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.git.GitException.PullException
-import com.zeapo.pwdstore.git.GitException.PushException
-import com.zeapo.pwdstore.git.config.GitSettings
-import com.zeapo.pwdstore.git.operation.GitOperation
-import com.zeapo.pwdstore.utils.snackbar
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.git.GitException.PullException
+import dev.msfjarvis.aps.util.git.GitException.PushException
+import dev.msfjarvis.aps.util.settings.GitSettings
+import dev.msfjarvis.aps.util.git.operation.GitOperation
+import dev.msfjarvis.aps.util.extensions.snackbar
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.api.CommitCommand
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/log/GitCommit.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/GitCommit.kt
similarity index 94%
rename from app/src/main/java/com/zeapo/pwdstore/git/log/GitCommit.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/GitCommit.kt
index d2425592..6e8e1c0c 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/log/GitCommit.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/GitCommit.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.git.log
+package dev.msfjarvis.aps.util.git
 
 import java.util.Date
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/log/GitLogModel.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/GitLogModel.kt
similarity index 90%
rename from app/src/main/java/com/zeapo/pwdstore/git/log/GitLogModel.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/GitLogModel.kt
index 15b9f64d..f6bbd55d 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/log/GitLogModel.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/GitLogModel.kt
@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.git.log
+package dev.msfjarvis.aps.util.git
 
 import com.github.ajalt.timberkt.e
 import com.github.michaelbull.result.getOrElse
 import com.github.michaelbull.result.runCatching
-import com.zeapo.pwdstore.utils.PasswordRepository
-import com.zeapo.pwdstore.utils.hash
-import com.zeapo.pwdstore.utils.time
+import dev.msfjarvis.aps.data.repo.PasswordRepository
+import dev.msfjarvis.aps.util.extensions.hash
+import dev.msfjarvis.aps.util.extensions.time
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.revwalk.RevCommit
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/BreakOutOfDetached.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/BreakOutOfDetached.kt
similarity index 90%
rename from app/src/main/java/com/zeapo/pwdstore/git/operation/BreakOutOfDetached.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/operation/BreakOutOfDetached.kt
index f7759ada..1aff34de 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/operation/BreakOutOfDetached.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/BreakOutOfDetached.kt
@@ -2,11 +2,11 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git.operation
+package dev.msfjarvis.aps.util.git.operation
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.git.sshj.ContinuationContainerActivity
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity
 import org.eclipse.jgit.api.RebaseCommand
 
 class BreakOutOfDetached(callingActivity: ContinuationContainerActivity) : GitOperation(callingActivity) {
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/CloneOperation.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/CloneOperation.kt
similarity index 84%
rename from app/src/main/java/com/zeapo/pwdstore/git/operation/CloneOperation.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/operation/CloneOperation.kt
index 2a94a283..e1dd6760 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/operation/CloneOperation.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/CloneOperation.kt
@@ -2,9 +2,9 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git.operation
+package dev.msfjarvis.aps.util.git.operation
 
-import com.zeapo.pwdstore.git.sshj.ContinuationContainerActivity
+import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.api.GitCommand
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/CredentialFinder.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/CredentialFinder.kt
similarity index 91%
rename from app/src/main/java/com/zeapo/pwdstore/git/operation/CredentialFinder.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/operation/CredentialFinder.kt
index c34af18a..173b7a50 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/operation/CredentialFinder.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/CredentialFinder.kt
@@ -1,4 +1,4 @@
-package com.zeapo.pwdstore.git.operation
+package dev.msfjarvis.aps.util.git.operation
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -10,12 +10,12 @@ import com.google.android.material.checkbox.MaterialCheckBox
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.git.config.AuthMode
-import com.zeapo.pwdstore.git.sshj.InteractivePasswordFinder
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.getEncryptedGitPrefs
-import com.zeapo.pwdstore.utils.requestInputFocusOnView
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.settings.AuthMode
+import dev.msfjarvis.aps.util.git.sshj.InteractivePasswordFinder
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.getEncryptedGitPrefs
+import dev.msfjarvis.aps.util.extensions.requestInputFocusOnView
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/GitOperation.kt
similarity index 93%
rename from app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/operation/GitOperation.kt
index 5649e8de..44292fc6 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/GitOperation.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git.operation
+package dev.msfjarvis.aps.util.git.operation
 
 import android.content.Intent
 import android.widget.Toast
@@ -14,17 +14,17 @@ import com.github.michaelbull.result.Result
 import com.github.michaelbull.result.onFailure
 import com.github.michaelbull.result.runCatching
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.UserPreference
-import com.zeapo.pwdstore.git.GitCommandExecutor
-import com.zeapo.pwdstore.git.config.AuthMode
-import com.zeapo.pwdstore.git.config.GitSettings
-import com.zeapo.pwdstore.git.sshj.ContinuationContainerActivity
-import com.zeapo.pwdstore.git.sshj.SshAuthMethod
-import com.zeapo.pwdstore.git.sshj.SshKey
-import com.zeapo.pwdstore.git.sshj.SshjSessionFactory
-import com.zeapo.pwdstore.utils.BiometricAuthenticator
-import com.zeapo.pwdstore.utils.PasswordRepository
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.ui.settings.UserPreference
+import dev.msfjarvis.aps.util.git.GitCommandExecutor
+import dev.msfjarvis.aps.util.settings.AuthMode
+import dev.msfjarvis.aps.util.settings.GitSettings
+import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity
+import dev.msfjarvis.aps.util.git.sshj.SshAuthMethod
+import dev.msfjarvis.aps.util.git.sshj.SshKey
+import dev.msfjarvis.aps.util.git.sshj.SshjSessionFactory
+import dev.msfjarvis.aps.util.auth.BiometricAuthenticator
+import dev.msfjarvis.aps.data.repo.PasswordRepository
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/PullOperation.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/PullOperation.kt
similarity index 92%
rename from app/src/main/java/com/zeapo/pwdstore/git/operation/PullOperation.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/operation/PullOperation.kt
index 4dcc3ec4..7bee775a 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/operation/PullOperation.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/PullOperation.kt
@@ -2,9 +2,9 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git.operation
+package dev.msfjarvis.aps.util.git.operation
 
-import com.zeapo.pwdstore.git.sshj.ContinuationContainerActivity
+import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity
 import org.eclipse.jgit.api.GitCommand
 
 class PullOperation(callingActivity: ContinuationContainerActivity) : GitOperation(callingActivity) {
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/PushOperation.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/PushOperation.kt
similarity index 77%
rename from app/src/main/java/com/zeapo/pwdstore/git/operation/PushOperation.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/operation/PushOperation.kt
index 28d7a6fa..31e5fcb7 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/operation/PushOperation.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/PushOperation.kt
@@ -2,9 +2,9 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git.operation
+package dev.msfjarvis.aps.util.git.operation
 
-import com.zeapo.pwdstore.git.sshj.ContinuationContainerActivity
+import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity
 import org.eclipse.jgit.api.GitCommand
 
 class PushOperation(callingActivity: ContinuationContainerActivity) : GitOperation(callingActivity) {
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/ResetToRemoteOperation.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/ResetToRemoteOperation.kt
similarity index 88%
rename from app/src/main/java/com/zeapo/pwdstore/git/operation/ResetToRemoteOperation.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/operation/ResetToRemoteOperation.kt
index ad0fb823..9c1fb01a 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/operation/ResetToRemoteOperation.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/ResetToRemoteOperation.kt
@@ -2,9 +2,9 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git.operation
+package dev.msfjarvis.aps.util.git.operation
 
-import com.zeapo.pwdstore.git.sshj.ContinuationContainerActivity
+import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity
 import org.eclipse.jgit.api.ResetCommand
 
 class ResetToRemoteOperation(callingActivity: ContinuationContainerActivity) : GitOperation(callingActivity) {
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/SyncOperation.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/SyncOperation.kt
similarity index 86%
rename from app/src/main/java/com/zeapo/pwdstore/git/operation/SyncOperation.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/operation/SyncOperation.kt
index 8c1ec1fa..512d6b48 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/operation/SyncOperation.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/SyncOperation.kt
@@ -2,9 +2,9 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git.operation
+package dev.msfjarvis.aps.util.git.operation
 
-import com.zeapo.pwdstore.git.sshj.ContinuationContainerActivity
+import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity
 
 class SyncOperation(callingActivity: ContinuationContainerActivity) : GitOperation(callingActivity) {
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/sshj/ContinuationContainerActivity.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/ContinuationContainerActivity.kt
similarity index 96%
rename from app/src/main/java/com/zeapo/pwdstore/git/sshj/ContinuationContainerActivity.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/sshj/ContinuationContainerActivity.kt
index 32ee64a8..8bcdad05 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/sshj/ContinuationContainerActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/ContinuationContainerActivity.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git.sshj
+package dev.msfjarvis.aps.util.git.sshj
 
 import android.content.Intent
 import androidx.activity.result.contract.ActivityResultContracts
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/sshj/OpenKeychainKeyProvider.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt
similarity index 97%
rename from app/src/main/java/com/zeapo/pwdstore/git/sshj/OpenKeychainKeyProvider.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt
index 97774d92..3b0b2549 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/sshj/OpenKeychainKeyProvider.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt
@@ -2,16 +2,16 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git.sshj
+package dev.msfjarvis.aps.util.git.sshj
 
 import android.app.PendingIntent
 import android.content.Intent
 import androidx.activity.result.IntentSenderRequest
 import androidx.core.content.edit
 import com.github.ajalt.timberkt.d
-import com.zeapo.pwdstore.utils.OPENPGP_PROVIDER
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.sharedPrefs
+import dev.msfjarvis.aps.util.extensions.OPENPGP_PROVIDER
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
 import java.io.Closeable
 import java.security.PublicKey
 import kotlin.coroutines.resume
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt
similarity index 98%
rename from app/src/main/java/com/zeapo/pwdstore/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt
index 97b587fd..272a04dd 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git.sshj
+package dev.msfjarvis.aps.util.git.sshj
 
 import com.hierynomus.sshj.key.KeyAlgorithm
 import java.io.ByteArrayOutputStream
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/sshj/SshKey.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt
similarity index 97%
rename from app/src/main/java/com/zeapo/pwdstore/git/sshj/SshKey.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt
index 52297133..352465e0 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/sshj/SshKey.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git.sshj
+package dev.msfjarvis.aps.util.git.sshj
 
 import android.content.Context
 import android.content.pm.PackageManager
@@ -20,12 +20,12 @@ import com.github.ajalt.timberkt.d
 import com.github.ajalt.timberkt.e
 import com.github.michaelbull.result.getOrElse
 import com.github.michaelbull.result.runCatching
-import com.zeapo.pwdstore.Application
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.getEncryptedGitPrefs
-import com.zeapo.pwdstore.utils.getString
-import com.zeapo.pwdstore.utils.sharedPrefs
+import dev.msfjarvis.aps.Application
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.getEncryptedGitPrefs
+import dev.msfjarvis.aps.util.extensions.getString
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
 import java.io.File
 import java.io.IOException
 import java.security.KeyFactory
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/sshj/SshjConfig.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjConfig.kt
similarity index 99%
rename from app/src/main/java/com/zeapo/pwdstore/git/sshj/SshjConfig.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjConfig.kt
index cd280db5..8402d232 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/sshj/SshjConfig.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjConfig.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git.sshj
+package dev.msfjarvis.aps.util.git.sshj
 
 import com.github.ajalt.timberkt.Timber
 import com.github.ajalt.timberkt.d
@@ -21,7 +21,6 @@ import net.schmizz.sshj.transport.compression.NoneCompression
 import net.schmizz.sshj.transport.kex.Curve25519SHA256
 import net.schmizz.sshj.transport.kex.Curve25519SHA256.FactoryLibSsh
 import net.schmizz.sshj.transport.kex.DHGexSHA256
-import net.schmizz.sshj.transport.kex.ECDHNistP
 import net.schmizz.sshj.transport.random.JCERandom
 import net.schmizz.sshj.transport.random.SingletonRandomFactory
 import net.schmizz.sshj.userauth.keyprovider.OpenSSHKeyFile
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/sshj/SshjSessionFactory.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjSessionFactory.kt
similarity index 95%
rename from app/src/main/java/com/zeapo/pwdstore/git/sshj/SshjSessionFactory.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjSessionFactory.kt
index c36f27b3..7cd39653 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/sshj/SshjSessionFactory.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjSessionFactory.kt
@@ -2,15 +2,15 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git.sshj
+package dev.msfjarvis.aps.util.git.sshj
 
 import android.util.Base64
 import com.github.ajalt.timberkt.d
 import com.github.ajalt.timberkt.w
 import com.github.michaelbull.result.getOrElse
 import com.github.michaelbull.result.runCatching
-import com.zeapo.pwdstore.git.config.AuthMode
-import com.zeapo.pwdstore.git.operation.CredentialFinder
+import dev.msfjarvis.aps.util.settings.AuthMode
+import dev.msfjarvis.aps.util.git.operation.CredentialFinder
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
@@ -70,10 +70,11 @@ class SshjSessionFactory(private val authMethod: SshAuthMethod, private val host
     private var currentSession: SshjSession? = null
 
     override fun getSession(uri: URIish, credentialsProvider: CredentialsProvider?, fs: FS?, tms: Int): RemoteSession {
-        return currentSession ?: SshjSession(uri, uri.user, authMethod, hostKeyFile).connect().also {
-            d { "New SSH connection created" }
-            currentSession = it
-        }
+        return currentSession
+            ?: SshjSession(uri, uri.user, authMethod, hostKeyFile).connect().also {
+                d { "New SSH connection created" }
+                currentSession = it
+            }
     }
 
     fun close() {
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/ProxyUtils.kt b/app/src/main/java/dev/msfjarvis/aps/util/proxy/ProxyUtils.kt
similarity index 96%
rename from app/src/main/java/com/zeapo/pwdstore/utils/ProxyUtils.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/proxy/ProxyUtils.kt
index 4bb3dfcb..f3dae627 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/ProxyUtils.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/proxy/ProxyUtils.kt
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.utils
+package dev.msfjarvis.aps.util.proxy
 
-import com.zeapo.pwdstore.git.config.GitSettings
+import dev.msfjarvis.aps.util.settings.GitSettings
 import java.io.IOException
 import java.net.Authenticator
 import java.net.InetSocketAddress
diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgen/PasswordGenerator.kt b/app/src/main/java/dev/msfjarvis/aps/util/pwgen/PasswordGenerator.kt
similarity index 96%
rename from app/src/main/java/com/zeapo/pwdstore/pwgen/PasswordGenerator.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/pwgen/PasswordGenerator.kt
index babd66ca..ae26c7e3 100644
--- a/app/src/main/java/com/zeapo/pwdstore/pwgen/PasswordGenerator.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/pwgen/PasswordGenerator.kt
@@ -2,14 +2,14 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.pwgen
+package dev.msfjarvis.aps.util.pwgen
 
 import android.content.Context
 import androidx.core.content.edit
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.clearFlag
-import com.zeapo.pwdstore.utils.hasFlag
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.clearFlag
+import dev.msfjarvis.aps.util.extensions.hasFlag
 
 enum class PasswordOption(val key: String) {
     NoDigits("0"),
diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgen/RandomNumberGenerator.kt b/app/src/main/java/dev/msfjarvis/aps/util/pwgen/RandomNumberGenerator.kt
similarity index 96%
rename from app/src/main/java/com/zeapo/pwdstore/pwgen/RandomNumberGenerator.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/pwgen/RandomNumberGenerator.kt
index 6c4c956e..aae8d987 100644
--- a/app/src/main/java/com/zeapo/pwdstore/pwgen/RandomNumberGenerator.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/pwgen/RandomNumberGenerator.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.pwgen
+package dev.msfjarvis.aps.util.pwgen
 
 import java.security.SecureRandom
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgen/RandomPasswordGenerator.kt b/app/src/main/java/dev/msfjarvis/aps/util/pwgen/RandomPasswordGenerator.kt
similarity index 95%
rename from app/src/main/java/com/zeapo/pwdstore/pwgen/RandomPasswordGenerator.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/pwgen/RandomPasswordGenerator.kt
index 67d8fc40..f6341087 100644
--- a/app/src/main/java/com/zeapo/pwdstore/pwgen/RandomPasswordGenerator.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/pwgen/RandomPasswordGenerator.kt
@@ -2,9 +2,9 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.pwgen
+package dev.msfjarvis.aps.util.pwgen
 
-import com.zeapo.pwdstore.utils.hasFlag
+import dev.msfjarvis.aps.util.extensions.hasFlag
 
 object RandomPasswordGenerator {
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgen/RandomPhonemesGenerator.kt b/app/src/main/java/dev/msfjarvis/aps/util/pwgen/RandomPhonemesGenerator.kt
similarity index 98%
rename from app/src/main/java/com/zeapo/pwdstore/pwgen/RandomPhonemesGenerator.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/pwgen/RandomPhonemesGenerator.kt
index 6687293f..408974d5 100644
--- a/app/src/main/java/com/zeapo/pwdstore/pwgen/RandomPhonemesGenerator.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/pwgen/RandomPhonemesGenerator.kt
@@ -2,9 +2,9 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.pwgen
+package dev.msfjarvis.aps.util.pwgen
 
-import com.zeapo.pwdstore.utils.hasFlag
+import dev.msfjarvis.aps.util.extensions.hasFlag
 import java.util.Locale
 
 object RandomPhonemesGenerator {
diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgenxkpwd/CapsType.kt b/app/src/main/java/dev/msfjarvis/aps/util/pwgenxkpwd/CapsType.kt
similarity index 83%
rename from app/src/main/java/com/zeapo/pwdstore/pwgenxkpwd/CapsType.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/pwgenxkpwd/CapsType.kt
index f98a9f10..83274171 100644
--- a/app/src/main/java/com/zeapo/pwdstore/pwgenxkpwd/CapsType.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/pwgenxkpwd/CapsType.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.pwgenxkpwd
+package dev.msfjarvis.aps.util.pwgenxkpwd
 
 enum class CapsType {
     lowercase, UPPERCASE, TitleCase, Sentence, As_iS
diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgenxkpwd/PasswordBuilder.kt b/app/src/main/java/dev/msfjarvis/aps/util/pwgenxkpwd/PasswordBuilder.kt
similarity index 93%
rename from app/src/main/java/com/zeapo/pwdstore/pwgenxkpwd/PasswordBuilder.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/pwgenxkpwd/PasswordBuilder.kt
index 398a955d..4bd1a6e6 100644
--- a/app/src/main/java/com/zeapo/pwdstore/pwgenxkpwd/PasswordBuilder.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/pwgenxkpwd/PasswordBuilder.kt
@@ -2,16 +2,16 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.pwgenxkpwd
+package dev.msfjarvis.aps.util.pwgenxkpwd
 
 import android.content.Context
 import com.github.michaelbull.result.Result
 import com.github.michaelbull.result.runCatching
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.pwgen.PasswordGenerator.PasswordGeneratorException
-import com.zeapo.pwdstore.pwgen.secureRandomCharacter
-import com.zeapo.pwdstore.pwgen.secureRandomElement
-import com.zeapo.pwdstore.pwgen.secureRandomNumber
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.pwgen.PasswordGenerator.PasswordGeneratorException
+import dev.msfjarvis.aps.util.pwgen.secureRandomCharacter
+import dev.msfjarvis.aps.util.pwgen.secureRandomElement
+import dev.msfjarvis.aps.util.pwgen.secureRandomNumber
 import java.util.Locale
 
 class PasswordBuilder(ctx: Context) {
diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgenxkpwd/XkpwdDictionary.kt b/app/src/main/java/dev/msfjarvis/aps/util/pwgenxkpwd/XkpwdDictionary.kt
similarity index 82%
rename from app/src/main/java/com/zeapo/pwdstore/pwgenxkpwd/XkpwdDictionary.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/pwgenxkpwd/XkpwdDictionary.kt
index 2d0fbee9..95e65bcb 100644
--- a/app/src/main/java/com/zeapo/pwdstore/pwgenxkpwd/XkpwdDictionary.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/pwgenxkpwd/XkpwdDictionary.kt
@@ -2,13 +2,13 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.pwgenxkpwd
+package dev.msfjarvis.aps.util.pwgenxkpwd
 
 import android.content.Context
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.getString
-import com.zeapo.pwdstore.utils.sharedPrefs
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.getString
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
 import java.io.File
 
 class XkpwdDictionary(context: Context) {
diff --git a/app/src/main/java/com/zeapo/pwdstore/ClipboardService.kt b/app/src/main/java/dev/msfjarvis/aps/util/services/ClipboardService.kt
similarity index 96%
rename from app/src/main/java/com/zeapo/pwdstore/ClipboardService.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/services/ClipboardService.kt
index f50ac7ff..46363420 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ClipboardService.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/services/ClipboardService.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore
+package dev.msfjarvis.aps.util.services
 
 import android.app.Notification
 import android.app.NotificationChannel
@@ -17,9 +17,10 @@ import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.core.content.getSystemService
 import com.github.ajalt.timberkt.d
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.clipboard
-import com.zeapo.pwdstore.utils.sharedPrefs
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.clipboard
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/OreoAutofillService.kt b/app/src/main/java/dev/msfjarvis/aps/util/services/OreoAutofillService.kt
similarity index 87%
rename from app/src/main/java/com/zeapo/pwdstore/autofill/oreo/OreoAutofillService.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/services/OreoAutofillService.kt
index cc7e2c0c..3b431525 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/OreoAutofillService.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/services/OreoAutofillService.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.autofill.oreo
+package dev.msfjarvis.aps.util.services
 
 import android.content.Context
 import android.os.Build
@@ -25,13 +25,15 @@ import com.github.androidpasswordstore.autofillparser.cachePublicSuffixList
 import com.github.androidpasswordstore.autofillparser.passwordValue
 import com.github.androidpasswordstore.autofillparser.recoverNodes
 import com.github.androidpasswordstore.autofillparser.usernameValue
-import com.zeapo.pwdstore.BuildConfig
-import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.autofill.oreo.ui.AutofillSaveActivity
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.getString
-import com.zeapo.pwdstore.utils.hasFlag
-import com.zeapo.pwdstore.utils.sharedPrefs
+import dev.msfjarvis.aps.BuildConfig
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.ui.autofill.AutofillSaveActivity
+import dev.msfjarvis.aps.util.autofill.Api30AutofillResponseBuilder
+import dev.msfjarvis.aps.util.autofill.AutofillResponseBuilder
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.getString
+import dev.msfjarvis.aps.util.extensions.hasFlag
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
 
 @RequiresApi(Build.VERSION_CODES.O)
 class OreoAutofillService : AutofillService() {
@@ -106,11 +108,12 @@ class OreoAutofillService : AutofillService() {
             callback.onFailure(getString(R.string.oreo_autofill_save_internal_error))
             return
         }
-        val scenario = AutofillScenario.fromClientState(clientState)?.recoverNodes(structure) ?: run {
-            e { "Failed to recover client state or nodes from client state" }
-            callback.onFailure(getString(R.string.oreo_autofill_save_internal_error))
-            return
-        }
+        val scenario = AutofillScenario.fromClientState(clientState)?.recoverNodes(structure)
+            ?: run {
+                e { "Failed to recover client state or nodes from client state" }
+                callback.onFailure(getString(R.string.oreo_autofill_save_internal_error))
+                return
+            }
         val formOrigin = FormOrigin.fromBundle(clientState) ?: run {
             e { "Failed to recover form origin from client state" }
             callback.onFailure(getString(R.string.oreo_autofill_save_internal_error))
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordExportService.kt b/app/src/main/java/dev/msfjarvis/aps/util/services/PasswordExportService.kt
similarity index 97%
rename from app/src/main/java/com/zeapo/pwdstore/PasswordExportService.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/services/PasswordExportService.kt
index fc2b7f10..9164aa46 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordExportService.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/services/PasswordExportService.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore
+package dev.msfjarvis.aps.util.services
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -16,7 +16,8 @@ import androidx.core.app.NotificationCompat
 import androidx.core.content.getSystemService
 import androidx.documentfile.provider.DocumentFile
 import com.github.ajalt.timberkt.d
-import com.zeapo.pwdstore.utils.PasswordRepository
+import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.data.repo.PasswordRepository
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.util.Calendar
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/config/GitSettings.kt b/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt
similarity index 94%
rename from app/src/main/java/com/zeapo/pwdstore/git/config/GitSettings.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt
index 27ceb5cb..864cbf81 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/config/GitSettings.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt
@@ -2,18 +2,17 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.git.config
+package dev.msfjarvis.aps.util.settings
 
 import androidx.core.content.edit
 import com.github.michaelbull.result.getOrElse
 import com.github.michaelbull.result.runCatching
-import com.zeapo.pwdstore.Application
-import com.zeapo.pwdstore.utils.PasswordRepository
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.getEncryptedGitPrefs
-import com.zeapo.pwdstore.utils.getEncryptedProxyPrefs
-import com.zeapo.pwdstore.utils.getString
-import com.zeapo.pwdstore.utils.sharedPrefs
+import dev.msfjarvis.aps.Application
+import dev.msfjarvis.aps.data.repo.PasswordRepository
+import dev.msfjarvis.aps.util.extensions.getEncryptedGitPrefs
+import dev.msfjarvis.aps.util.extensions.getEncryptedProxyPrefs
+import dev.msfjarvis.aps.util.extensions.getString
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
 import java.io.File
 import org.eclipse.jgit.transport.URIish
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/Migrations.kt b/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt
similarity index 94%
rename from app/src/main/java/com/zeapo/pwdstore/Migrations.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt
index 18aed20e..fc506995 100644
--- a/app/src/main/java/com/zeapo/pwdstore/Migrations.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt
@@ -4,7 +4,7 @@
  */
 @file:Suppress("DEPRECATION")
 
-package com.zeapo.pwdstore
+package dev.msfjarvis.aps.util.settings
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -13,12 +13,9 @@ import com.github.ajalt.timberkt.e
 import com.github.ajalt.timberkt.i
 import com.github.michaelbull.result.get
 import com.github.michaelbull.result.runCatching
-import com.zeapo.pwdstore.git.config.GitSettings
-import com.zeapo.pwdstore.git.config.Protocol
-import com.zeapo.pwdstore.git.sshj.SshKey
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.getString
-import com.zeapo.pwdstore.utils.sharedPrefs
+import dev.msfjarvis.aps.util.git.sshj.SshKey
+import dev.msfjarvis.aps.util.extensions.getString
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
 import java.io.File
 import java.net.URI
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordSortOrder.kt b/app/src/main/java/dev/msfjarvis/aps/util/settings/PasswordSortOrder.kt
similarity index 87%
rename from app/src/main/java/com/zeapo/pwdstore/utils/PasswordSortOrder.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/settings/PasswordSortOrder.kt
index 0613c97d..f5a639f0 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordSortOrder.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/settings/PasswordSortOrder.kt
@@ -3,11 +3,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.utils
+package dev.msfjarvis.aps.util.settings
 
 import android.content.Context
 import android.content.SharedPreferences
-import com.zeapo.pwdstore.Application
+import dev.msfjarvis.aps.Application
+import dev.msfjarvis.aps.data.password.PasswordItem
+import dev.msfjarvis.aps.util.extensions.base64
+import dev.msfjarvis.aps.util.extensions.getString
 
 enum class PasswordSortOrder(val comparator: java.util.Comparator<PasswordItem>) {
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PreferenceKeys.kt b/app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt
similarity index 98%
rename from app/src/main/java/com/zeapo/pwdstore/utils/PreferenceKeys.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt
index 70818568..198be889 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PreferenceKeys.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.utils
+package dev.msfjarvis.aps.util.settings
 
 object PreferenceKeys {
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/Otp.kt b/app/src/main/java/dev/msfjarvis/aps/util/totp/Otp.kt
similarity index 98%
rename from app/src/main/java/com/zeapo/pwdstore/utils/Otp.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/totp/Otp.kt
index 994b4d82..551b2e5d 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/Otp.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/totp/Otp.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.utils
+package dev.msfjarvis.aps.util.totp
 
 import com.github.michaelbull.result.Err
 import com.github.michaelbull.result.runCatching
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/TotpFinder.kt b/app/src/main/java/dev/msfjarvis/aps/util/totp/TotpFinder.kt
similarity index 95%
rename from app/src/main/java/com/zeapo/pwdstore/utils/TotpFinder.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/totp/TotpFinder.kt
index 13a47543..fb43980c 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/TotpFinder.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/totp/TotpFinder.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.utils
+package dev.msfjarvis.aps.util.totp
 
 /**
  * Defines a class that can extract relevant parts of a TOTP URL for use by the app.
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/UriTotpFinder.kt b/app/src/main/java/dev/msfjarvis/aps/util/totp/UriTotpFinder.kt
similarity index 98%
rename from app/src/main/java/com/zeapo/pwdstore/utils/UriTotpFinder.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/totp/UriTotpFinder.kt
index 23101a13..21910a3a 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/UriTotpFinder.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/totp/UriTotpFinder.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.utils
+package dev.msfjarvis.aps.util.totp
 
 import android.net.Uri
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt b/app/src/main/java/dev/msfjarvis/aps/util/viewmodel/SearchableRepositoryViewModel.kt
similarity index 97%
rename from app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt
rename to app/src/main/java/dev/msfjarvis/aps/util/viewmodel/SearchableRepositoryViewModel.kt
index 7ac2bfc7..6cd47b4b 100644
--- a/app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/viewmodel/SearchableRepositoryViewModel.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore
+package dev.msfjarvis.aps.util.viewmodel
 
 import android.app.Application
 import android.os.Parcelable
@@ -24,13 +24,13 @@ import androidx.recyclerview.selection.StorageStrategy
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.zeapo.pwdstore.autofill.oreo.AutofillPreferences
-import com.zeapo.pwdstore.autofill.oreo.DirectoryStructure
-import com.zeapo.pwdstore.utils.PasswordItem
-import com.zeapo.pwdstore.utils.PasswordRepository
-import com.zeapo.pwdstore.utils.PasswordSortOrder
-import com.zeapo.pwdstore.utils.PreferenceKeys
-import com.zeapo.pwdstore.utils.sharedPrefs
+import dev.msfjarvis.aps.util.autofill.AutofillPreferences
+import dev.msfjarvis.aps.util.autofill.DirectoryStructure
+import dev.msfjarvis.aps.data.password.PasswordItem
+import dev.msfjarvis.aps.data.repo.PasswordRepository
+import dev.msfjarvis.aps.util.settings.PasswordSortOrder
+import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import dev.msfjarvis.aps.util.extensions.sharedPrefs
 import java.io.File
 import java.text.Collator
 import java.util.Locale
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index ad0a186b..1e59b462 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -11,7 +11,7 @@
     android:background="?android:attr/windowBackground"
     android:padding="@dimen/activity_horizontal_margin"
     tools:background="@color/white"
-    tools:context="com.zeapo.pwdstore.git.GitServerConfigActivity">
+    tools:context="dev.msfjarvis.aps.git.GitServerConfigActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml
index 1d495250..bd19f3d7 100644
--- a/app/src/main/res/layout/activity_git_config.xml
+++ b/app/src/main/res/layout/activity_git_config.xml
@@ -9,7 +9,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="@dimen/activity_horizontal_margin"
-    tools:context="com.zeapo.pwdstore.git.GitConfigActivity"
+    tools:context="dev.msfjarvis.aps.git.GitConfigActivity"
     tools:layout_editor_absoluteX="0dp"
     tools:layout_editor_absoluteY="81dp">
 
diff --git a/app/src/main/res/layout/activity_git_log.xml b/app/src/main/res/layout/activity_git_log.xml
index 96b28487..22810d33 100644
--- a/app/src/main/res/layout/activity_git_log.xml
+++ b/app/src/main/res/layout/activity_git_log.xml
@@ -16,7 +16,7 @@
         android:orientation="vertical"
         android:scrollbars="vertical"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        tools:context="com.zeapo.pwdstore.git.log.GitLogActivity"
+        tools:context=".ui.git.log.GitLogActivity"
         tools:listitem="@layout/git_log_row_layout" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_onboarding.xml b/app/src/main/res/layout/activity_onboarding.xml
index 6d880c31..76b96638 100644
--- a/app/src/main/res/layout/activity_onboarding.xml
+++ b/app/src/main/res/layout/activity_onboarding.xml
@@ -6,7 +6,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_first_run"
-        android:name="com.zeapo.pwdstore.ui.onboarding.fragments.WelcomeFragment"
+        android:name="dev.msfjarvis.aps.ui.onboarding.fragments.WelcomeFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:tag="welcome_fragment" />
diff --git a/app/src/main/res/layout/activity_oreo_autofill_filter.xml b/app/src/main/res/layout/activity_oreo_autofill_filter.xml
index 8e671e30..44c768e1 100644
--- a/app/src/main/res/layout/activity_oreo_autofill_filter.xml
+++ b/app/src/main/res/layout/activity_oreo_autofill_filter.xml
@@ -9,7 +9,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:elevation="2dp"
-    tools:context="com.zeapo.pwdstore.autofill.oreo.ui.AutofillFilterView">
+    tools:context="dev.msfjarvis.aps.ui.autofill.AutofillFilterView">
 
     <ImageView
         android:id="@+id/cover"
diff --git a/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml b/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml
index 8a735e5b..ce802b9e 100644
--- a/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml
+++ b/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml
@@ -12,7 +12,7 @@
     android:elevation="2dp"
     android:paddingBottom="16dp"
     android:scrollbars="vertical"
-    tools:context="com.zeapo.pwdstore.autofill.oreo.ui.AutofillPublisherChangedActivity">
+    tools:context="dev.msfjarvis.aps.ui.autofill.AutofillPublisherChangedActivity">
 
     <ImageView
         android:id="@+id/cover"
diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index 1e457822..8d16ff77 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -9,7 +9,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="com.zeapo.pwdstore.crypto.DecryptActivity">
+    tools:context=".ui.crypto.DecryptActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="fill_parent"
diff --git a/app/src/main/res/layout/password_creation_activity.xml b/app/src/main/res/layout/password_creation_activity.xml
index 8e2f42b1..a86eba34 100644
--- a/app/src/main/res/layout/password_creation_activity.xml
+++ b/app/src/main/res/layout/password_creation_activity.xml
@@ -10,7 +10,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="false"
-    tools:context="com.zeapo.pwdstore.crypto.PasswordCreationActivity">
+    tools:context=".ui.crypto.PasswordCreationActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/password_recycler_view.xml b/app/src/main/res/layout/password_recycler_view.xml
index 8358ed99..4c31b1cf 100644
--- a/app/src/main/res/layout/password_recycler_view.xml
+++ b/app/src/main/res/layout/password_recycler_view.xml
@@ -11,7 +11,7 @@
     android:clipChildren="false"
     android:clipToPadding="false"
     android:orientation="vertical"
-    tools:context="com.zeapo.pwdstore.PasswordFragment">
+    tools:context="dev.msfjarvis.aps.ui.passwords.PasswordFragment">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresher"
diff --git a/app/src/main/res/menu/pgp_handler.xml b/app/src/main/res/menu/pgp_handler.xml
index 44935595..778bb5d1 100644
--- a/app/src/main/res/menu/pgp_handler.xml
+++ b/app/src/main/res/menu/pgp_handler.xml
@@ -6,7 +6,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:pwstore="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.zeapo.pwdstore.crypto.PgpActivity">
+    tools:context=".ui.crypto.PgpActivity">
     <item
         android:id="@+id/share_password_as_plaintext"
         android:icon="@drawable/ic_share_24dp"
diff --git a/app/src/main/res/menu/pgp_handler_new_password.xml b/app/src/main/res/menu/pgp_handler_new_password.xml
index 455ae48a..b28c7476 100644
--- a/app/src/main/res/menu/pgp_handler_new_password.xml
+++ b/app/src/main/res/menu/pgp_handler_new_password.xml
@@ -6,7 +6,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:pwstore="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.zeapo.pwdstore.crypto.PgpActivity">
+    tools:context=".ui.crypto.PgpActivity">
     <item
         android:id="@+id/save_password"
         android:icon="@drawable/ic_save_24dp"
diff --git a/app/src/main/res/menu/pgp_handler_select_folder.xml b/app/src/main/res/menu/pgp_handler_select_folder.xml
index e033e2d5..17e640ba 100644
--- a/app/src/main/res/menu/pgp_handler_select_folder.xml
+++ b/app/src/main/res/menu/pgp_handler_select_folder.xml
@@ -6,7 +6,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:pwstore="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.zeapo.pwdstore.SelectFolderActivity">
+    tools:context="dev.msfjarvis.aps.SelectFolderActivity">
     <item
         android:id="@+id/crypto_select"
         android:icon="@drawable/ic_done_24dp"
diff --git a/app/src/nonFree/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSmsActivity.kt b/app/src/nonFree/java/dev/msfjarvis/aps/autofill/oreo/ui/AutofillSmsActivity.kt
similarity index 96%
rename from app/src/nonFree/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSmsActivity.kt
rename to app/src/nonFree/java/dev/msfjarvis/aps/autofill/oreo/ui/AutofillSmsActivity.kt
index 43498c66..f223cc79 100644
--- a/app/src/nonFree/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSmsActivity.kt
+++ b/app/src/nonFree/java/dev/msfjarvis/aps/autofill/oreo/ui/AutofillSmsActivity.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.autofill.oreo.ui
+package dev.msfjarvis.aps.autofill.oreo.ui
 
 import android.app.Activity
 import android.app.PendingIntent
@@ -29,9 +29,9 @@ import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.android.gms.common.api.ResolvableApiException
 import com.google.android.gms.tasks.Task
-import com.zeapo.pwdstore.autofill.oreo.AutofillResponseBuilder
-import com.zeapo.pwdstore.databinding.ActivityOreoAutofillSmsBinding
-import com.zeapo.pwdstore.utils.viewBinding
+import dev.msfjarvis.aps.util.autofill.AutofillResponseBuilder
+import dev.msfjarvis.aps.databinding.ActivityOreoAutofillSmsBinding
+import dev.msfjarvis.aps.util.extensions.viewBinding
 import java.util.concurrent.ExecutionException
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
diff --git a/app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml b/app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml
index 294944d1..03b88fe4 100644
--- a/app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml
+++ b/app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml
@@ -9,7 +9,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:paddingHorizontal="10dp"
-    tools:context="com.zeapo.pwdstore.autofill.oreo.ui.AutofillFilterView">
+    tools:context="dev.msfjarvis.aps.ui.autofill.AutofillFilterView">
 
     <ImageView
         android:id="@+id/cover"
diff --git a/app/src/test/java/com/zeapo/pwdstore/model/PasswordEntryTest.kt b/app/src/test/java/dev/msfjarvis/aps/data/password/PasswordEntryTest.kt
similarity index 98%
rename from app/src/test/java/com/zeapo/pwdstore/model/PasswordEntryTest.kt
rename to app/src/test/java/dev/msfjarvis/aps/data/password/PasswordEntryTest.kt
index 082fc110..a627dd7a 100644
--- a/app/src/test/java/com/zeapo/pwdstore/model/PasswordEntryTest.kt
+++ b/app/src/test/java/dev/msfjarvis/aps/data/password/PasswordEntryTest.kt
@@ -2,11 +2,11 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package com.zeapo.pwdstore.model
+package dev.msfjarvis.aps.data.password
 
 import com.github.michaelbull.result.get
-import com.zeapo.pwdstore.utils.Otp
-import com.zeapo.pwdstore.utils.TotpFinder
+import dev.msfjarvis.aps.util.totp.Otp
+import dev.msfjarvis.aps.util.totp.TotpFinder
 import java.util.Date
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
diff --git a/app/src/test/java/com/zeapo/pwdstore/utils/OtpTest.kt b/app/src/test/java/dev/msfjarvis/aps/util/totp/OtpTest.kt
similarity index 98%
rename from app/src/test/java/com/zeapo/pwdstore/utils/OtpTest.kt
rename to app/src/test/java/dev/msfjarvis/aps/util/totp/OtpTest.kt
index d6938019..0af9ae69 100644
--- a/app/src/test/java/com/zeapo/pwdstore/utils/OtpTest.kt
+++ b/app/src/test/java/dev/msfjarvis/aps/util/totp/OtpTest.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package com.zeapo.pwdstore.utils
+package dev.msfjarvis.aps.util.totp
 
 import com.github.michaelbull.result.get
 import kotlin.test.assertEquals