diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f4576c9da..aa034c10d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -66,14 +66,14 @@
             android:label="@string/title_choose_apps"/>
 
         <activity
-            android:name=".ui.v3onionservice.OnionServiceActivity"
+            android:name=".v3onionservice.OnionServiceActivity"
             android:label="@string/hidden_services">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".OrbotActivity" />
         </activity>
 
-        <activity android:name=".ui.v3onionservice.clientauth.ClientAuthActivity"
+        <activity android:name=".v3onionservice.clientauth.ClientAuthActivity"
             android:label="@string/v3_client_auth_activity_title">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -81,17 +81,17 @@
         </activity>
 
         <activity
-            android:name=".ui.onboarding.CustomBridgesActivity"
+            android:name=".onboarding.CustomBridgesActivity"
             android:label="@string/use_custom_bridges" />
 
         <provider
-            android:name=".ui.v3onionservice.OnionServiceContentProvider"
+            android:name=".v3onionservice.OnionServiceContentProvider"
             android:authorities="${applicationId}.ui.v3onionservice"
             android:exported="false" />
 
         <provider
             android:authorities="${applicationId}.ui.v3onionservice.clientauth"
-            android:name=".ui.v3onionservice.clientauth.ClientAuthContentProvider"
+            android:name=".v3onionservice.clientauth.ClientAuthContentProvider"
             android:exported="false"/>
 
         <receiver
diff --git a/app/src/main/java/org/torproject/android/OrbotActivity.kt b/app/src/main/java/org/torproject/android/OrbotActivity.kt
index 20473e017..8fce6c4a4 100644
--- a/app/src/main/java/org/torproject/android/OrbotActivity.kt
+++ b/app/src/main/java/org/torproject/android/OrbotActivity.kt
@@ -18,9 +18,11 @@ import androidx.navigation.findNavController
 import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.scottyab.rootbeer.RootBeer
+import org.torproject.android.connection.ConnectFragment
 import org.torproject.android.core.LocaleHelper
 import org.torproject.android.core.putNotSystem
 import org.torproject.android.core.ui.BaseActivity
+import org.torproject.android.more.MoreFragment
 import org.torproject.android.service.OrbotConstants
 import org.torproject.android.service.util.Prefs
 import org.torproject.android.ui.LogBottomSheet
diff --git a/app/src/main/java/org/torproject/android/circumvention/CircumventionApi.kt b/app/src/main/java/org/torproject/android/circumvention/CircumventionApi.kt
index 54a05ed1e..634a8ea36 100644
--- a/app/src/main/java/org/torproject/android/circumvention/CircumventionApi.kt
+++ b/app/src/main/java/org/torproject/android/circumvention/CircumventionApi.kt
@@ -3,7 +3,7 @@ package org.torproject.android.circumvention
 import IPtProxy.IPtProxy
 import okhttp3.OkHttpClient
 import org.torproject.android.service.OrbotService
-import org.torproject.android.ui.onboarding.ProxiedHurlStack
+import org.torproject.android.onboarding.ProxiedHurlStack
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
diff --git a/app/src/main/java/org/torproject/android/ConfigConnectionBottomSheet.kt b/app/src/main/java/org/torproject/android/connection/ConfigConnectionBottomSheet.kt
similarity index 98%
rename from app/src/main/java/org/torproject/android/ConfigConnectionBottomSheet.kt
rename to app/src/main/java/org/torproject/android/connection/ConfigConnectionBottomSheet.kt
index 68ebe528e..1f6cf5a53 100644
--- a/app/src/main/java/org/torproject/android/ConfigConnectionBottomSheet.kt
+++ b/app/src/main/java/org/torproject/android/connection/ConfigConnectionBottomSheet.kt
@@ -1,4 +1,4 @@
-package org.torproject.android
+package org.torproject.android.connection
 
 import IPtProxy.IPtProxy
 import IPtProxy.OnTransportStopped
@@ -14,6 +14,8 @@ import android.widget.CompoundButton
 import android.widget.RadioButton
 import android.widget.Toast
 import androidx.appcompat.content.res.AppCompatResources
+import org.torproject.android.OrbotBottomSheetDialogFragment
+import org.torproject.android.R
 import org.torproject.android.circumvention.Bridges
 import org.torproject.android.circumvention.CircumventionApiManager
 import org.torproject.android.circumvention.SettingsRequest
diff --git a/app/src/main/java/org/torproject/android/ConnectFragment.kt b/app/src/main/java/org/torproject/android/connection/ConnectFragment.kt
similarity index 99%
rename from app/src/main/java/org/torproject/android/ConnectFragment.kt
rename to app/src/main/java/org/torproject/android/connection/ConnectFragment.kt
index e7ad20924..5eba07e6f 100644
--- a/app/src/main/java/org/torproject/android/ConnectFragment.kt
+++ b/app/src/main/java/org/torproject/android/connection/ConnectFragment.kt
@@ -1,4 +1,4 @@
-package org.torproject.android
+package org.torproject.android.connection
 
 import android.app.Activity
 import android.content.Context
@@ -23,6 +23,8 @@ import androidx.fragment.app.Fragment
 
 import net.freehaven.tor.control.TorControlCommands
 
+import org.torproject.android.OrbotActivity
+import org.torproject.android.R
 import org.torproject.android.core.NetworkUtils.isNetworkAvailable
 import org.torproject.android.core.putNotSystem
 import org.torproject.android.service.OrbotConstants
diff --git a/app/src/main/java/org/torproject/android/ConnectionHelperCallbacks.kt b/app/src/main/java/org/torproject/android/connection/ConnectionHelperCallbacks.kt
similarity index 60%
rename from app/src/main/java/org/torproject/android/ConnectionHelperCallbacks.kt
rename to app/src/main/java/org/torproject/android/connection/ConnectionHelperCallbacks.kt
index 865ec5c00..642f4e6cd 100644
--- a/app/src/main/java/org/torproject/android/ConnectionHelperCallbacks.kt
+++ b/app/src/main/java/org/torproject/android/connection/ConnectionHelperCallbacks.kt
@@ -1,4 +1,4 @@
-package org.torproject.android
+package org.torproject.android.connection
 
 interface ConnectionHelperCallbacks {
     fun tryConnecting()
diff --git a/app/src/main/java/org/torproject/android/CustomBridgeBottomSheet.kt b/app/src/main/java/org/torproject/android/connection/CustomBridgeBottomSheet.kt
similarity index 91%
rename from app/src/main/java/org/torproject/android/CustomBridgeBottomSheet.kt
rename to app/src/main/java/org/torproject/android/connection/CustomBridgeBottomSheet.kt
index 2d5991e9a..aae8059fb 100644
--- a/app/src/main/java/org/torproject/android/CustomBridgeBottomSheet.kt
+++ b/app/src/main/java/org/torproject/android/connection/CustomBridgeBottomSheet.kt
@@ -1,4 +1,4 @@
-package org.torproject.android
+package org.torproject.android.connection
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,6 +6,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.EditText
+import org.torproject.android.OrbotBottomSheetDialogFragment
+import org.torproject.android.R
 import org.torproject.android.service.util.Prefs
 
 class CustomBridgeBottomSheet(private val callbacks: ConnectionHelperCallbacks) :
diff --git a/app/src/main/java/org/torproject/android/ExitNodeDialogFragment.kt b/app/src/main/java/org/torproject/android/connection/ExitNodeDialogFragment.kt
similarity index 97%
rename from app/src/main/java/org/torproject/android/ExitNodeDialogFragment.kt
rename to app/src/main/java/org/torproject/android/connection/ExitNodeDialogFragment.kt
index e272f0afd..940f279c2 100644
--- a/app/src/main/java/org/torproject/android/ExitNodeDialogFragment.kt
+++ b/app/src/main/java/org/torproject/android/connection/ExitNodeDialogFragment.kt
@@ -1,9 +1,10 @@
-package org.torproject.android
+package org.torproject.android.connection
 
 import android.app.AlertDialog
 import android.app.Dialog
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
+import org.torproject.android.R
 import org.torproject.android.service.util.Prefs
 import org.torproject.android.service.util.Utils
 import java.text.Collator
diff --git a/app/src/main/java/org/torproject/android/MoatBottomSheet.kt b/app/src/main/java/org/torproject/android/connection/MoatBottomSheet.kt
similarity index 97%
rename from app/src/main/java/org/torproject/android/MoatBottomSheet.kt
rename to app/src/main/java/org/torproject/android/connection/MoatBottomSheet.kt
index 201e96dd8..ee688591f 100644
--- a/app/src/main/java/org/torproject/android/MoatBottomSheet.kt
+++ b/app/src/main/java/org/torproject/android/connection/MoatBottomSheet.kt
@@ -1,4 +1,4 @@
-package org.torproject.android
+package org.torproject.android.connection
 
 import IPtProxy.Controller
 import IPtProxy.IPtProxy
@@ -25,10 +25,11 @@ import com.android.volley.toolbox.JsonObjectRequest
 import com.android.volley.toolbox.Volley
 import org.json.JSONException
 import org.json.JSONObject
+import org.torproject.android.OrbotBottomSheetDialogFragment
+import org.torproject.android.R
 import org.torproject.android.service.OrbotService
 import org.torproject.android.service.util.Prefs
-import org.torproject.android.service.util.TCPSourceApp.getApplicationInfo
-import org.torproject.android.ui.onboarding.ProxiedHurlStack
+import org.torproject.android.onboarding.ProxiedHurlStack
 import java.io.File
 
 
diff --git a/app/src/main/java/org/torproject/android/KindessConfigBottomSheet.kt b/app/src/main/java/org/torproject/android/kindness/KindessConfigBottomSheet.kt
similarity index 90%
rename from app/src/main/java/org/torproject/android/KindessConfigBottomSheet.kt
rename to app/src/main/java/org/torproject/android/kindness/KindessConfigBottomSheet.kt
index 418d85a92..832e1b2f0 100644
--- a/app/src/main/java/org/torproject/android/KindessConfigBottomSheet.kt
+++ b/app/src/main/java/org/torproject/android/kindness/KindessConfigBottomSheet.kt
@@ -1,4 +1,4 @@
-package org.torproject.android
+package org.torproject.android.kindness
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,6 +6,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.appcompat.widget.SwitchCompat
+import org.torproject.android.OrbotBottomSheetDialogFragment
+import org.torproject.android.R
 import org.torproject.android.service.util.Prefs
 
 class KindessConfigBottomSheet : OrbotBottomSheetDialogFragment() {
diff --git a/app/src/main/java/org/torproject/android/KindnessFragment.kt b/app/src/main/java/org/torproject/android/kindness/KindnessFragment.kt
similarity index 95%
rename from app/src/main/java/org/torproject/android/KindnessFragment.kt
rename to app/src/main/java/org/torproject/android/kindness/KindnessFragment.kt
index 21372b770..587987026 100644
--- a/app/src/main/java/org/torproject/android/KindnessFragment.kt
+++ b/app/src/main/java/org/torproject/android/kindness/KindnessFragment.kt
@@ -1,4 +1,4 @@
-package org.torproject.android
+package org.torproject.android.kindness
 
 import android.content.Intent
 import android.os.Bundle
@@ -10,6 +10,8 @@ import android.widget.Button
 import android.widget.TextView
 import androidx.appcompat.widget.SwitchCompat
 import androidx.core.content.ContextCompat
+import org.torproject.android.R
+import org.torproject.android.connection.CustomBridgeBottomSheet
 import org.torproject.android.core.putNotSystem
 import org.torproject.android.service.OrbotConstants
 import org.torproject.android.service.OrbotService
diff --git a/app/src/main/java/org/torproject/android/ui/AboutDialogFragment.kt b/app/src/main/java/org/torproject/android/more/AboutDialogFragment.kt
similarity index 98%
rename from app/src/main/java/org/torproject/android/ui/AboutDialogFragment.kt
rename to app/src/main/java/org/torproject/android/more/AboutDialogFragment.kt
index d8a936028..c02cc2649 100644
--- a/app/src/main/java/org/torproject/android/ui/AboutDialogFragment.kt
+++ b/app/src/main/java/org/torproject/android/more/AboutDialogFragment.kt
@@ -1,4 +1,4 @@
-package org.torproject.android.ui
+package org.torproject.android.more
 
 import android.app.AlertDialog
 import android.app.Dialog
diff --git a/app/src/main/java/org/torproject/android/ui/MoreActionAdapter.kt b/app/src/main/java/org/torproject/android/more/MoreActionAdapter.kt
similarity index 93%
rename from app/src/main/java/org/torproject/android/ui/MoreActionAdapter.kt
rename to app/src/main/java/org/torproject/android/more/MoreActionAdapter.kt
index c339f073c..d09a90c0f 100644
--- a/app/src/main/java/org/torproject/android/ui/MoreActionAdapter.kt
+++ b/app/src/main/java/org/torproject/android/more/MoreActionAdapter.kt
@@ -1,4 +1,4 @@
-package org.torproject.android.ui
+package org.torproject.android.more
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.*
 import org.torproject.android.R
+import org.torproject.android.ui.OrbotMenuAction
 import java.util.*
 
 
diff --git a/app/src/main/java/org/torproject/android/MoreFragment.kt b/app/src/main/java/org/torproject/android/more/MoreFragment.kt
similarity index 95%
rename from app/src/main/java/org/torproject/android/MoreFragment.kt
rename to app/src/main/java/org/torproject/android/more/MoreFragment.kt
index 6e426b7e2..39493d041 100644
--- a/app/src/main/java/org/torproject/android/MoreFragment.kt
+++ b/app/src/main/java/org/torproject/android/more/MoreFragment.kt
@@ -1,4 +1,4 @@
-package org.torproject.android
+package org.torproject.android.more
 
 import android.app.Activity
 import android.content.Intent
@@ -11,15 +11,17 @@ import android.widget.ListView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
+import org.torproject.android.OrbotActivity
 import org.torproject.android.OrbotActivity.Companion.REQUEST_CODE_SETTINGS
 import org.torproject.android.OrbotActivity.Companion.REQUEST_VPN_APP_SELECT
+import org.torproject.android.R
 import org.torproject.android.core.putNotSystem
 import org.torproject.android.core.ui.SettingsActivity
 import org.torproject.android.service.OrbotConstants
 import org.torproject.android.service.OrbotService
 import org.torproject.android.ui.*
-import org.torproject.android.ui.v3onionservice.OnionServiceActivity
-import org.torproject.android.ui.v3onionservice.clientauth.ClientAuthActivity
+import org.torproject.android.v3onionservice.OnionServiceActivity
+import org.torproject.android.v3onionservice.clientauth.ClientAuthActivity
 
 class MoreFragment : Fragment() {
     private lateinit var lvMore: ListView
diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java b/app/src/main/java/org/torproject/android/onboarding/CustomBridgesActivity.java
similarity index 99%
rename from app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java
rename to app/src/main/java/org/torproject/android/onboarding/CustomBridgesActivity.java
index d875094bb..efd679189 100644
--- a/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java
+++ b/app/src/main/java/org/torproject/android/onboarding/CustomBridgesActivity.java
@@ -1,6 +1,6 @@
 /* Copyright (c) 2020, Benjamin Erhart, Orbot / The Guardian Project - https://guardianproject.info */
 /* See LICENSE for licensing information */
-package org.torproject.android.ui.onboarding;
+package org.torproject.android.onboarding;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/ProxiedHurlStack.kt b/app/src/main/java/org/torproject/android/onboarding/ProxiedHurlStack.kt
similarity index 95%
rename from app/src/main/java/org/torproject/android/ui/onboarding/ProxiedHurlStack.kt
rename to app/src/main/java/org/torproject/android/onboarding/ProxiedHurlStack.kt
index 436d2beb2..5c599e174 100644
--- a/app/src/main/java/org/torproject/android/ui/onboarding/ProxiedHurlStack.kt
+++ b/app/src/main/java/org/torproject/android/onboarding/ProxiedHurlStack.kt
@@ -1,6 +1,6 @@
 /* Copyright (c) 2020, Benjamin Erhart, Orbot / The Guardian Project - https://guardianproject.info */
 /* See LICENSE for licensing information */
-package org.torproject.android.ui.onboarding
+package org.torproject.android.onboarding
 
 import android.util.Log
 
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActionsDialogFragment.java b/app/src/main/java/org/torproject/android/v3onionservice/OnionServiceActionsDialogFragment.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActionsDialogFragment.java
rename to app/src/main/java/org/torproject/android/v3onionservice/OnionServiceActionsDialogFragment.java
index 3dc394213..3989fa5e0 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActionsDialogFragment.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/OnionServiceActionsDialogFragment.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice;
+package org.torproject.android.v3onionservice;
 
 import android.app.Activity;
 import android.app.Dialog;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActivity.java b/app/src/main/java/org/torproject/android/v3onionservice/OnionServiceActivity.java
similarity index 99%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActivity.java
rename to app/src/main/java/org/torproject/android/v3onionservice/OnionServiceActivity.java
index 94a294bc7..c0933a518 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActivity.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/OnionServiceActivity.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice;
+package org.torproject.android.v3onionservice;
 
 import android.content.ContentResolver;
 import android.content.Context;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceContentProvider.java b/app/src/main/java/org/torproject/android/v3onionservice/OnionServiceContentProvider.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceContentProvider.java
rename to app/src/main/java/org/torproject/android/v3onionservice/OnionServiceContentProvider.java
index 079167907..856c58a4e 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceContentProvider.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/OnionServiceContentProvider.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice;
+package org.torproject.android.v3onionservice;
 
 import android.content.ContentProvider;
 import android.content.ContentUris;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceCreateDialogFragment.java b/app/src/main/java/org/torproject/android/v3onionservice/OnionServiceCreateDialogFragment.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceCreateDialogFragment.java
rename to app/src/main/java/org/torproject/android/v3onionservice/OnionServiceCreateDialogFragment.java
index 4a51b3f1c..6e3257fb1 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceCreateDialogFragment.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/OnionServiceCreateDialogFragment.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice;
+package org.torproject.android.v3onionservice;
 
 import android.app.Dialog;
 import android.content.ContentResolver;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDatabase.java b/app/src/main/java/org/torproject/android/v3onionservice/OnionServiceDatabase.java
similarity index 96%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDatabase.java
rename to app/src/main/java/org/torproject/android/v3onionservice/OnionServiceDatabase.java
index d2c62a9d8..7fd67125e 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDatabase.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/OnionServiceDatabase.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice;
+package org.torproject.android.v3onionservice;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDeleteDialogFragment.kt b/app/src/main/java/org/torproject/android/v3onionservice/OnionServiceDeleteDialogFragment.kt
similarity index 97%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDeleteDialogFragment.kt
rename to app/src/main/java/org/torproject/android/v3onionservice/OnionServiceDeleteDialogFragment.kt
index 5bca41116..c0567c573 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDeleteDialogFragment.kt
+++ b/app/src/main/java/org/torproject/android/v3onionservice/OnionServiceDeleteDialogFragment.kt
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice
+package org.torproject.android.v3onionservice
 
 import android.app.Dialog
 import android.content.Context
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionV3ListAdapter.java b/app/src/main/java/org/torproject/android/v3onionservice/OnionV3ListAdapter.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/OnionV3ListAdapter.java
rename to app/src/main/java/org/torproject/android/v3onionservice/OnionV3ListAdapter.java
index 0b15a911b..ce3b355fe 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionV3ListAdapter.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/OnionV3ListAdapter.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice;
+package org.torproject.android.v3onionservice;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/PermissionManager.kt b/app/src/main/java/org/torproject/android/v3onionservice/PermissionManager.kt
similarity index 97%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/PermissionManager.kt
rename to app/src/main/java/org/torproject/android/v3onionservice/PermissionManager.kt
index b9dd97ad9..7db30ed1b 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/PermissionManager.kt
+++ b/app/src/main/java/org/torproject/android/v3onionservice/PermissionManager.kt
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice
+package org.torproject.android.v3onionservice
 
 import android.content.Context
 import android.content.Intent
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/V3BackupUtils.java b/app/src/main/java/org/torproject/android/v3onionservice/V3BackupUtils.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/V3BackupUtils.java
rename to app/src/main/java/org/torproject/android/v3onionservice/V3BackupUtils.java
index e74bbc6f6..0cda5aa4c 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/V3BackupUtils.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/V3BackupUtils.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice;
+package org.torproject.android.v3onionservice;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -14,7 +14,7 @@
 import org.torproject.android.R;
 import org.torproject.android.service.OrbotConstants;
 import org.torproject.android.service.OrbotService;
-import org.torproject.android.ui.v3onionservice.clientauth.ClientAuthContentProvider;
+import org.torproject.android.v3onionservice.clientauth.ClientAuthContentProvider;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/ZipUtilities.java b/app/src/main/java/org/torproject/android/v3onionservice/ZipUtilities.java
similarity index 99%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/ZipUtilities.java
rename to app/src/main/java/org/torproject/android/v3onionservice/ZipUtilities.java
index 0cb1a9e9d..baf603128 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/ZipUtilities.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/ZipUtilities.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice;
+package org.torproject.android.v3onionservice;
 
 import android.content.ContentResolver;
 import android.net.Uri;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActionsDialogFragment.java b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthActionsDialogFragment.java
similarity index 96%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActionsDialogFragment.java
rename to app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthActionsDialogFragment.java
index 0ccfffe0d..678b6b6e4 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActionsDialogFragment.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthActionsDialogFragment.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice.clientauth;
+package org.torproject.android.v3onionservice.clientauth;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthActivity.java
similarity index 97%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java
rename to app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthActivity.java
index a713eb5f4..571597c16 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthActivity.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice.clientauth;
+package org.torproject.android.v3onionservice.clientauth;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -22,7 +22,7 @@
 import org.torproject.android.R;
 import org.torproject.android.core.DiskUtils;
 import org.torproject.android.core.LocaleHelper;
-import org.torproject.android.ui.v3onionservice.V3BackupUtils;
+import org.torproject.android.v3onionservice.V3BackupUtils;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthBackupDialogFragment.java b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthBackupDialogFragment.java
similarity index 97%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthBackupDialogFragment.java
rename to app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthBackupDialogFragment.java
index 06714a7ab..e3bca4284 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthBackupDialogFragment.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthBackupDialogFragment.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice.clientauth;
+package org.torproject.android.v3onionservice.clientauth;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -20,7 +20,7 @@
 import org.torproject.android.R;
 import org.torproject.android.core.DiskUtils;
 import org.torproject.android.core.ui.NoPersonalizedLearningEditText;
-import org.torproject.android.ui.v3onionservice.V3BackupUtils;
+import org.torproject.android.v3onionservice.V3BackupUtils;
 
 import java.util.Objects;
 
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthContentProvider.java b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthContentProvider.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthContentProvider.java
rename to app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthContentProvider.java
index 0b7474511..139cc1a1d 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthContentProvider.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthContentProvider.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice.clientauth;
+package org.torproject.android.v3onionservice.clientauth;
 
 import android.content.ContentProvider;
 import android.content.ContentUris;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthCreateDialogFragment.java b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthCreateDialogFragment.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthCreateDialogFragment.java
rename to app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthCreateDialogFragment.java
index e2ddd2062..82d2fbdc8 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthCreateDialogFragment.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthCreateDialogFragment.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice.clientauth;
+package org.torproject.android.v3onionservice.clientauth;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthDatabase.java b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthDatabase.java
similarity index 93%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthDatabase.java
rename to app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthDatabase.java
index 50b04bc67..bd2797f41 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthDatabase.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthDatabase.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice.clientauth;
+package org.torproject.android.v3onionservice.clientauth;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthDeleteDialogFragment.java b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthDeleteDialogFragment.java
similarity index 95%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthDeleteDialogFragment.java
rename to app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthDeleteDialogFragment.java
index 0a8f626fd..3ba160e7b 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthDeleteDialogFragment.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthDeleteDialogFragment.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice.clientauth;
+package org.torproject.android.v3onionservice.clientauth;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthListAdapter.java b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthListAdapter.java
similarity index 97%
rename from app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthListAdapter.java
rename to app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthListAdapter.java
index a9846864e..85f2e4164 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthListAdapter.java
+++ b/app/src/main/java/org/torproject/android/v3onionservice/clientauth/ClientAuthListAdapter.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.v3onionservice.clientauth;
+package org.torproject.android.v3onionservice.clientauth;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
diff --git a/app/src/main/res/layout/activity_custom_bridges.xml b/app/src/main/res/layout/activity_custom_bridges.xml
index b19e57104..d29237f0b 100644
--- a/app/src/main/res/layout/activity_custom_bridges.xml
+++ b/app/src/main/res/layout/activity_custom_bridges.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/dark_purple"
-    tools:context=".ui.onboarding.CustomBridgesActivity">
+    tools:context=".onboarding.CustomBridgesActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_hosted_services.xml b/app/src/main/res/layout/activity_hosted_services.xml
index 1edc4fab0..7ad6f59e8 100644
--- a/app/src/main/res/layout/activity_hosted_services.xml
+++ b/app/src/main/res/layout/activity_hosted_services.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="org.torproject.android.ui.v3onionservice.OnionServiceActivity">
+    tools:context="org.torproject.android.v3onionservice.OnionServiceActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_v3auth.xml b/app/src/main/res/layout/activity_v3auth.xml
index 618564921..9757595ee 100644
--- a/app/src/main/res/layout/activity_v3auth.xml
+++ b/app/src/main/res/layout/activity_v3auth.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:background="@color/new_background"
     android:fitsSystemWindows="true"
-    tools:context="org.torproject.android.ui.v3onionservice.clientauth.ClientAuthActivity">
+    tools:context="org.torproject.android.v3onionservice.clientauth.ClientAuthActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_more.xml b/app/src/main/res/layout/fragment_more.xml
index 163d4891f..9599c169c 100644
--- a/app/src/main/res/layout/fragment_more.xml
+++ b/app/src/main/res/layout/fragment_more.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MoreFragment">
+    tools:context=".more.MoreFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <ListView
diff --git a/app/src/main/res/layout/layout_hs_list_view_main.xml b/app/src/main/res/layout/layout_hs_list_view_main.xml
index 58407d5f5..f248882bc 100644
--- a/app/src/main/res/layout/layout_hs_list_view_main.xml
+++ b/app/src/main/res/layout/layout_hs_list_view_main.xml
@@ -11,7 +11,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="org.torproject.android.ui.v3onionservice.OnionServiceActivity"
+    tools:context="org.torproject.android.v3onionservice.OnionServiceActivity"
     tools:showIn="@layout/activity_hosted_services">
 
 
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index d2952d35f..b7ea052f6 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -7,17 +7,17 @@
 
     <fragment
         android:id="@+id/connectFragment"
-        android:name="org.torproject.android.ConnectFragment"
+        android:name="org.torproject.android.connection.ConnectFragment"
         android:label="fragment_connect"
         tools:layout="@layout/fragment_connect" />
     <fragment
         android:id="@+id/moreFragment"
-        android:name="org.torproject.android.MoreFragment"
+        android:name="org.torproject.android.more.MoreFragment"
         android:label="fragment_more"
         tools:layout="@layout/fragment_more" />
     <fragment
         android:id="@+id/kindnessFragment"
-        android:name="org.torproject.android.KindnessFragment"
+        android:name="org.torproject.android.kindness.KindnessFragment"
         android:label="fragment_kindness"
         tools:layout="@layout/fragment_kindness" />
 </navigation>
\ No newline at end of file