diff --git a/next/.gitignore b/app/.gitignore
similarity index 100%
rename from next/.gitignore
rename to app/.gitignore
diff --git a/next/build.gradle.kts b/app/build.gradle.kts
similarity index 89%
rename from next/build.gradle.kts
rename to app/build.gradle.kts
index 0b824601e..fed84e423 100644
--- a/next/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -14,7 +14,7 @@ android {
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        applicationId = "org.fdroid.basic"
+        applicationId = "org.fdroid"
         minSdk = 24
         targetSdk = 36
         versionCode = 1
@@ -27,15 +27,28 @@ android {
         all {
             buildConfigField("String", "ACRA_REPORT_EMAIL", "\"t+fdroidnext@grobox.de\"")
         }
-        release {
+        getByName("release") {
             isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
             )
         }
-        debug {
+        getByName("debug") {
             applicationIdSuffix = ".debug"
+            versionNameSuffix = "-debug"
+            isDebuggable = true
+        }
+    }
+    flavorDimensions += "base"
+    productFlavors {
+        create("basic") {
+            dimension = "base"
+            applicationIdSuffix = ".basic"
+        }
+        create("full") {
+            dimension = "base"
+            applicationIdSuffix = ".fdroid"
         }
     }
     compileOptions {
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 20e22cd98..b37172aee 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,58 +1,17 @@
 -dontobfuscate
--dontoptimize
 -keepattributes SourceFile,LineNumberTable,Exceptions
--keep class org.fdroid.fdroid.** {*;}
--dontwarn android.test.**
 
--dontwarn javax.naming.**
--dontnote org.apache.http.**
--dontnote android.net.http.**
--dontnote **ILicensingService
-
-# Needed for espresso https://stackoverflow.com/a/21706087
--dontwarn org.xmlpull.v1.**
-
-# StrongHttpsClient and its support classes are totally unused, so the
-# ch.boye.httpclientandroidlib.** classes are also unneeded
--dontwarn info.guardianproject.netcipher.client.**
-
-# These libraries are known to break if minification is enabled on them. They
-# use reflection to instantiate classes, for example. If the keep flags are
-# removed, proguard will strip classes which are required, which may result in
-# crashes.
--keep class kellinwood.security.zipsigner.** {*;}
--keep class org.bouncycastle.** {*;}
-
-# This keeps class members used for SystemInstaller IPC.
-#   Reference: https://gitlab.com/fdroid/fdroidclient/issues/79
--keepclassmembers class * implements android.os.IInterface {
-    public *;
-}
-
--keepattributes *Annotation*,EnclosingMethod,Signature
--keepnames class com.fasterxml.jackson.** { *; }
--dontwarn com.fasterxml.jackson.databind.ext.**
--keep class org.codehaus.** { *; }
--keepclassmembers public final enum org.codehaus.jackson.annotate.JsonAutoDetect$Visibility {
-public static final org.codehaus.jackson.annotate.JsonAutoDetect$Visibility *; }
--keep public class org.fdroid.** {
-  *;
-}
-
--dontwarn org.bouncycastle.jsse.**
--dontwarn org.conscrypt.**
--dontwarn org.openjsse.**
-
-# This is necessary so that RemoteWorkManager can be initialized (also marked with @Keep)
--keep class androidx.work.multiprocess.RemoteWorkManagerClient {
-    public <init>(...);
-}
-
--keep class org.acra.config.MailSenderConfiguration {
-    public <init>(...);
-}
+# Anything less causes issues like not finding primary constructor in ReflectionDiffer
+-keep class org.fdroid.** {*;}
 
 # Logging
 -keep class ch.qos.logback.classic.android.LogcatAppender
 -keepclassmembers class ch.qos.logback.** { *; }
 -keepclassmembers class  org.slf4j.impl.** { *; }
+
+# Needed for instrumentation tests (for some werid inexplicable reason)
+-keep class kotlin.LazyKt
+-keep class kotlin.collections.CollectionsKt
+
+# for debugging (comment in when needed)
+#-printconfiguration build/outputs/logs/r8-configuration.txt
diff --git a/next/src/androidTest/java/org/fdroid/install/ApkFileProviderTest.kt b/app/src/androidTest/java/org/fdroid/install/ApkFileProviderTest.kt
similarity index 100%
rename from next/src/androidTest/java/org/fdroid/install/ApkFileProviderTest.kt
rename to app/src/androidTest/java/org/fdroid/install/ApkFileProviderTest.kt
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1b189c0d..cf22d92b6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,350 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Copyright (C) 2010-2012 Ciaran Gultnieks
- * Copyright (C) 2013-2017 Peter Serwylo
- * Copyright (C) 2014-2015 Daniel Martí
- * Copyright (C) 2014-2018 Hans-Christoph Steiner
- * Copyright (C) 2016 Dominik Schürmann
- * Copyright (C) 2018 Torsten Grote
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:installLocation="auto">
-
-    <supports-screens
-        android:anyDensity="true"
-        android:largeScreens="true"
-        android:normalScreens="true"
-        android:resizeable="true"
-        android:smallScreens="true"
-        android:xlargeScreens="true" />
-
-    <uses-feature
-        android:name="android.hardware.telephony"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.wifi"
-        android:required="false" />
-
-    <uses-feature
-        android:name="android.hardware.touchscreen"
-        android:required="false" />
+    xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
-    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28" />
-    <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission
-        android:name="android.permission.QUERY_ALL_PACKAGES"
-        tools:ignore="QueryAllPackagesPermission" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.ENFORCE_UPDATE_OWNERSHIP" />
 
-    <!-- Permission used to externally trigger repository updates -->
-    <permission
-        android:name="${applicationId}.permission.UPDATE_REPOS"
-        android:protectionLevel="signature|privileged" />
-    <uses-permission android:name="${applicationId}.permission.UPDATE_REPOS" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE"
+        tools:ignore="ForegroundServicesPolicy" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+
+    <uses-permission
+        android:name="android.permission.REQUEST_INSTALL_PACKAGES"
+        tools:ignore="RequestInstallPackagesPolicy" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.ENFORCE_UPDATE_OWNERSHIP" />
+    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
 
     <application
-        android:name=".FDroidApp"
+        android:name="org.fdroid.App"
         android:allowBackup="true"
-        android:dataExtractionRules="@xml/backup_extraction_rules"
-        android:description="@string/app_description"
-        android:fullBackupContent="@xml/backup_rules"
-        android:hardwareAccelerated="true"
+        android:enableOnBackInvokedCallback="true"
         android:icon="@drawable/ic_launcher"
-        android:label="${applicationLabel}"
+        android:label="@string/app_name"
         android:localeConfig="@xml/locales_config"
-        android:memtagMode="async"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
-        android:theme="@style/Theme.App">
-
+        android:theme="@style/Theme.Fdroidclient"
+        tools:targetApi="33">
         <activity
-            android:name=".privileged.views.InstallConfirmActivity"
-            android:configChanges="layoutDirection|locale"
-            android:excludeFromRecents="true"
-            android:label="@string/menu_install"
-            android:parentActivityName=".views.main.MainActivity" />
-
-        <activity
-            android:name=".privileged.views.UninstallDialogActivity"
-            android:excludeFromRecents="true" />
-
-        <activity
-            android:name=".views.repos.ManageReposActivity"
-            android:configChanges="layoutDirection|locale"
-            android:label="@string/menu_manage"
-            android:launchMode="singleTask"
-            android:parentActivityName=".views.main.MainActivity"/>
-
-        <activity
-            android:name=".views.repos.AddRepoActivity"
+            android:name="org.fdroid.MainActivity"
             android:exported="true"
-            android:launchMode="singleInstance"
-            android:windowSoftInputMode="adjustResize"
-            android:parentActivityName=".views.main.MainActivity">
-
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-                <data android:host="fdroid.link" />
-            </intent-filter>
-
-            <!-- Repo URLs -->
-
-            <!--
-            This intent serves two purposes: Swapping apps between devices and adding a
-            repo from a website (e.g. https://guardianproject.info/fdroid/repo).
-            We intercept both of these situations in the FDroid activity, and then redirect
-            to the appropriate handler (swap handling, manage repos respectively) from there.
-
-            The reason for this is that the only differentiating factor is the presence
-            of a "swap=1" in the query string, and intent-filter is unable to deal with
-            query parameters. An alternative would be to do something like fdroidswap:// as
-            a scheme, but then we need to copy/paste all of this intent-filter stuff and
-            keep it up to date when it changes or a bug is found.
-
-            This filter supports HTTP and HTTPS schemes. There is an additional filter for
-            fdroidrepo:// and fdroidrepos://
-            -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <!--
-                Android's scheme matcher is case-sensitive, so include
-                ALL CAPS versions to support ALL CAPS URLs in QR Codes.
-                QR Codes have a special ALL CAPS mode that uses a reduced
-                character set, making for more compact QR Codes.
-                -->
-                <data android:scheme="fdroidrepo" />
-                <data android:scheme="fdroidrepos" />
-                <data
-                    android:scheme="FDROIDREPO"
-                    tools:ignore="AppLinkUrlError" />
-                <data android:scheme="fdroidrepos" />
-                <data
-                    android:scheme="FDROIDREPOS"
-                    tools:ignore="AppLinkUrlError" />
-            </intent-filter>
-
-            <!--
-            The below intent filter most likely won't work anymore.
-            Using fdroid.link or fdroidrepos:// scheme is preferred.
-            -->
-
-            <intent-filter android:autoVerify="false">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <!--
-                Android's scheme matcher is case-sensitive, so include
-                ALL CAPS versions to support ALL CAPS URLs in QR Codes.
-                QR Codes have a special ALL CAPS mode that uses a reduced
-                character set, making for more compact QR Codes.
-                -->
-                <data android:scheme="http" />
-                <data
-                    android:scheme="HTTP"
-                    tools:ignore="AppLinkUrlError" />
-                <data android:scheme="https" />
-                <data
-                    android:scheme="HTTPS"
-                    tools:ignore="AppLinkUrlError" />
-
-                <data android:host="*" />
-
-                <!--
-                The pattern matcher here is poorly implemented, in particular the * is
-                non-greedy, so you have to do stupid tricks to match patterns that have
-                repeat characters in them. http://stackoverflow.com/a/8599921/306864
-                -->
-                <data android:path="/fdroid/repo" />
-                <data android:pathPattern="/fdroid/repo/*" />
-                <data android:pathPattern="/.*/fdroid/repo" />
-                <data android:pathPattern="/.*/fdroid/repo/*" />
-                <data android:pathPattern="/.*/.*/fdroid/repo" />
-                <data android:pathPattern="/.*/.*/fdroid/repo/*" />
-                <data android:pathPattern="/.*/.*/.*/fdroid/repo" />
-                <data android:pathPattern="/.*/.*/.*/fdroid/repo/*" />
-                <data android:pathPattern="/.*/.*/.*/.*/fdroid/repo" />
-                <data android:pathPattern="/.*/.*/.*/.*/fdroid/repo/*" />
-                <data android:pathPattern="/.*/.*/.*/.*/.*/fdroid/repo" />
-                <data android:pathPattern="/.*/.*/.*/.*/.*/fdroid/repo/*" />
-                <data android:pathPattern="/.*/.*/.*/.*/.*/.*/fdroid/repo" />
-                <data android:pathPattern="/.*/.*/.*/.*/.*/.*/fdroid/repo/*" />
-                <data android:path="/fdroid/archive" />
-                <data android:pathPattern="/fdroid/archive/*" />
-                <data android:pathPattern="/.*/fdroid/archive" />
-                <data android:pathPattern="/.*/fdroid/archive/*" />
-                <data android:pathPattern="/.*/.*/fdroid/archive" />
-                <data android:pathPattern="/.*/.*/fdroid/archive/*" />
-                <data android:pathPattern="/.*/.*/.*/fdroid/archive" />
-                <data android:pathPattern="/.*/.*/.*/fdroid/archive/*" />
-                <data android:pathPattern="/.*/.*/.*/.*/fdroid/archive" />
-                <data android:pathPattern="/.*/.*/.*/.*/fdroid/archive/*" />
-                <!--
-                Some QR Code scanners don't respect custom schemes like fdroidrepo://,
-                so this is a workaround, since the local repo URL is all uppercase in
-                the QR Code for sending the local repo to another device.
-                -->
-                <data android:path="/FDROID/REPO" />
-                <data android:pathPattern="/.*/FDROID/REPO" />
-                <data android:pathPattern="/.*/.*/FDROID/REPO" />
-                <data android:pathPattern="/.*/.*/.*/FDROID/REPO" />
-            </intent-filter>
-
-            <intent-filter android:label="@string/repo_add_new_title">
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".views.IpfsGatewaySettingsActivity"
-            android:configChanges="layoutDirection|locale"
-            android:label="@string/ipfsgw_title"
-            android:launchMode="singleTask"
-            android:parentActivityName=".views.main.MainActivity"></activity>
-
-        <activity
-            android:name=".views.IpfsGatewayAddActivity"
-            android:launchMode="singleTask"
-            android:parentActivityName=".views.main.MainActivity" />
-
-        <activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            android:screenOrientation="fullSensor"
-            tools:replace="screenOrientation" />
-
-        <activity
-            android:name=".views.repos.RepoDetailsActivity"
-            android:configChanges="layoutDirection|locale"
-            android:label="@string/repo_details"
-            android:parentActivityName=".views.repos.ManageReposActivity"
-            android:windowSoftInputMode="stateHidden"/>
-
-        <activity
-            android:name=".views.AppDetailsActivity"
-            android:configChanges="layoutDirection|locale"
-            android:exported="true"
-            android:label="@string/app_details"
-            android:parentActivityName=".views.main.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.SHOW_APP_INFO" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".views.ScreenShotsActivity" />
-
-        <activity
-            android:name=".data.ObbUrlActivity"
-            android:theme="@android:style/Theme.NoDisplay" />
-
-        <activity
-            android:name=".installer.DefaultInstallerActivity"
-            android:theme="@style/Theme.App.Transparent" />
-        <activity
-            android:name=".installer.ErrorDialogActivity"
-            android:theme="@style/Theme.App.Transparent" />
-
-        <activity
-            android:name=".views.main.MainActivity"
             android:launchMode="singleTop"
-            android:windowSoftInputMode="adjustResize"
-            android:exported="true">
+            android:theme="@style/Theme.Fdroidclient"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.APP_MARKET" />
                 <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.APP_MARKET" />
             </intent-filter>
-
-
-            <!-- App URLs -->
-
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="fdroid.app" />
+                <action android:name="android.intent.action.SHOW_APP_INFO" />
             </intent-filter>
-
-            <intent-filter android:autoVerify="false">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-                <data android:host="f-droid.org" />
-                <data android:host="www.f-droid.org" />
-                <data android:host="staging.f-droid.org" />
-                <data android:host="cloudflare.f-droid.org" />
-                <data android:pathPrefix="/app/" />
-                <data android:pathPrefix="/packages/" />
-                <data android:pathPrefix="/repository/browse" />
-                <!-- support localized URLs -->
-                <data android:pathPattern="/.*/packages/.*" />
-                <data android:pathPattern="/.*/packages/.*/" />
-            </intent-filter>
-
-            <intent-filter android:autoVerify="false">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:host="f-droid.org" />
-                <data android:host="www.f-droid.org" />
-                <data android:host="staging.f-droid.org" />
-                <data android:host="cloudflare.f-droid.org" />
-                <data android:pathPrefix="/app/" />
-                <data android:pathPrefix="/packages/" />
-                <data android:pathPrefix="/repository/browse" />
-                <!-- support localized URLs -->
-                <data android:pathPattern="/.*/packages/.*" />
-                <data android:pathPattern="/.*/packages/.*/" />
-            </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -356,192 +55,75 @@
                     android:scheme="market" />
             </intent-filter>
 
-            <intent-filter android:autoVerify="false">
+            <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
                 <data android:scheme="https" />
-                <data android:host="play.google.com" /> <!-- they don't do www. -->
-                <data android:path="/store/apps/details" />
+                <data android:host="f-droid.org" />
+                <data android:host="staging.f-droid.org" />
+                <data android:host="cloudflare.f-droid.org" />
+                <data android:pathPrefix="/packages/" />
+                <data android:pathPattern="/.*/packages/.*" />
             </intent-filter>
 
+            <!-- Repo URLs -->
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="fdroid.link" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
 
+                <data android:scheme="fdroidrepos" />
                 <data
-                    android:host="apps"
-                    android:path="/android"
-                    android:scheme="amzn" />
+                    android:scheme="FDROIDREPOS"
+                    tools:ignore="AppLinkUrlError" />
             </intent-filter>
-
-            <intent-filter android:autoVerify="false">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="amazon.com" />
-                <data android:host="www.amazon.com" />
-                <data android:path="/gp/mas/dl/android" />
-            </intent-filter>
-
-
-            <!-- Search URLs -->
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="fdroid.search" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="search"
-                    android:scheme="market" />
-            </intent-filter>
-
-            <intent-filter android:autoVerify="false">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="play.google.com" /> <!-- they don't do www. -->
-                <data android:path="/store/search" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-
-            <!-- Handle NFC tags detected from outside our application -->
-
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
-
         </activity>
-        <activity android:name=".views.apps.AppListActivity" />
         <activity
-            android:name=".views.installed.InstalledAppsActivity"
-            android:parentActivityName=".views.main.MainActivity"></activity>
+            android:name="org.fdroid.ui.crash.CrashActivity"
+            android:excludeFromRecents="true"
+            android:finishOnTaskLaunch="true"
+            android:launchMode="singleInstance"
+            android:process=":acra"
+            android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".views.InstallHistoryActivity"
-            android:parentActivityName=".views.main.MainActivity"></activity>
-
-        <activity
-            android:name=".installer.FileInstallerActivity"
-            android:theme="@style/Theme.App.Transparent" />
-
-        <provider
-            android:name="org.fdroid.fdroid.installer.ApkFileProvider"
-            android:authorities="${applicationId}.installer.ApkFileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/apk_file_provider" />
-        </provider>
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.installer"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/installer_file_provider" />
-        </provider>
-        <provider
-            android:name="org.fdroid.fdroid.nearby.PublicSourceDirProvider"
-            android:authorities="${applicationId}.nearby.PublicSourceDirProvider"
-            android:exported="false"
-            android:grantUriPermissions="true" />
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="remove"></provider>
-
-        <receiver
-            android:name=".receiver.StartupReceiver"
-            android:exported="false">
-            <intent-filter>
-                <!-- Implicit Broadcast Exception
-                https://developer.android.com/guide/components/broadcast-exceptions -->
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-
-                <category android:name="android.intent.category.HOME" />
-            </intent-filter>
-        </receiver>
-        <receiver
-            android:name=".NotificationBroadcastReceiver"
-            android:exported="false">
-            <!-- Doesn't require an intent-filter because it is explicitly invoked via Intent.setClass() -->
-        </receiver>
-        <receiver android:name=".receiver.RepoUpdateReceiver"
-            android:exported="true"
-            android:permission="${applicationId}.permission.UPDATE_REPOS">
-            <intent-filter>
-                <action android:name="org.fdroid.action.UPDATE_REPOS" />
-            </intent-filter>
-        </receiver>
-        <receiver
-            android:name=".receiver.UnarchivePackageReceiver"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.UNARCHIVE_PACKAGE" />
-            </intent-filter>
-        </receiver>
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="fullSensor"
+            tools:ignore="DiscouragedApi"
+            tools:replace="screenOrientation" />
 
         <service
-            android:name=".net.DownloaderService"
+            android:name="org.fdroid.install.AppInstallService"
             android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-        <service
-            android:name=".installer.InstallerService"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
+            android:foregroundServiceType="dataSync" />
         <!-- needed for declaring foregroundServiceType for WorkManager -->
         <service
             android:name="androidx.work.impl.foreground.SystemForegroundService"
             android:foregroundServiceType="dataSync"
             tools:node="merge" />
-        <service
-            android:name=".DeleteCacheService"
+        <provider
+            android:name="org.fdroid.install.ApkFileProvider"
+            android:authorities="${applicationId}.install.ApkFileProvider"
             android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
-        <service
-            android:name=".net.ConnectivityMonitorService"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
-        <service
-            android:name=".installer.InstallHistoryService"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-        <service
-            android:name=".installer.ObfInstallerService"
-            android:exported="false" />
-
+            android:grantUriPermissions="true" />
+        <!-- disable WorkManager initialization, needed for Hilt -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
     </application>
 
 </manifest>
diff --git a/next/src/main/assets/default_repos.json b/app/src/main/assets/default_repos.json
similarity index 100%
rename from next/src/main/assets/default_repos.json
rename to app/src/main/assets/default_repos.json
diff --git a/next/src/main/assets/most_downloaded_apps.json b/app/src/main/assets/most_downloaded_apps.json
similarity index 100%
rename from next/src/main/assets/most_downloaded_apps.json
rename to app/src/main/assets/most_downloaded_apps.json
diff --git a/next/src/main/kotlin/org/fdroid/App.kt b/app/src/main/kotlin/org/fdroid/App.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/App.kt
rename to app/src/main/kotlin/org/fdroid/App.kt
diff --git a/next/src/main/kotlin/org/fdroid/MainActivity.kt b/app/src/main/kotlin/org/fdroid/MainActivity.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/MainActivity.kt
rename to app/src/main/kotlin/org/fdroid/MainActivity.kt
diff --git a/next/src/main/kotlin/org/fdroid/NotificationManager.kt b/app/src/main/kotlin/org/fdroid/NotificationManager.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/NotificationManager.kt
rename to app/src/main/kotlin/org/fdroid/NotificationManager.kt
diff --git a/next/src/main/kotlin/org/fdroid/db/DatabaseModule.kt b/app/src/main/kotlin/org/fdroid/db/DatabaseModule.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/db/DatabaseModule.kt
rename to app/src/main/kotlin/org/fdroid/db/DatabaseModule.kt
diff --git a/next/src/main/kotlin/org/fdroid/db/InitialData.kt b/app/src/main/kotlin/org/fdroid/db/InitialData.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/db/InitialData.kt
rename to app/src/main/kotlin/org/fdroid/db/InitialData.kt
diff --git a/next/src/main/kotlin/org/fdroid/download/DownloadModule.kt b/app/src/main/kotlin/org/fdroid/download/DownloadModule.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/download/DownloadModule.kt
rename to app/src/main/kotlin/org/fdroid/download/DownloadModule.kt
diff --git a/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt b/app/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
rename to app/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
diff --git a/next/src/main/kotlin/org/fdroid/download/ImageModel.kt b/app/src/main/kotlin/org/fdroid/download/ImageModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/download/ImageModel.kt
rename to app/src/main/kotlin/org/fdroid/download/ImageModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/download/LocalFileDownloader.kt b/app/src/main/kotlin/org/fdroid/download/LocalFileDownloader.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/download/LocalFileDownloader.kt
rename to app/src/main/kotlin/org/fdroid/download/LocalFileDownloader.kt
diff --git a/next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt b/app/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt
rename to app/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt
diff --git a/next/src/main/kotlin/org/fdroid/download/NetworkMonitor.kt b/app/src/main/kotlin/org/fdroid/download/NetworkMonitor.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/download/NetworkMonitor.kt
rename to app/src/main/kotlin/org/fdroid/download/NetworkMonitor.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/ApkFileProvider.kt b/app/src/main/kotlin/org/fdroid/install/ApkFileProvider.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/ApkFileProvider.kt
rename to app/src/main/kotlin/org/fdroid/install/ApkFileProvider.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallListener.kt b/app/src/main/kotlin/org/fdroid/install/AppInstallListener.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/AppInstallListener.kt
rename to app/src/main/kotlin/org/fdroid/install/AppInstallListener.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt b/app/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
rename to app/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt b/app/src/main/kotlin/org/fdroid/install/AppInstallService.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/AppInstallService.kt
rename to app/src/main/kotlin/org/fdroid/install/AppInstallService.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/CacheCleaner.kt b/app/src/main/kotlin/org/fdroid/install/CacheCleaner.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/CacheCleaner.kt
rename to app/src/main/kotlin/org/fdroid/install/CacheCleaner.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt b/app/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt
rename to app/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt b/app/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
rename to app/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallState.kt b/app/src/main/kotlin/org/fdroid/install/InstallState.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/InstallState.kt
rename to app/src/main/kotlin/org/fdroid/install/InstallState.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt b/app/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt
rename to app/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt b/app/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt
rename to app/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt b/app/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
rename to app/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoPreLoader.kt b/app/src/main/kotlin/org/fdroid/repo/RepoPreLoader.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/repo/RepoPreLoader.kt
rename to app/src/main/kotlin/org/fdroid/repo/RepoPreLoader.kt
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt b/app/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
rename to app/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt b/app/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
rename to app/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt b/app/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt
rename to app/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt
diff --git a/next/src/main/kotlin/org/fdroid/settings/OnboardingManager.kt b/app/src/main/kotlin/org/fdroid/settings/OnboardingManager.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/settings/OnboardingManager.kt
rename to app/src/main/kotlin/org/fdroid/settings/OnboardingManager.kt
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt b/app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
rename to app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/app/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
rename to app/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/About.kt b/app/src/main/kotlin/org/fdroid/ui/About.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/About.kt
rename to app/src/main/kotlin/org/fdroid/ui/About.kt
diff --git a/app/src/main/kotlin/org/fdroid/ui/Color.kt b/app/src/main/kotlin/org/fdroid/ui/Color.kt
new file mode 100644
index 000000000..6a99b02da
--- /dev/null
+++ b/app/src/main/kotlin/org/fdroid/ui/Color.kt
@@ -0,0 +1,78 @@
+package org.fdroid.ui
+
+import androidx.compose.ui.graphics.Color
+
+// Generated by the Material Theme Builder from fdroid_blue and fdroid_green
+// https://www.figma.com/community/plugin/1034969338659738588
+
+val primaryLight = Color(0xFF005197)
+val onPrimaryLight = Color(0xFFFFFFFF)
+val primaryContainerLight = Color(0xFF1976D2)
+val onPrimaryContainerLight = Color(0xFFFFFFFF)
+val secondaryLight = Color(0xFF4F6600)
+val onSecondaryLight = Color(0xFFFFFFFF)
+val secondaryContainerLight = Color(0xFF95BC18)
+val onSecondaryContainerLight = Color(0xFF1C2700)
+val tertiaryLight = Color(0xFF763192)
+val onTertiaryLight = Color(0xFFFFFFFF)
+val tertiaryContainerLight = Color(0xFF9F58BA)
+val onTertiaryContainerLight = Color(0xFFFFFFFF)
+val errorLight = Color(0xFFBA1A1A)
+val onErrorLight = Color(0xFFFFFFFF)
+val errorContainerLight = Color(0xFFFFDAD6)
+val onErrorContainerLight = Color(0xFF410002)
+val backgroundLight = Color(0xFFF9F9FF)
+val onBackgroundLight = Color(0xFF181C21)
+val surfaceLight = Color(0xFFF9F9FF)
+val onSurfaceLight = Color(0xFF181C21)
+val surfaceVariantLight = Color(0xFFDDE2F0)
+val onSurfaceVariantLight = Color(0xFF414752)
+val outlineLight = Color(0xFF717783)
+val outlineVariantLight = Color(0xFFC1C6D4)
+val scrimLight = Color(0xFF000000)
+val inverseSurfaceLight = Color(0xFF2D3037)
+val inverseOnSurfaceLight = Color(0xFFEFF0F9)
+val inversePrimaryLight = Color(0xFFA5C8FF)
+val surfaceDimLight = Color(0xFFD8DAE2)
+val surfaceBrightLight = Color(0xFFF9F9FF)
+val surfaceContainerLowestLight = Color(0xFFFFFFFF)
+val surfaceContainerLowLight = Color(0xFFF2F3FC)
+val surfaceContainerLight = Color(0xFFECEDF6)
+val surfaceContainerHighLight = Color(0xFFE6E8F0)
+val surfaceContainerHighestLight = Color(0xFFE0E2EA)
+
+val primaryDark = Color(0xFFA5C8FF)
+val onPrimaryDark = Color(0xFF00315F)
+val primaryContainerDark = Color(0xFF006DC7)
+val onPrimaryContainerDark = Color(0xFFFFFFFF)
+val secondaryDark = Color(0xFFADD535)
+val onSecondaryDark = Color(0xFF283500)
+val secondaryContainerDark = Color(0xFF83A800)
+val onSecondaryContainerDark = Color(0xFF080D00)
+val tertiaryDark = Color(0xFFEDB1FF)
+val onTertiaryDark = Color(0xFF52046E)
+val tertiaryContainerDark = Color(0xFF954FB0)
+val onTertiaryContainerDark = Color(0xFFFFFFFF)
+val errorDark = Color(0xFFFFB4AB)
+val onErrorDark = Color(0xFF690005)
+val errorContainerDark = Color(0xFF93000A)
+val onErrorContainerDark = Color(0xFFFFDAD6)
+val backgroundDark = Color.Black // changed
+val onBackgroundDark = Color(0xFFE0E2EA)
+val surfaceDark = Color(0xff1e1e1e) // changed
+val onSurfaceDark = Color(0xFFE0E2EA)
+val surfaceVariantDark = Color(0xFF414752)
+val onSurfaceVariantDark = Color(0xFFC1C6D4)
+val outlineDark = Color(0xFF8B919E)
+val outlineVariantDark = Color(0xFF414752)
+val scrimDark = Color(0xFF000000)
+val inverseSurfaceDark = Color(0xFFE0E2EA)
+val inverseOnSurfaceDark = Color(0xFF2D3037)
+val inversePrimaryDark = Color(0xFF005FAF)
+val surfaceDimDark = Color(0xFF101319)
+val surfaceBrightDark = Color(0xFF363940)
+val surfaceContainerLowestDark = Color(0xFF0B0E14)
+val surfaceContainerLowDark = Color(0xFF181C21)
+val surfaceContainerDark = Color(0xFF1C2026)
+val surfaceContainerHighDark = Color(0xFF272A30)
+val surfaceContainerHighestDark = Color(0xFF32353B)
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/app/src/main/kotlin/org/fdroid/ui/Main.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/Main.kt
rename to app/src/main/kotlin/org/fdroid/ui/Main.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/MainViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/MainViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/MainViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/MainViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/Theme.kt b/app/src/main/kotlin/org/fdroid/ui/Theme.kt
similarity index 52%
rename from next/src/main/kotlin/org/fdroid/ui/Theme.kt
rename to app/src/main/kotlin/org/fdroid/ui/Theme.kt
index bde49f2b8..815c2f7ef 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Theme.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/Theme.kt
@@ -9,76 +9,7 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
-import org.fdroid.fdroid.ui.theme.backgroundLight
-import org.fdroid.fdroid.ui.theme.errorContainerDark
-import org.fdroid.fdroid.ui.theme.errorContainerLight
-import org.fdroid.fdroid.ui.theme.errorDark
-import org.fdroid.fdroid.ui.theme.errorLight
-import org.fdroid.fdroid.ui.theme.inverseOnSurfaceDark
-import org.fdroid.fdroid.ui.theme.inverseOnSurfaceLight
-import org.fdroid.fdroid.ui.theme.inversePrimaryDark
-import org.fdroid.fdroid.ui.theme.inversePrimaryLight
-import org.fdroid.fdroid.ui.theme.inverseSurfaceDark
-import org.fdroid.fdroid.ui.theme.inverseSurfaceLight
-import org.fdroid.fdroid.ui.theme.onBackgroundDark
-import org.fdroid.fdroid.ui.theme.onBackgroundLight
-import org.fdroid.fdroid.ui.theme.onErrorContainerDark
-import org.fdroid.fdroid.ui.theme.onErrorContainerLight
-import org.fdroid.fdroid.ui.theme.onErrorDark
-import org.fdroid.fdroid.ui.theme.onErrorLight
-import org.fdroid.fdroid.ui.theme.onPrimaryContainerDark
-import org.fdroid.fdroid.ui.theme.onPrimaryContainerLight
-import org.fdroid.fdroid.ui.theme.onPrimaryDark
-import org.fdroid.fdroid.ui.theme.onPrimaryLight
-import org.fdroid.fdroid.ui.theme.onSecondaryContainerDark
-import org.fdroid.fdroid.ui.theme.onSecondaryContainerLight
-import org.fdroid.fdroid.ui.theme.onSecondaryDark
-import org.fdroid.fdroid.ui.theme.onSecondaryLight
-import org.fdroid.fdroid.ui.theme.onSurfaceDark
-import org.fdroid.fdroid.ui.theme.onSurfaceLight
-import org.fdroid.fdroid.ui.theme.onSurfaceVariantDark
-import org.fdroid.fdroid.ui.theme.onSurfaceVariantLight
-import org.fdroid.fdroid.ui.theme.onTertiaryContainerDark
-import org.fdroid.fdroid.ui.theme.onTertiaryContainerLight
-import org.fdroid.fdroid.ui.theme.onTertiaryDark
-import org.fdroid.fdroid.ui.theme.onTertiaryLight
-import org.fdroid.fdroid.ui.theme.outlineDark
-import org.fdroid.fdroid.ui.theme.outlineLight
-import org.fdroid.fdroid.ui.theme.outlineVariantDark
-import org.fdroid.fdroid.ui.theme.outlineVariantLight
-import org.fdroid.fdroid.ui.theme.primaryContainerDark
-import org.fdroid.fdroid.ui.theme.primaryContainerLight
-import org.fdroid.fdroid.ui.theme.primaryDark
-import org.fdroid.fdroid.ui.theme.primaryLight
-import org.fdroid.fdroid.ui.theme.scrimDark
-import org.fdroid.fdroid.ui.theme.scrimLight
-import org.fdroid.fdroid.ui.theme.secondaryContainerDark
-import org.fdroid.fdroid.ui.theme.secondaryContainerLight
-import org.fdroid.fdroid.ui.theme.secondaryDark
-import org.fdroid.fdroid.ui.theme.secondaryLight
-import org.fdroid.fdroid.ui.theme.surfaceBrightDark
-import org.fdroid.fdroid.ui.theme.surfaceBrightLight
-import org.fdroid.fdroid.ui.theme.surfaceContainerDark
-import org.fdroid.fdroid.ui.theme.surfaceContainerHighDark
-import org.fdroid.fdroid.ui.theme.surfaceContainerHighLight
-import org.fdroid.fdroid.ui.theme.surfaceContainerHighestDark
-import org.fdroid.fdroid.ui.theme.surfaceContainerHighestLight
-import org.fdroid.fdroid.ui.theme.surfaceContainerLight
-import org.fdroid.fdroid.ui.theme.surfaceContainerLowDark
-import org.fdroid.fdroid.ui.theme.surfaceContainerLowLight
-import org.fdroid.fdroid.ui.theme.surfaceContainerLowestDark
-import org.fdroid.fdroid.ui.theme.surfaceContainerLowestLight
-import org.fdroid.fdroid.ui.theme.surfaceDimDark
-import org.fdroid.fdroid.ui.theme.surfaceDimLight
-import org.fdroid.fdroid.ui.theme.surfaceLight
-import org.fdroid.fdroid.ui.theme.surfaceVariantDark
-import org.fdroid.fdroid.ui.theme.surfaceVariantLight
-import org.fdroid.fdroid.ui.theme.tertiaryContainerDark
-import org.fdroid.fdroid.ui.theme.tertiaryContainerLight
-import org.fdroid.fdroid.ui.theme.tertiaryDark
-import org.fdroid.fdroid.ui.theme.tertiaryLight
 
 // The followings are generated by the Material Theme Builder with modifications
 // https://www.figma.com/community/plugin/1034969338659738588
@@ -139,9 +70,9 @@ private val darkScheme = darkColorScheme(
     onError = onErrorDark,
     errorContainer = errorContainerDark,
     onErrorContainer = onErrorContainerDark,
-    background = Color.Black, // TODO
+    background = backgroundDark,
     onBackground = onBackgroundDark,
-    surface = Color(0xff1e1e1e), // TODO
+    surface = surfaceDark,
     onSurface = onSurfaceDark,
     surfaceVariant = surfaceVariantDark,
     onSurfaceVariant = onSurfaceVariantDark,
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/IgnoreIssueDialog.kt b/app/src/main/kotlin/org/fdroid/ui/apps/IgnoreIssueDialog.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/IgnoreIssueDialog.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/IgnoreIssueDialog.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt b/app/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt b/app/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsEntry.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsEntry.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/MyAppsEntry.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/MyAppsEntry.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt b/app/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt b/app/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt b/app/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
rename to app/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt b/app/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
rename to app/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt b/app/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
rename to app/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt b/app/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
rename to app/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/crash/Crash.kt b/app/src/main/kotlin/org/fdroid/ui/crash/Crash.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/crash/Crash.kt
rename to app/src/main/kotlin/org/fdroid/ui/crash/Crash.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt b/app/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt
rename to app/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt b/app/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt
rename to app/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt b/app/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsEntry.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsEntry.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsEntry.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsEntry.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt b/app/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt b/app/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt b/app/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt b/app/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt b/app/src/main/kotlin/org/fdroid/ui/details/Versions.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/Versions.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt b/app/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt b/app/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt b/app/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/app/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt b/app/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt b/app/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/SearchResults.kt b/app/src/main/kotlin/org/fdroid/ui/discover/SearchResults.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/SearchResults.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/SearchResults.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/icons/License.kt b/app/src/main/kotlin/org/fdroid/ui/icons/License.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/icons/License.kt
rename to app/src/main/kotlin/org/fdroid/ui/icons/License.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt b/app/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt
rename to app/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListEntry.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListEntry.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppListEntry.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppListEntry.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListInfo.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListInfo.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppListInfo.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppListInfo.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt b/app/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt b/app/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt
rename to app/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/navigation/IntentRouter.kt b/app/src/main/kotlin/org/fdroid/ui/navigation/IntentRouter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/navigation/IntentRouter.kt
rename to app/src/main/kotlin/org/fdroid/ui/navigation/IntentRouter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt b/app/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt
rename to app/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/navigation/NavigationState.kt b/app/src/main/kotlin/org/fdroid/ui/navigation/NavigationState.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/navigation/NavigationState.kt
rename to app/src/main/kotlin/org/fdroid/ui/navigation/NavigationState.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/navigation/Navigator.kt b/app/src/main/kotlin/org/fdroid/ui/navigation/Navigator.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/navigation/Navigator.kt
rename to app/src/main/kotlin/org/fdroid/ui/navigation/Navigator.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepoEntry.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepoEntry.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepoEntry.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepoEntry.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/DeleteDialog.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/DeleteDialog.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/DeleteDialog.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/DeleteDialog.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/QrCodeDialog.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/QrCodeDialog.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/QrCodeDialog.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/QrCodeDialog.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt b/app/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt
rename to app/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt b/app/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
rename to app/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsModel.kt b/app/src/main/kotlin/org/fdroid/ui/settings/SettingsModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/settings/SettingsModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/settings/SettingsModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt b/app/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt b/app/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt b/app/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt b/app/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/ExpandIcon.kt b/app/src/main/kotlin/org/fdroid/ui/utils/ExpandIcon.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/ExpandIcon.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/ExpandIcon.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt b/app/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/FDroidButton.kt b/app/src/main/kotlin/org/fdroid/ui/utils/FDroidButton.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/FDroidButton.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/FDroidButton.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt b/app/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/MeteredConnectionDialog.kt b/app/src/main/kotlin/org/fdroid/ui/utils/MeteredConnectionDialog.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/MeteredConnectionDialog.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/MeteredConnectionDialog.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/OfflineBar.kt b/app/src/main/kotlin/org/fdroid/ui/utils/OfflineBar.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/OfflineBar.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/OfflineBar.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt b/app/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/app/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt b/app/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
diff --git a/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt b/app/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
rename to app/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt b/app/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt
rename to app/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/app/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
rename to app/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt b/app/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt
rename to app/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt
diff --git a/next/src/main/kotlin/org/fdroid/utils/CoroutinesScopesModule.kt b/app/src/main/kotlin/org/fdroid/utils/CoroutinesScopesModule.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/utils/CoroutinesScopesModule.kt
rename to app/src/main/kotlin/org/fdroid/utils/CoroutinesScopesModule.kt
diff --git a/next/src/main/kotlin/org/fdroid/utils/Utils.kt b/app/src/main/kotlin/org/fdroid/utils/Utils.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/utils/Utils.kt
rename to app/src/main/kotlin/org/fdroid/utils/Utils.kt
diff --git a/next/src/main/res/drawable/ic_crash.xml b/app/src/main/res/drawable/ic_crash.xml
similarity index 100%
rename from next/src/main/res/drawable/ic_crash.xml
rename to app/src/main/res/drawable/ic_crash.xml
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_launcher.png
rename to app/src/main/res/drawable/ic_launcher.png
diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml
index ecba10fa2..53951dfa5 100644
--- a/app/src/main/res/drawable/ic_notification.xml
+++ b/app/src/main/res/drawable/ic_notification.xml
@@ -1,6 +1,6 @@
 <vector android:height="24dp"
     android:viewportHeight="48.0"
-    android:tint="?attr/colorControlNormal"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="48.0"
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
index e9b1ec853..15e746762 100644
--- a/app/src/main/res/drawable/ic_refresh.xml
+++ b/app/src/main/res/drawable/ic_refresh.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/next/src/main/res/drawable/ic_repo_app_default.xml b/app/src/main/res/drawable/ic_repo_app_default.xml
similarity index 100%
rename from next/src/main/res/drawable/ic_repo_app_default.xml
rename to app/src/main/res/drawable/ic_repo_app_default.xml
diff --git a/next/src/main/res/drawable/screenshots_placeholder.png b/app/src/main/res/drawable/screenshots_placeholder.png
similarity index 100%
rename from next/src/main/res/drawable/screenshots_placeholder.png
rename to app/src/main/res/drawable/screenshots_placeholder.png
diff --git a/next/src/main/res/values/strings-next.xml b/app/src/main/res/values/strings-next.xml
similarity index 100%
rename from next/src/main/res/values/strings-next.xml
rename to app/src/main/res/values/strings-next.xml
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 90c68bdeb..6e59254a1 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,134 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!--
-~ Copyright (C) 2019 The Android Open Source Project
-~
-~ Licensed under the Apache License, Version 2.0 (the "License");
-~ you may not use this file except in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~      http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing, software
-~ distributed under the License is distributed on an "AS IS" BASIS,
-~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ See the License for the specific language governing permissions and
-~ limitations under the License.
--->
-
-<!-- Generated by the Material Theme Builder with modifications-->
-<!-- https://www.figma.com/community/plugin/1034969338659738588&ndash;&gt;-->
 <resources>
 
-    <style name="Base.Theme.App" parent="Theme.Material3.DayNight.NoActionBar">
-        <!--Material shape attributes-->
-        <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.App.SmallComponent</item>
-        <item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.App.MediumComponent
-        </item>
-        <item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.App.LargeComponent</item>
-
-        <item name="borderlessButtonStyle">@style/Widget.App.Button.TextButton</item>
-        <item name="materialButtonOutlinedStyle">@style/Widget.App.Button.OutlinedButton</item>
-        <item name="materialButtonStyle">@style/Widget.App.Button</item>
-        <item name="materialCardViewStyle">@style/Widget.App.CardView</item>
-
-        <!--colorBackground appears behind scrollable content and is used for the default window-->
-        <!--background. colorSurface is mapped to the surface of components such as cards, sheets-->
-        <!--and menus. colorError is used to indicate an error state for components such as-->
-        <!--text fields.-->
-        <item name="appDetailsBackground">#fcfcfc</item>
-        <item name="categoryPreviewAppCardBackground">
-            @drawable/category_preview_app_card_background_light
-        </item>
-        <item name="detailPanel">?attr/colorSurfaceContainerHighest</item>
-        <item name="antiFeaturesWarning">@drawable/ic_warning</item>
-        <item name="backButtonDrawable">@drawable/abc_ic_ab_back_material</item>
-        <item name="clearButtonDrawable">@drawable/ic_close</item>
-
-        <item name="bottomNavigationStyle">@style/Widget.App.BottomNavigationView</item>
-        <item name="floatingActionButtonStyle">@style/Widget.App.FloatingActionButton</item>
-        <item name="mainTabSwapSplashTint">?attr/colorSurfaceDim</item>
-        <item name="warning">?attr/colorTertiaryContainer</item>
-        <item name="categoryName">#4a4a4a</item>
-        <item name="installedApps">#424242</item>
-        <item name="appListItem">#424242</item>
-        <item name="lightGrayTextColor">#4a4a4a</item>
-        <item name="preferenceTheme">@style/ThemeOverlay.App.Preference</item>
-        <item name="appDetailsAntiFeatureIconColor">#000000</item>
-
-        <item name="iconBackgroundColor">#801976D2</item>
-
-        <item name="screenshotPlaceholderIconColor">#e8e8e8</item>
-
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
-
-        <!-- Adjust androidx.preference dialogs to follow Material You -->
-        <!-- https://github.com/material-components/material-components-android/issues/2732#issuecomment-1146086018 -->
-        <item name="alertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog</item>
-
-        <item name="colorPrimary">@color/md_theme_primary</item>
-        <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
-        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
-        <item name="colorSecondary">@color/md_theme_secondary</item>
-        <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
-        <item name="colorTertiary">@color/md_theme_tertiary</item>
-        <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
-        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
-        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
-        <item name="colorError">@color/md_theme_error</item>
-        <item name="colorOnError">@color/md_theme_onError</item>
-        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
-        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
-        <item name="android:colorBackground">@color/md_theme_background</item>
-        <item name="colorOnBackground">@color/md_theme_onBackground</item>
-        <item name="colorSurface">@color/md_theme_surface</item>
-        <item name="colorOnSurface">@color/md_theme_onSurface</item>
-        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
-        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
-        <item name="colorOutline">@color/md_theme_outline</item>
-        <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
-        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
-        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
-        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
-        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item>
-        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item>
-        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item>
-        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item>
-        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item>
-        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item>
-        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item>
-        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item>
-        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item>
-        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item>
-        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item>
-        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
-        <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
-    </style>
-
-    <!-- light app theme with accent colors following roughly android design guidelines -->
-    <style name="Theme.App" parent="Base.Theme.App">
-        <!-- customizations that are not API-level specific go here. -->
-    </style>
-
-    <!-- Same as Theme.App except a black background in Dark mode -->
-    <style name="Theme.App.Black" parent="Theme.App" />
-
-    <style name="Theme.App.Transparent" parent="Base.Theme.App">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
+    <style name="Theme.Fdroidclient" parent="Theme.AppCompat.DayNight.NoActionBar" />
 </resources>
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
index cfcccb746..f8b53ef87 100644
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -1,40 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <base-config cleartextTrafficPermitted="true">
-        <trust-anchors>
-            <!-- Trust preinstalled CAs -->
-            <certificates src="system" />
-            <!-- Additionally trust user added CAs -->
-            <certificates src="user" />
-        </trust-anchors>
-    </base-config>
-
-    <domain-config cleartextTrafficPermitted="false">
-        <domain includeSubdomains="true">amazonaws.com</domain>
-        <certificateTransparency enabled="true"/>
-    </domain-config>
-    <domain-config cleartextTrafficPermitted="false">
-        <domain includeSubdomains="true">f-droid.org</domain>
-        <certificateTransparency enabled="true"/>
-    </domain-config>
-    <domain-config cleartextTrafficPermitted="false">
-        <domain includeSubdomains="true">github.com</domain>
-        <certificateTransparency enabled="true"/>
-    </domain-config>
-    <domain-config cleartextTrafficPermitted="false">
-        <domain includeSubdomains="true">githubusercontent.com</domain>
-        <certificateTransparency enabled="true"/>
-    </domain-config>
-    <domain-config cleartextTrafficPermitted="false">
-        <domain includeSubdomains="true">github.io</domain>
-        <certificateTransparency enabled="true"/>
-    </domain-config>
-    <domain-config cleartextTrafficPermitted="false">
-        <domain includeSubdomains="true">gitlab.com</domain>
-        <certificateTransparency enabled="true"/>
-    </domain-config>
-    <domain-config cleartextTrafficPermitted="false">
-        <domain includeSubdomains="true">gitlab.io</domain>
-        <certificateTransparency enabled="true"/>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">onion</domain>
     </domain-config>
 </network-security-config>
diff --git a/next/src/test/java/org/fdroid/ui/details/HtmlDescriptionTest.kt b/app/src/test/java/org/fdroid/ui/details/HtmlDescriptionTest.kt
similarity index 100%
rename from next/src/test/java/org/fdroid/ui/details/HtmlDescriptionTest.kt
rename to app/src/test/java/org/fdroid/ui/details/HtmlDescriptionTest.kt
diff --git a/next/src/test/java/org/fdroid/ui/navigation/IntentRouterTest.kt b/app/src/test/java/org/fdroid/ui/navigation/IntentRouterTest.kt
similarity index 100%
rename from next/src/test/java/org/fdroid/ui/navigation/IntentRouterTest.kt
rename to app/src/test/java/org/fdroid/ui/navigation/IntentRouterTest.kt
diff --git a/app/build.gradle b/legacy/build.gradle
similarity index 100%
rename from app/build.gradle
rename to legacy/build.gradle
diff --git a/app/lint.xml b/legacy/lint.xml
similarity index 100%
rename from app/lint.xml
rename to legacy/lint.xml
diff --git a/legacy/proguard-rules.pro b/legacy/proguard-rules.pro
new file mode 100644
index 000000000..20e22cd98
--- /dev/null
+++ b/legacy/proguard-rules.pro
@@ -0,0 +1,58 @@
+-dontobfuscate
+-dontoptimize
+-keepattributes SourceFile,LineNumberTable,Exceptions
+-keep class org.fdroid.fdroid.** {*;}
+-dontwarn android.test.**
+
+-dontwarn javax.naming.**
+-dontnote org.apache.http.**
+-dontnote android.net.http.**
+-dontnote **ILicensingService
+
+# Needed for espresso https://stackoverflow.com/a/21706087
+-dontwarn org.xmlpull.v1.**
+
+# StrongHttpsClient and its support classes are totally unused, so the
+# ch.boye.httpclientandroidlib.** classes are also unneeded
+-dontwarn info.guardianproject.netcipher.client.**
+
+# These libraries are known to break if minification is enabled on them. They
+# use reflection to instantiate classes, for example. If the keep flags are
+# removed, proguard will strip classes which are required, which may result in
+# crashes.
+-keep class kellinwood.security.zipsigner.** {*;}
+-keep class org.bouncycastle.** {*;}
+
+# This keeps class members used for SystemInstaller IPC.
+#   Reference: https://gitlab.com/fdroid/fdroidclient/issues/79
+-keepclassmembers class * implements android.os.IInterface {
+    public *;
+}
+
+-keepattributes *Annotation*,EnclosingMethod,Signature
+-keepnames class com.fasterxml.jackson.** { *; }
+-dontwarn com.fasterxml.jackson.databind.ext.**
+-keep class org.codehaus.** { *; }
+-keepclassmembers public final enum org.codehaus.jackson.annotate.JsonAutoDetect$Visibility {
+public static final org.codehaus.jackson.annotate.JsonAutoDetect$Visibility *; }
+-keep public class org.fdroid.** {
+  *;
+}
+
+-dontwarn org.bouncycastle.jsse.**
+-dontwarn org.conscrypt.**
+-dontwarn org.openjsse.**
+
+# This is necessary so that RemoteWorkManager can be initialized (also marked with @Keep)
+-keep class androidx.work.multiprocess.RemoteWorkManagerClient {
+    public <init>(...);
+}
+
+-keep class org.acra.config.MailSenderConfiguration {
+    public <init>(...);
+}
+
+# Logging
+-keep class ch.qos.logback.classic.android.LogcatAppender
+-keepclassmembers class ch.qos.logback.** { *; }
+-keepclassmembers class  org.slf4j.impl.** { *; }
diff --git a/app/src/androidTest/AndroidManifest.xml b/legacy/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from app/src/androidTest/AndroidManifest.xml
rename to legacy/src/androidTest/AndroidManifest.xml
diff --git a/app/src/androidTest/assets/org.fdroid.extendedpermissionstest.apk b/legacy/src/androidTest/assets/org.fdroid.extendedpermissionstest.apk
similarity index 100%
rename from app/src/androidTest/assets/org.fdroid.extendedpermissionstest.apk
rename to legacy/src/androidTest/assets/org.fdroid.extendedpermissionstest.apk
diff --git a/app/src/androidTest/assets/org.fdroid.permissions.minmax.apk b/legacy/src/androidTest/assets/org.fdroid.permissions.minmax.apk
similarity index 100%
rename from app/src/androidTest/assets/org.fdroid.permissions.minmax.apk
rename to legacy/src/androidTest/assets/org.fdroid.permissions.minmax.apk
diff --git a/app/src/androidTest/assets/org.fdroid.permissions.minmax.zip b/legacy/src/androidTest/assets/org.fdroid.permissions.minmax.zip
similarity index 100%
rename from app/src/androidTest/assets/org.fdroid.permissions.minmax.zip
rename to legacy/src/androidTest/assets/org.fdroid.permissions.minmax.zip
diff --git a/app/src/androidTest/assets/org.fdroid.permissions.sdk14.apk b/legacy/src/androidTest/assets/org.fdroid.permissions.sdk14.apk
similarity index 100%
rename from app/src/androidTest/assets/org.fdroid.permissions.sdk14.apk
rename to legacy/src/androidTest/assets/org.fdroid.permissions.sdk14.apk
diff --git a/app/src/androidTest/assets/org.fdroid.permissions.sdk14.zip b/legacy/src/androidTest/assets/org.fdroid.permissions.sdk14.zip
similarity index 100%
rename from app/src/androidTest/assets/org.fdroid.permissions.sdk14.zip
rename to legacy/src/androidTest/assets/org.fdroid.permissions.sdk14.zip
diff --git a/app/src/androidTest/assets/simpleIndex.jar b/legacy/src/androidTest/assets/simpleIndex.jar
similarity index 100%
rename from app/src/androidTest/assets/simpleIndex.jar
rename to legacy/src/androidTest/assets/simpleIndex.jar
diff --git a/next/src/androidTest/java/org/fdroid/database/PrimaryConstructorTest.kt b/legacy/src/androidTest/java/org/fdroid/database/PrimaryConstructorTest.kt
similarity index 100%
rename from next/src/androidTest/java/org/fdroid/database/PrimaryConstructorTest.kt
rename to legacy/src/androidTest/java/org/fdroid/database/PrimaryConstructorTest.kt
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/AssetUtils.java b/legacy/src/androidTest/java/org/fdroid/fdroid/AssetUtils.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/AssetUtils.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/AssetUtils.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/LocalizationTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/LocalizationTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/LocalizationTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/LocalizationTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/Netstat.java b/legacy/src/androidTest/java/org/fdroid/fdroid/Netstat.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/Netstat.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/Netstat.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/SystemAnimations.java b/legacy/src/androidTest/java/org/fdroid/fdroid/SystemAnimations.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/SystemAnimations.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/SystemAnimations.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/UiWatchers.java b/legacy/src/androidTest/java/org/fdroid/fdroid/UiWatchers.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/UiWatchers.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/UiWatchers.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/compat/FileCompatTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/compat/FileCompatTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/compat/FileCompatTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/compat/FileCompatTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/net/DnsWithCacheTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/net/DnsWithCacheTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/net/DnsWithCacheTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/net/DnsWithCacheTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/work/AppUpdateWorkerTest.kt b/legacy/src/androidTest/java/org/fdroid/fdroid/work/AppUpdateWorkerTest.kt
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/work/AppUpdateWorkerTest.kt
rename to legacy/src/androidTest/java/org/fdroid/fdroid/work/AppUpdateWorkerTest.kt
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/work/WorkManagerTestRule.java b/legacy/src/androidTest/java/org/fdroid/fdroid/work/WorkManagerTestRule.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/work/WorkManagerTestRule.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/work/WorkManagerTestRule.java
diff --git a/app/src/androidTest/java/org/fdroid/repo/RepoManagerAddAllIntegrationTest.kt b/legacy/src/androidTest/java/org/fdroid/repo/RepoManagerAddAllIntegrationTest.kt
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/repo/RepoManagerAddAllIntegrationTest.kt
rename to legacy/src/androidTest/java/org/fdroid/repo/RepoManagerAddAllIntegrationTest.kt
diff --git a/app/src/androidTest/proguard-rules.pro b/legacy/src/androidTest/proguard-rules.pro
similarity index 100%
rename from app/src/androidTest/proguard-rules.pro
rename to legacy/src/androidTest/proguard-rules.pro
diff --git a/app/src/androidTestFull/java/org/fdroid/fdroid/MainActivityEspressoTestFull.java b/legacy/src/androidTestFull/java/org/fdroid/fdroid/MainActivityEspressoTestFull.java
similarity index 100%
rename from app/src/androidTestFull/java/org/fdroid/fdroid/MainActivityEspressoTestFull.java
rename to legacy/src/androidTestFull/java/org/fdroid/fdroid/MainActivityEspressoTestFull.java
diff --git a/app/src/androidTestFull/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java b/legacy/src/androidTestFull/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java
similarity index 100%
rename from app/src/androidTestFull/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java
rename to legacy/src/androidTestFull/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java
diff --git a/app/src/androidTestFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java b/legacy/src/androidTestFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
similarity index 100%
rename from app/src/androidTestFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
rename to legacy/src/androidTestFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
diff --git a/app/src/androidTestFull/java/org/fdroid/fdroid/nearby/PublicSourceDirProviderTest.java b/legacy/src/androidTestFull/java/org/fdroid/fdroid/nearby/PublicSourceDirProviderTest.java
similarity index 100%
rename from app/src/androidTestFull/java/org/fdroid/fdroid/nearby/PublicSourceDirProviderTest.java
rename to legacy/src/androidTestFull/java/org/fdroid/fdroid/nearby/PublicSourceDirProviderTest.java
diff --git a/app/src/androidTestFull/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java b/legacy/src/androidTestFull/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java
similarity index 100%
rename from app/src/androidTestFull/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java
rename to legacy/src/androidTestFull/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/nearby/BluetoothClient.java b/legacy/src/basic/java/org/fdroid/fdroid/nearby/BluetoothClient.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/nearby/BluetoothClient.java
rename to legacy/src/basic/java/org/fdroid/fdroid/nearby/BluetoothClient.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/nearby/LocalRepoManager.java b/legacy/src/basic/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
rename to legacy/src/basic/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/nearby/SDCardScannerService.java b/legacy/src/basic/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
rename to legacy/src/basic/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/nearby/SwapService.java b/legacy/src/basic/java/org/fdroid/fdroid/nearby/SwapService.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/nearby/SwapService.java
rename to legacy/src/basic/java/org/fdroid/fdroid/nearby/SwapService.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/legacy/src/basic/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
rename to legacy/src/basic/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java b/legacy/src/basic/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java
rename to legacy/src/basic/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java b/legacy/src/basic/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
rename to legacy/src/basic/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java b/legacy/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java
rename to legacy/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java b/legacy/src/basic/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java
rename to legacy/src/basic/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java b/legacy/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java
rename to legacy/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java b/legacy/src/basic/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
rename to legacy/src/basic/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
diff --git a/app/src/basic/res/drawable-anydpi-v26/ic_launcher_foreground.xml b/legacy/src/basic/res/drawable-anydpi-v26/ic_launcher_foreground.xml
similarity index 100%
rename from app/src/basic/res/drawable-anydpi-v26/ic_launcher_foreground.xml
rename to legacy/src/basic/res/drawable-anydpi-v26/ic_launcher_foreground.xml
diff --git a/app/src/basic/res/drawable-hdpi/ic_launcher.png b/legacy/src/basic/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/basic/res/drawable-hdpi/ic_launcher.png
rename to legacy/src/basic/res/drawable-hdpi/ic_launcher.png
diff --git a/app/src/basic/res/drawable-ldpi/ic_launcher.png b/legacy/src/basic/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from app/src/basic/res/drawable-ldpi/ic_launcher.png
rename to legacy/src/basic/res/drawable-ldpi/ic_launcher.png
diff --git a/app/src/basic/res/drawable-mdpi/ic_launcher.png b/legacy/src/basic/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/basic/res/drawable-mdpi/ic_launcher.png
rename to legacy/src/basic/res/drawable-mdpi/ic_launcher.png
diff --git a/app/src/basic/res/drawable-xhdpi/ic_launcher.png b/legacy/src/basic/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/basic/res/drawable-xhdpi/ic_launcher.png
rename to legacy/src/basic/res/drawable-xhdpi/ic_launcher.png
diff --git a/app/src/basic/res/drawable-xxhdpi/ic_launcher.png b/legacy/src/basic/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/basic/res/drawable-xxhdpi/ic_launcher.png
rename to legacy/src/basic/res/drawable-xxhdpi/ic_launcher.png
diff --git a/app/src/basic/res/drawable-xxxhdpi/ic_launcher.png b/legacy/src/basic/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/basic/res/drawable-xxxhdpi/ic_launcher.png
rename to legacy/src/basic/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/app/src/basic/res/drawable/ic_launcher_monochrome.xml b/legacy/src/basic/res/drawable/ic_launcher_monochrome.xml
similarity index 100%
rename from app/src/basic/res/drawable/ic_launcher_monochrome.xml
rename to legacy/src/basic/res/drawable/ic_launcher_monochrome.xml
diff --git a/app/src/basic/res/values/attrs.xml b/legacy/src/basic/res/values/attrs.xml
similarity index 100%
rename from app/src/basic/res/values/attrs.xml
rename to legacy/src/basic/res/values/attrs.xml
diff --git a/app/src/basic/res/values/strings.xml b/legacy/src/basic/res/values/strings.xml
similarity index 100%
rename from app/src/basic/res/values/strings.xml
rename to legacy/src/basic/res/values/strings.xml
diff --git a/app/src/debug/AndroidManifest.xml b/legacy/src/debug/AndroidManifest.xml
similarity index 100%
rename from app/src/debug/AndroidManifest.xml
rename to legacy/src/debug/AndroidManifest.xml
diff --git a/app/src/full/AndroidManifest.xml b/legacy/src/full/AndroidManifest.xml
similarity index 100%
rename from app/src/full/AndroidManifest.xml
rename to legacy/src/full/AndroidManifest.xml
diff --git a/app/src/full/java/cc/mvdan/accesspoint/WifiApControl.java b/legacy/src/full/java/cc/mvdan/accesspoint/WifiApControl.java
similarity index 100%
rename from app/src/full/java/cc/mvdan/accesspoint/WifiApControl.java
rename to legacy/src/full/java/cc/mvdan/accesspoint/WifiApControl.java
diff --git a/app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java b/legacy/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java
similarity index 100%
rename from app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java
rename to legacy/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java
diff --git a/app/src/full/java/kellinwood/logging/AbstractLogger.java b/legacy/src/full/java/kellinwood/logging/AbstractLogger.java
similarity index 100%
rename from app/src/full/java/kellinwood/logging/AbstractLogger.java
rename to legacy/src/full/java/kellinwood/logging/AbstractLogger.java
diff --git a/app/src/full/java/kellinwood/logging/ConsoleLoggerFactory.java b/legacy/src/full/java/kellinwood/logging/ConsoleLoggerFactory.java
similarity index 100%
rename from app/src/full/java/kellinwood/logging/ConsoleLoggerFactory.java
rename to legacy/src/full/java/kellinwood/logging/ConsoleLoggerFactory.java
diff --git a/app/src/full/java/kellinwood/logging/LoggerFactory.java b/legacy/src/full/java/kellinwood/logging/LoggerFactory.java
similarity index 100%
rename from app/src/full/java/kellinwood/logging/LoggerFactory.java
rename to legacy/src/full/java/kellinwood/logging/LoggerFactory.java
diff --git a/app/src/full/java/kellinwood/logging/LoggerInterface.java b/legacy/src/full/java/kellinwood/logging/LoggerInterface.java
similarity index 100%
rename from app/src/full/java/kellinwood/logging/LoggerInterface.java
rename to legacy/src/full/java/kellinwood/logging/LoggerInterface.java
diff --git a/app/src/full/java/kellinwood/logging/LoggerManager.java b/legacy/src/full/java/kellinwood/logging/LoggerManager.java
similarity index 100%
rename from app/src/full/java/kellinwood/logging/LoggerManager.java
rename to legacy/src/full/java/kellinwood/logging/LoggerManager.java
diff --git a/app/src/full/java/kellinwood/logging/NullLoggerFactory.java b/legacy/src/full/java/kellinwood/logging/NullLoggerFactory.java
similarity index 100%
rename from app/src/full/java/kellinwood/logging/NullLoggerFactory.java
rename to legacy/src/full/java/kellinwood/logging/NullLoggerFactory.java
diff --git a/app/src/full/java/kellinwood/logging/StreamLogger.java b/legacy/src/full/java/kellinwood/logging/StreamLogger.java
similarity index 100%
rename from app/src/full/java/kellinwood/logging/StreamLogger.java
rename to legacy/src/full/java/kellinwood/logging/StreamLogger.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java b/legacy/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java b/legacy/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java b/legacy/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/KeySet.java b/legacy/src/full/java/kellinwood/security/zipsigner/KeySet.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/KeySet.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/KeySet.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java b/legacy/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/ProgressHelper.java b/legacy/src/full/java/kellinwood/security/zipsigner/ProgressHelper.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/ProgressHelper.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/ProgressHelper.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/ProgressListener.java b/legacy/src/full/java/kellinwood/security/zipsigner/ProgressListener.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/ProgressListener.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/ProgressListener.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java b/legacy/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/ZipSigner.java b/legacy/src/full/java/kellinwood/security/zipsigner/ZipSigner.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/ZipSigner.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/ZipSigner.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java b/legacy/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java
diff --git a/app/src/full/java/kellinwood/zipio/CentralEnd.java b/legacy/src/full/java/kellinwood/zipio/CentralEnd.java
similarity index 100%
rename from app/src/full/java/kellinwood/zipio/CentralEnd.java
rename to legacy/src/full/java/kellinwood/zipio/CentralEnd.java
diff --git a/app/src/full/java/kellinwood/zipio/ZioEntry.java b/legacy/src/full/java/kellinwood/zipio/ZioEntry.java
similarity index 100%
rename from app/src/full/java/kellinwood/zipio/ZioEntry.java
rename to legacy/src/full/java/kellinwood/zipio/ZioEntry.java
diff --git a/app/src/full/java/kellinwood/zipio/ZioEntryInputStream.java b/legacy/src/full/java/kellinwood/zipio/ZioEntryInputStream.java
similarity index 100%
rename from app/src/full/java/kellinwood/zipio/ZioEntryInputStream.java
rename to legacy/src/full/java/kellinwood/zipio/ZioEntryInputStream.java
diff --git a/app/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java b/legacy/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java
similarity index 100%
rename from app/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java
rename to legacy/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java
diff --git a/app/src/full/java/kellinwood/zipio/ZipInput.java b/legacy/src/full/java/kellinwood/zipio/ZipInput.java
similarity index 100%
rename from app/src/full/java/kellinwood/zipio/ZipInput.java
rename to legacy/src/full/java/kellinwood/zipio/ZipInput.java
diff --git a/app/src/full/java/kellinwood/zipio/ZipListingHelper.java b/legacy/src/full/java/kellinwood/zipio/ZipListingHelper.java
similarity index 100%
rename from app/src/full/java/kellinwood/zipio/ZipListingHelper.java
rename to legacy/src/full/java/kellinwood/zipio/ZipListingHelper.java
diff --git a/app/src/full/java/kellinwood/zipio/ZipOutput.java b/legacy/src/full/java/kellinwood/zipio/ZipOutput.java
similarity index 100%
rename from app/src/full/java/kellinwood/zipio/ZipOutput.java
rename to legacy/src/full/java/kellinwood/zipio/ZipOutput.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/NewRepoConfig.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/NewRepoConfig.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/NewRepoConfig.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/NewRepoConfig.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
similarity index 97%
rename from app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
index 2d6be417a..221cbadb8 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
+++ b/legacy/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
@@ -25,8 +25,8 @@ import androidx.core.content.ContextCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.google.android.material.button.MaterialButton;
-import com.google.android.material.progressindicator.CircularProgressIndicator;
 import com.google.android.material.materialswitch.MaterialSwitch;
+import com.google.android.material.progressindicator.CircularProgressIndicator;
 
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.R;
@@ -35,12 +35,6 @@ import org.fdroid.fdroid.nearby.peers.Peer;
 
 import java.util.ArrayList;
 
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import com.google.android.material.progressindicator.CircularProgressIndicator;
-
 import cc.mvdan.accesspoint.WifiApControl;
 
 @SuppressWarnings("LineLength")
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/SwapView.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/SwapView.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceMediaMountedReceiver.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceMediaMountedReceiver.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceMediaMountedReceiver.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceMediaMountedReceiver.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java b/legacy/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java b/legacy/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/DestructiveSwitchPreference.java b/legacy/src/full/java/org/fdroid/fdroid/panic/DestructiveSwitchPreference.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/DestructiveSwitchPreference.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/DestructiveSwitchPreference.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java b/legacy/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/HidingManager.java b/legacy/src/full/java/org/fdroid/fdroid/panic/HidingManager.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/HidingManager.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/HidingManager.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java b/legacy/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java b/legacy/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java b/legacy/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java b/legacy/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java b/legacy/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java b/legacy/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java b/legacy/src/full/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java
rename to legacy/src/full/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java
diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java b/legacy/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java
rename to legacy/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java
diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java b/legacy/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
rename to legacy/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
diff --git a/app/src/full/res/drawable-hdpi/circle.png b/legacy/src/full/res/drawable-hdpi/circle.png
similarity index 100%
rename from app/src/full/res/drawable-hdpi/circle.png
rename to legacy/src/full/res/drawable-hdpi/circle.png
diff --git a/app/src/full/res/drawable-hdpi/ic_fdroid_grey.png b/legacy/src/full/res/drawable-hdpi/ic_fdroid_grey.png
similarity index 100%
rename from app/src/full/res/drawable-hdpi/ic_fdroid_grey.png
rename to legacy/src/full/res/drawable-hdpi/ic_fdroid_grey.png
diff --git a/app/src/full/res/drawable-hdpi/swap_start_header.png b/legacy/src/full/res/drawable-hdpi/swap_start_header.png
similarity index 100%
rename from app/src/full/res/drawable-hdpi/swap_start_header.png
rename to legacy/src/full/res/drawable-hdpi/swap_start_header.png
diff --git a/app/src/full/res/drawable-ldpi/circle.png b/legacy/src/full/res/drawable-ldpi/circle.png
similarity index 100%
rename from app/src/full/res/drawable-ldpi/circle.png
rename to legacy/src/full/res/drawable-ldpi/circle.png
diff --git a/app/src/full/res/drawable-ldpi/ic_fdroid_grey.png b/legacy/src/full/res/drawable-ldpi/ic_fdroid_grey.png
similarity index 100%
rename from app/src/full/res/drawable-ldpi/ic_fdroid_grey.png
rename to legacy/src/full/res/drawable-ldpi/ic_fdroid_grey.png
diff --git a/app/src/full/res/drawable-ldpi/swap_start_header.png b/legacy/src/full/res/drawable-ldpi/swap_start_header.png
similarity index 100%
rename from app/src/full/res/drawable-ldpi/swap_start_header.png
rename to legacy/src/full/res/drawable-ldpi/swap_start_header.png
diff --git a/app/src/full/res/drawable-mdpi/circle.png b/legacy/src/full/res/drawable-mdpi/circle.png
similarity index 100%
rename from app/src/full/res/drawable-mdpi/circle.png
rename to legacy/src/full/res/drawable-mdpi/circle.png
diff --git a/app/src/full/res/drawable-mdpi/ic_fdroid_grey.png b/legacy/src/full/res/drawable-mdpi/ic_fdroid_grey.png
similarity index 100%
rename from app/src/full/res/drawable-mdpi/ic_fdroid_grey.png
rename to legacy/src/full/res/drawable-mdpi/ic_fdroid_grey.png
diff --git a/app/src/full/res/drawable-mdpi/swap_start_header.png b/legacy/src/full/res/drawable-mdpi/swap_start_header.png
similarity index 100%
rename from app/src/full/res/drawable-mdpi/swap_start_header.png
rename to legacy/src/full/res/drawable-mdpi/swap_start_header.png
diff --git a/app/src/full/res/drawable-xhdpi/circle.png b/legacy/src/full/res/drawable-xhdpi/circle.png
similarity index 100%
rename from app/src/full/res/drawable-xhdpi/circle.png
rename to legacy/src/full/res/drawable-xhdpi/circle.png
diff --git a/app/src/full/res/drawable-xhdpi/ic_fdroid_grey.png b/legacy/src/full/res/drawable-xhdpi/ic_fdroid_grey.png
similarity index 100%
rename from app/src/full/res/drawable-xhdpi/ic_fdroid_grey.png
rename to legacy/src/full/res/drawable-xhdpi/ic_fdroid_grey.png
diff --git a/app/src/full/res/drawable-xhdpi/swap_start_header.png b/legacy/src/full/res/drawable-xhdpi/swap_start_header.png
similarity index 100%
rename from app/src/full/res/drawable-xhdpi/swap_start_header.png
rename to legacy/src/full/res/drawable-xhdpi/swap_start_header.png
diff --git a/app/src/full/res/drawable-xxhdpi/circle.png b/legacy/src/full/res/drawable-xxhdpi/circle.png
similarity index 100%
rename from app/src/full/res/drawable-xxhdpi/circle.png
rename to legacy/src/full/res/drawable-xxhdpi/circle.png
diff --git a/app/src/full/res/drawable-xxhdpi/ic_fdroid_grey.png b/legacy/src/full/res/drawable-xxhdpi/ic_fdroid_grey.png
similarity index 100%
rename from app/src/full/res/drawable-xxhdpi/ic_fdroid_grey.png
rename to legacy/src/full/res/drawable-xxhdpi/ic_fdroid_grey.png
diff --git a/app/src/full/res/drawable-xxhdpi/swap_start_header.png b/legacy/src/full/res/drawable-xxhdpi/swap_start_header.png
similarity index 100%
rename from app/src/full/res/drawable-xxhdpi/swap_start_header.png
rename to legacy/src/full/res/drawable-xxhdpi/swap_start_header.png
diff --git a/app/src/full/res/drawable-xxxhdpi/circle.png b/legacy/src/full/res/drawable-xxxhdpi/circle.png
similarity index 100%
rename from app/src/full/res/drawable-xxxhdpi/circle.png
rename to legacy/src/full/res/drawable-xxxhdpi/circle.png
diff --git a/app/src/full/res/drawable-xxxhdpi/ic_fdroid_grey.png b/legacy/src/full/res/drawable-xxxhdpi/ic_fdroid_grey.png
similarity index 100%
rename from app/src/full/res/drawable-xxxhdpi/ic_fdroid_grey.png
rename to legacy/src/full/res/drawable-xxxhdpi/ic_fdroid_grey.png
diff --git a/app/src/full/res/drawable-xxxhdpi/swap_start_header.png b/legacy/src/full/res/drawable-xxxhdpi/swap_start_header.png
similarity index 100%
rename from app/src/full/res/drawable-xxxhdpi/swap_start_header.png
rename to legacy/src/full/res/drawable-xxxhdpi/swap_start_header.png
diff --git a/app/src/full/res/drawable/check.xml b/legacy/src/full/res/drawable/check.xml
similarity index 100%
rename from app/src/full/res/drawable/check.xml
rename to legacy/src/full/res/drawable/check.xml
diff --git a/app/src/full/res/drawable/ic_add_circle_outline.xml b/legacy/src/full/res/drawable/ic_add_circle_outline.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_add_circle_outline.xml
rename to legacy/src/full/res/drawable/ic_add_circle_outline.xml
diff --git a/app/src/full/res/drawable/ic_apps.xml b/legacy/src/full/res/drawable/ic_apps.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_apps.xml
rename to legacy/src/full/res/drawable/ic_apps.xml
diff --git a/app/src/full/res/drawable/ic_bluetooth.xml b/legacy/src/full/res/drawable/ic_bluetooth.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_bluetooth.xml
rename to legacy/src/full/res/drawable/ic_bluetooth.xml
diff --git a/app/src/full/res/drawable/ic_bluetooth_searching.xml b/legacy/src/full/res/drawable/ic_bluetooth_searching.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_bluetooth_searching.xml
rename to legacy/src/full/res/drawable/ic_bluetooth_searching.xml
diff --git a/app/src/full/res/drawable/ic_nearby.xml b/legacy/src/full/res/drawable/ic_nearby.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_nearby.xml
rename to legacy/src/full/res/drawable/ic_nearby.xml
diff --git a/app/src/full/res/drawable/ic_qr_code.xml b/legacy/src/full/res/drawable/ic_qr_code.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_qr_code.xml
rename to legacy/src/full/res/drawable/ic_qr_code.xml
diff --git a/app/src/full/res/drawable/ic_wifi.xml b/legacy/src/full/res/drawable/ic_wifi.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_wifi.xml
rename to legacy/src/full/res/drawable/ic_wifi.xml
diff --git a/app/src/full/res/drawable/ic_wifi_off.xml b/legacy/src/full/res/drawable/ic_wifi_off.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_wifi_off.xml
rename to legacy/src/full/res/drawable/ic_wifi_off.xml
diff --git a/app/src/full/res/drawable/ic_wifi_tethering.xml b/legacy/src/full/res/drawable/ic_wifi_tethering.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_wifi_tethering.xml
rename to legacy/src/full/res/drawable/ic_wifi_tethering.xml
diff --git a/app/src/full/res/drawable/nearby_splash.xml b/legacy/src/full/res/drawable/nearby_splash.xml
similarity index 100%
rename from app/src/full/res/drawable/nearby_splash.xml
rename to legacy/src/full/res/drawable/nearby_splash.xml
diff --git a/app/src/full/res/layout-sw480dp/start_swap_header.xml b/legacy/src/full/res/layout-sw480dp/start_swap_header.xml
similarity index 100%
rename from app/src/full/res/layout-sw480dp/start_swap_header.xml
rename to legacy/src/full/res/layout-sw480dp/start_swap_header.xml
diff --git a/app/src/full/res/layout/activity_calculator.xml b/legacy/src/full/res/layout/activity_calculator.xml
similarity index 100%
rename from app/src/full/res/layout/activity_calculator.xml
rename to legacy/src/full/res/layout/activity_calculator.xml
diff --git a/app/src/full/res/layout/activity_panic_settings.xml b/legacy/src/full/res/layout/activity_panic_settings.xml
similarity index 100%
rename from app/src/full/res/layout/activity_panic_settings.xml
rename to legacy/src/full/res/layout/activity_panic_settings.xml
diff --git a/app/src/full/res/layout/dialog_app_hiding.xml b/legacy/src/full/res/layout/dialog_app_hiding.xml
similarity index 100%
rename from app/src/full/res/layout/dialog_app_hiding.xml
rename to legacy/src/full/res/layout/dialog_app_hiding.xml
diff --git a/app/src/full/res/layout/main_tab_nearby.xml b/legacy/src/full/res/layout/main_tab_nearby.xml
similarity index 100%
rename from app/src/full/res/layout/main_tab_nearby.xml
rename to legacy/src/full/res/layout/main_tab_nearby.xml
diff --git a/app/src/full/res/layout/select_local_apps_list_item.xml b/legacy/src/full/res/layout/select_local_apps_list_item.xml
similarity index 100%
rename from app/src/full/res/layout/select_local_apps_list_item.xml
rename to legacy/src/full/res/layout/select_local_apps_list_item.xml
diff --git a/app/src/full/res/layout/start_swap_header.xml b/legacy/src/full/res/layout/start_swap_header.xml
similarity index 100%
rename from app/src/full/res/layout/start_swap_header.xml
rename to legacy/src/full/res/layout/start_swap_header.xml
diff --git a/app/src/full/res/layout/swap_activity.xml b/legacy/src/full/res/layout/swap_activity.xml
similarity index 100%
rename from app/src/full/res/layout/swap_activity.xml
rename to legacy/src/full/res/layout/swap_activity.xml
diff --git a/app/src/full/res/layout/swap_app_list_item.xml b/legacy/src/full/res/layout/swap_app_list_item.xml
similarity index 100%
rename from app/src/full/res/layout/swap_app_list_item.xml
rename to legacy/src/full/res/layout/swap_app_list_item.xml
diff --git a/app/src/full/res/layout/swap_confirm_receive.xml b/legacy/src/full/res/layout/swap_confirm_receive.xml
similarity index 100%
rename from app/src/full/res/layout/swap_confirm_receive.xml
rename to legacy/src/full/res/layout/swap_confirm_receive.xml
diff --git a/app/src/full/res/layout/swap_connecting.xml b/legacy/src/full/res/layout/swap_connecting.xml
similarity index 100%
rename from app/src/full/res/layout/swap_connecting.xml
rename to legacy/src/full/res/layout/swap_connecting.xml
diff --git a/app/src/full/res/layout/swap_join_wifi.xml b/legacy/src/full/res/layout/swap_join_wifi.xml
similarity index 100%
rename from app/src/full/res/layout/swap_join_wifi.xml
rename to legacy/src/full/res/layout/swap_join_wifi.xml
diff --git a/app/src/full/res/layout/swap_peer_list_item.xml b/legacy/src/full/res/layout/swap_peer_list_item.xml
similarity index 100%
rename from app/src/full/res/layout/swap_peer_list_item.xml
rename to legacy/src/full/res/layout/swap_peer_list_item.xml
diff --git a/app/src/full/res/layout/swap_select_apps.xml b/legacy/src/full/res/layout/swap_select_apps.xml
similarity index 100%
rename from app/src/full/res/layout/swap_select_apps.xml
rename to legacy/src/full/res/layout/swap_select_apps.xml
diff --git a/app/src/full/res/layout/swap_send_fdroid.xml b/legacy/src/full/res/layout/swap_send_fdroid.xml
similarity index 100%
rename from app/src/full/res/layout/swap_send_fdroid.xml
rename to legacy/src/full/res/layout/swap_send_fdroid.xml
diff --git a/app/src/full/res/layout/swap_start_swap.xml b/legacy/src/full/res/layout/swap_start_swap.xml
similarity index 100%
rename from app/src/full/res/layout/swap_start_swap.xml
rename to legacy/src/full/res/layout/swap_start_swap.xml
diff --git a/app/src/full/res/layout/swap_success.xml b/legacy/src/full/res/layout/swap_success.xml
similarity index 100%
rename from app/src/full/res/layout/swap_success.xml
rename to legacy/src/full/res/layout/swap_success.xml
diff --git a/app/src/full/res/layout/swap_wifi_qr.xml b/legacy/src/full/res/layout/swap_wifi_qr.xml
similarity index 100%
rename from app/src/full/res/layout/swap_wifi_qr.xml
rename to legacy/src/full/res/layout/swap_wifi_qr.xml
diff --git a/app/src/full/res/menu/main_activity_screens.xml b/legacy/src/full/res/menu/main_activity_screens.xml
similarity index 100%
rename from app/src/full/res/menu/main_activity_screens.xml
rename to legacy/src/full/res/menu/main_activity_screens.xml
diff --git a/app/src/full/res/menu/swap_next.xml b/legacy/src/full/res/menu/swap_next.xml
similarity index 100%
rename from app/src/full/res/menu/swap_next.xml
rename to legacy/src/full/res/menu/swap_next.xml
diff --git a/app/src/full/res/menu/swap_next_search.xml b/legacy/src/full/res/menu/swap_next_search.xml
similarity index 100%
rename from app/src/full/res/menu/swap_next_search.xml
rename to legacy/src/full/res/menu/swap_next_search.xml
diff --git a/app/src/full/res/menu/swap_search.xml b/legacy/src/full/res/menu/swap_search.xml
similarity index 100%
rename from app/src/full/res/menu/swap_search.xml
rename to legacy/src/full/res/menu/swap_search.xml
diff --git a/app/src/full/res/mipmap-hdpi/ic_calculator_launcher.png b/legacy/src/full/res/mipmap-hdpi/ic_calculator_launcher.png
similarity index 100%
rename from app/src/full/res/mipmap-hdpi/ic_calculator_launcher.png
rename to legacy/src/full/res/mipmap-hdpi/ic_calculator_launcher.png
diff --git a/app/src/full/res/mipmap-mdpi/ic_calculator_launcher.png b/legacy/src/full/res/mipmap-mdpi/ic_calculator_launcher.png
similarity index 100%
rename from app/src/full/res/mipmap-mdpi/ic_calculator_launcher.png
rename to legacy/src/full/res/mipmap-mdpi/ic_calculator_launcher.png
diff --git a/app/src/full/res/mipmap-xhdpi/ic_calculator_launcher.png b/legacy/src/full/res/mipmap-xhdpi/ic_calculator_launcher.png
similarity index 100%
rename from app/src/full/res/mipmap-xhdpi/ic_calculator_launcher.png
rename to legacy/src/full/res/mipmap-xhdpi/ic_calculator_launcher.png
diff --git a/app/src/full/res/mipmap-xxhdpi/ic_calculator_launcher.png b/legacy/src/full/res/mipmap-xxhdpi/ic_calculator_launcher.png
similarity index 100%
rename from app/src/full/res/mipmap-xxhdpi/ic_calculator_launcher.png
rename to legacy/src/full/res/mipmap-xxhdpi/ic_calculator_launcher.png
diff --git a/app/src/full/res/mipmap-xxxhdpi/ic_calculator_launcher.png b/legacy/src/full/res/mipmap-xxxhdpi/ic_calculator_launcher.png
similarity index 100%
rename from app/src/full/res/mipmap-xxxhdpi/ic_calculator_launcher.png
rename to legacy/src/full/res/mipmap-xxxhdpi/ic_calculator_launcher.png
diff --git a/app/src/full/res/values-night/colors.xml b/legacy/src/full/res/values-night/colors.xml
similarity index 100%
rename from app/src/full/res/values-night/colors.xml
rename to legacy/src/full/res/values-night/colors.xml
diff --git a/app/src/full/res/values/attrs.xml b/legacy/src/full/res/values/attrs.xml
similarity index 100%
rename from app/src/full/res/values/attrs.xml
rename to legacy/src/full/res/values/attrs.xml
diff --git a/app/src/full/res/values/colors.xml b/legacy/src/full/res/values/colors.xml
similarity index 100%
rename from app/src/full/res/values/colors.xml
rename to legacy/src/full/res/values/colors.xml
diff --git a/app/src/full/res/values/strings.xml b/legacy/src/full/res/values/strings.xml
similarity index 100%
rename from app/src/full/res/values/strings.xml
rename to legacy/src/full/res/values/strings.xml
diff --git a/app/src/full/res/values/styles.xml b/legacy/src/full/res/values/styles.xml
similarity index 100%
rename from app/src/full/res/values/styles.xml
rename to legacy/src/full/res/values/styles.xml
diff --git a/app/src/full/res/xml/device_filter.xml b/legacy/src/full/res/xml/device_filter.xml
similarity index 100%
rename from app/src/full/res/xml/device_filter.xml
rename to legacy/src/full/res/xml/device_filter.xml
diff --git a/app/src/full/res/xml/preferences_panic.xml b/legacy/src/full/res/xml/preferences_panic.xml
similarity index 93%
rename from app/src/full/res/xml/preferences_panic.xml
rename to legacy/src/full/res/xml/preferences_panic.xml
index 433d6b489..02b781ed6 100644
--- a/app/src/full/res/xml/preferences_panic.xml
+++ b/legacy/src/full/res/xml/preferences_panic.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
diff --git a/legacy/src/main/AndroidManifest.xml b/legacy/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..d1b189c0d
--- /dev/null
+++ b/legacy/src/main/AndroidManifest.xml
@@ -0,0 +1,547 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Copyright (C) 2010-2012 Ciaran Gultnieks
+ * Copyright (C) 2013-2017 Peter Serwylo
+ * Copyright (C) 2014-2015 Daniel Martí
+ * Copyright (C) 2014-2018 Hans-Christoph Steiner
+ * Copyright (C) 2016 Dominik Schürmann
+ * Copyright (C) 2018 Torsten Grote
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:installLocation="auto">
+
+    <supports-screens
+        android:anyDensity="true"
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:resizeable="true"
+        android:smallScreens="true"
+        android:xlargeScreens="true" />
+
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.wifi"
+        android:required="false" />
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.ENFORCE_UPDATE_OWNERSHIP" />
+
+    <!-- Permission used to externally trigger repository updates -->
+    <permission
+        android:name="${applicationId}.permission.UPDATE_REPOS"
+        android:protectionLevel="signature|privileged" />
+    <uses-permission android:name="${applicationId}.permission.UPDATE_REPOS" />
+
+    <application
+        android:name=".FDroidApp"
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/backup_extraction_rules"
+        android:description="@string/app_description"
+        android:fullBackupContent="@xml/backup_rules"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="${applicationLabel}"
+        android:localeConfig="@xml/locales_config"
+        android:memtagMode="async"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:requestLegacyExternalStorage="true"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.App">
+
+        <activity
+            android:name=".privileged.views.InstallConfirmActivity"
+            android:configChanges="layoutDirection|locale"
+            android:excludeFromRecents="true"
+            android:label="@string/menu_install"
+            android:parentActivityName=".views.main.MainActivity" />
+
+        <activity
+            android:name=".privileged.views.UninstallDialogActivity"
+            android:excludeFromRecents="true" />
+
+        <activity
+            android:name=".views.repos.ManageReposActivity"
+            android:configChanges="layoutDirection|locale"
+            android:label="@string/menu_manage"
+            android:launchMode="singleTask"
+            android:parentActivityName=".views.main.MainActivity"/>
+
+        <activity
+            android:name=".views.repos.AddRepoActivity"
+            android:exported="true"
+            android:launchMode="singleInstance"
+            android:windowSoftInputMode="adjustResize"
+            android:parentActivityName=".views.main.MainActivity">
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="fdroid.link" />
+            </intent-filter>
+
+            <!-- Repo URLs -->
+
+            <!--
+            This intent serves two purposes: Swapping apps between devices and adding a
+            repo from a website (e.g. https://guardianproject.info/fdroid/repo).
+            We intercept both of these situations in the FDroid activity, and then redirect
+            to the appropriate handler (swap handling, manage repos respectively) from there.
+
+            The reason for this is that the only differentiating factor is the presence
+            of a "swap=1" in the query string, and intent-filter is unable to deal with
+            query parameters. An alternative would be to do something like fdroidswap:// as
+            a scheme, but then we need to copy/paste all of this intent-filter stuff and
+            keep it up to date when it changes or a bug is found.
+
+            This filter supports HTTP and HTTPS schemes. There is an additional filter for
+            fdroidrepo:// and fdroidrepos://
+            -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <!--
+                Android's scheme matcher is case-sensitive, so include
+                ALL CAPS versions to support ALL CAPS URLs in QR Codes.
+                QR Codes have a special ALL CAPS mode that uses a reduced
+                character set, making for more compact QR Codes.
+                -->
+                <data android:scheme="fdroidrepo" />
+                <data android:scheme="fdroidrepos" />
+                <data
+                    android:scheme="FDROIDREPO"
+                    tools:ignore="AppLinkUrlError" />
+                <data android:scheme="fdroidrepos" />
+                <data
+                    android:scheme="FDROIDREPOS"
+                    tools:ignore="AppLinkUrlError" />
+            </intent-filter>
+
+            <!--
+            The below intent filter most likely won't work anymore.
+            Using fdroid.link or fdroidrepos:// scheme is preferred.
+            -->
+
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <!--
+                Android's scheme matcher is case-sensitive, so include
+                ALL CAPS versions to support ALL CAPS URLs in QR Codes.
+                QR Codes have a special ALL CAPS mode that uses a reduced
+                character set, making for more compact QR Codes.
+                -->
+                <data android:scheme="http" />
+                <data
+                    android:scheme="HTTP"
+                    tools:ignore="AppLinkUrlError" />
+                <data android:scheme="https" />
+                <data
+                    android:scheme="HTTPS"
+                    tools:ignore="AppLinkUrlError" />
+
+                <data android:host="*" />
+
+                <!--
+                The pattern matcher here is poorly implemented, in particular the * is
+                non-greedy, so you have to do stupid tricks to match patterns that have
+                repeat characters in them. http://stackoverflow.com/a/8599921/306864
+                -->
+                <data android:path="/fdroid/repo" />
+                <data android:pathPattern="/fdroid/repo/*" />
+                <data android:pathPattern="/.*/fdroid/repo" />
+                <data android:pathPattern="/.*/fdroid/repo/*" />
+                <data android:pathPattern="/.*/.*/fdroid/repo" />
+                <data android:pathPattern="/.*/.*/fdroid/repo/*" />
+                <data android:pathPattern="/.*/.*/.*/fdroid/repo" />
+                <data android:pathPattern="/.*/.*/.*/fdroid/repo/*" />
+                <data android:pathPattern="/.*/.*/.*/.*/fdroid/repo" />
+                <data android:pathPattern="/.*/.*/.*/.*/fdroid/repo/*" />
+                <data android:pathPattern="/.*/.*/.*/.*/.*/fdroid/repo" />
+                <data android:pathPattern="/.*/.*/.*/.*/.*/fdroid/repo/*" />
+                <data android:pathPattern="/.*/.*/.*/.*/.*/.*/fdroid/repo" />
+                <data android:pathPattern="/.*/.*/.*/.*/.*/.*/fdroid/repo/*" />
+                <data android:path="/fdroid/archive" />
+                <data android:pathPattern="/fdroid/archive/*" />
+                <data android:pathPattern="/.*/fdroid/archive" />
+                <data android:pathPattern="/.*/fdroid/archive/*" />
+                <data android:pathPattern="/.*/.*/fdroid/archive" />
+                <data android:pathPattern="/.*/.*/fdroid/archive/*" />
+                <data android:pathPattern="/.*/.*/.*/fdroid/archive" />
+                <data android:pathPattern="/.*/.*/.*/fdroid/archive/*" />
+                <data android:pathPattern="/.*/.*/.*/.*/fdroid/archive" />
+                <data android:pathPattern="/.*/.*/.*/.*/fdroid/archive/*" />
+                <!--
+                Some QR Code scanners don't respect custom schemes like fdroidrepo://,
+                so this is a workaround, since the local repo URL is all uppercase in
+                the QR Code for sending the local repo to another device.
+                -->
+                <data android:path="/FDROID/REPO" />
+                <data android:pathPattern="/.*/FDROID/REPO" />
+                <data android:pathPattern="/.*/.*/FDROID/REPO" />
+                <data android:pathPattern="/.*/.*/.*/FDROID/REPO" />
+            </intent-filter>
+
+            <intent-filter android:label="@string/repo_add_new_title">
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".views.IpfsGatewaySettingsActivity"
+            android:configChanges="layoutDirection|locale"
+            android:label="@string/ipfsgw_title"
+            android:launchMode="singleTask"
+            android:parentActivityName=".views.main.MainActivity"></activity>
+
+        <activity
+            android:name=".views.IpfsGatewayAddActivity"
+            android:launchMode="singleTask"
+            android:parentActivityName=".views.main.MainActivity" />
+
+        <activity
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="fullSensor"
+            tools:replace="screenOrientation" />
+
+        <activity
+            android:name=".views.repos.RepoDetailsActivity"
+            android:configChanges="layoutDirection|locale"
+            android:label="@string/repo_details"
+            android:parentActivityName=".views.repos.ManageReposActivity"
+            android:windowSoftInputMode="stateHidden"/>
+
+        <activity
+            android:name=".views.AppDetailsActivity"
+            android:configChanges="layoutDirection|locale"
+            android:exported="true"
+            android:label="@string/app_details"
+            android:parentActivityName=".views.main.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.SHOW_APP_INFO" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".views.ScreenShotsActivity" />
+
+        <activity
+            android:name=".data.ObbUrlActivity"
+            android:theme="@android:style/Theme.NoDisplay" />
+
+        <activity
+            android:name=".installer.DefaultInstallerActivity"
+            android:theme="@style/Theme.App.Transparent" />
+        <activity
+            android:name=".installer.ErrorDialogActivity"
+            android:theme="@style/Theme.App.Transparent" />
+
+        <activity
+            android:name=".views.main.MainActivity"
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.APP_MARKET" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
+
+            <!-- App URLs -->
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="fdroid.app" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="f-droid.org" />
+                <data android:host="www.f-droid.org" />
+                <data android:host="staging.f-droid.org" />
+                <data android:host="cloudflare.f-droid.org" />
+                <data android:pathPrefix="/app/" />
+                <data android:pathPrefix="/packages/" />
+                <data android:pathPrefix="/repository/browse" />
+                <!-- support localized URLs -->
+                <data android:pathPattern="/.*/packages/.*" />
+                <data android:pathPattern="/.*/packages/.*/" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:host="f-droid.org" />
+                <data android:host="www.f-droid.org" />
+                <data android:host="staging.f-droid.org" />
+                <data android:host="cloudflare.f-droid.org" />
+                <data android:pathPrefix="/app/" />
+                <data android:pathPrefix="/packages/" />
+                <data android:pathPrefix="/repository/browse" />
+                <!-- support localized URLs -->
+                <data android:pathPattern="/.*/packages/.*" />
+                <data android:pathPattern="/.*/packages/.*/" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="details"
+                    android:scheme="market" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="play.google.com" /> <!-- they don't do www. -->
+                <data android:path="/store/apps/details" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="apps"
+                    android:path="/android"
+                    android:scheme="amzn" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="amazon.com" />
+                <data android:host="www.amazon.com" />
+                <data android:path="/gp/mas/dl/android" />
+            </intent-filter>
+
+
+            <!-- Search URLs -->
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="fdroid.search" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="search"
+                    android:scheme="market" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="play.google.com" /> <!-- they don't do www. -->
+                <data android:path="/store/search" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+
+            <!-- Handle NFC tags detected from outside our application -->
+
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
+
+        </activity>
+        <activity android:name=".views.apps.AppListActivity" />
+        <activity
+            android:name=".views.installed.InstalledAppsActivity"
+            android:parentActivityName=".views.main.MainActivity"></activity>
+        <activity
+            android:name=".views.InstallHistoryActivity"
+            android:parentActivityName=".views.main.MainActivity"></activity>
+
+        <activity
+            android:name=".installer.FileInstallerActivity"
+            android:theme="@style/Theme.App.Transparent" />
+
+        <provider
+            android:name="org.fdroid.fdroid.installer.ApkFileProvider"
+            android:authorities="${applicationId}.installer.ApkFileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/apk_file_provider" />
+        </provider>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.installer"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/installer_file_provider" />
+        </provider>
+        <provider
+            android:name="org.fdroid.fdroid.nearby.PublicSourceDirProvider"
+            android:authorities="${applicationId}.nearby.PublicSourceDirProvider"
+            android:exported="false"
+            android:grantUriPermissions="true" />
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="remove"></provider>
+
+        <receiver
+            android:name=".receiver.StartupReceiver"
+            android:exported="false">
+            <intent-filter>
+                <!-- Implicit Broadcast Exception
+                https://developer.android.com/guide/components/broadcast-exceptions -->
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+
+                <category android:name="android.intent.category.HOME" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name=".NotificationBroadcastReceiver"
+            android:exported="false">
+            <!-- Doesn't require an intent-filter because it is explicitly invoked via Intent.setClass() -->
+        </receiver>
+        <receiver android:name=".receiver.RepoUpdateReceiver"
+            android:exported="true"
+            android:permission="${applicationId}.permission.UPDATE_REPOS">
+            <intent-filter>
+                <action android:name="org.fdroid.action.UPDATE_REPOS" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name=".receiver.UnarchivePackageReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.UNARCHIVE_PACKAGE" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name=".net.DownloaderService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+        <service
+            android:name=".installer.InstallerService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+        <!-- needed for declaring foregroundServiceType for WorkManager -->
+        <service
+            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:foregroundServiceType="dataSync"
+            tools:node="merge" />
+        <service
+            android:name=".DeleteCacheService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+
+        <service
+            android:name=".net.ConnectivityMonitorService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+
+        <service
+            android:name=".installer.InstallHistoryService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+        <service
+            android:name=".installer.ObfInstallerService"
+            android:exported="false" />
+
+    </application>
+
+</manifest>
diff --git a/app/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedCallback.aidl b/legacy/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedCallback.aidl
similarity index 100%
rename from app/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedCallback.aidl
rename to legacy/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedCallback.aidl
diff --git a/app/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedService.aidl b/legacy/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedService.aidl
similarity index 100%
rename from app/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedService.aidl
rename to legacy/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedService.aidl
diff --git a/app/src/main/assets/index.template.html b/legacy/src/main/assets/index.template.html
similarity index 100%
rename from app/src/main/assets/index.template.html
rename to legacy/src/main/assets/index.template.html
diff --git a/next/src/main/assets/logback.xml b/legacy/src/main/assets/logback.xml
similarity index 100%
rename from next/src/main/assets/logback.xml
rename to legacy/src/main/assets/logback.xml
diff --git a/app/src/main/assets/swap-icon.png b/legacy/src/main/assets/swap-icon.png
similarity index 100%
rename from app/src/main/assets/swap-icon.png
rename to legacy/src/main/assets/swap-icon.png
diff --git a/app/src/main/assets/swap-icon.svg b/legacy/src/main/assets/swap-icon.svg
similarity index 84%
rename from app/src/main/assets/swap-icon.svg
rename to legacy/src/main/assets/swap-icon.svg
index adcd0b51c..43db30a87 100644
--- a/app/src/main/assets/swap-icon.svg
+++ b/legacy/src/main/assets/swap-icon.svg
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="210.73421"
-   height="146.02573"
-   id="svg4443">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" version="1.1" width="210.73421" height="146.02573" id="svg4443">
   <defs
      id="defs4445" />
   <metadata
diff --git a/app/src/main/assets/swap-tick-done.png b/legacy/src/main/assets/swap-tick-done.png
similarity index 100%
rename from app/src/main/assets/swap-tick-done.png
rename to legacy/src/main/assets/swap-tick-done.png
diff --git a/app/src/main/assets/swap-tick-not-done.png b/legacy/src/main/assets/swap-tick-not-done.png
similarity index 100%
rename from app/src/main/assets/swap-tick-not-done.png
rename to legacy/src/main/assets/swap-tick-not-done.png
diff --git a/app/src/main/java/com/google/zxing/encode/Contents.java b/legacy/src/main/java/com/google/zxing/encode/Contents.java
similarity index 100%
rename from app/src/main/java/com/google/zxing/encode/Contents.java
rename to legacy/src/main/java/com/google/zxing/encode/Contents.java
diff --git a/app/src/main/java/com/google/zxing/encode/QRCodeEncoder.java b/legacy/src/main/java/com/google/zxing/encode/QRCodeEncoder.java
similarity index 100%
rename from app/src/main/java/com/google/zxing/encode/QRCodeEncoder.java
rename to legacy/src/main/java/com/google/zxing/encode/QRCodeEncoder.java
diff --git a/app/src/main/java/org/fdroid/fdroid/AppUpdateManager.kt b/legacy/src/main/java/org/fdroid/fdroid/AppUpdateManager.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/AppUpdateManager.kt
rename to legacy/src/main/java/org/fdroid/fdroid/AppUpdateManager.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java b/legacy/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
rename to legacy/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
diff --git a/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java b/legacy/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java
rename to legacy/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java
diff --git a/app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java b/legacy/src/main/java/org/fdroid/fdroid/DeleteCacheService.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java
rename to legacy/src/main/java/org/fdroid/fdroid/DeleteCacheService.java
diff --git a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java b/legacy/src/main/java/org/fdroid/fdroid/FDroidApp.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/FDroidApp.java
rename to legacy/src/main/java/org/fdroid/fdroid/FDroidApp.java
diff --git a/app/src/main/java/org/fdroid/fdroid/Hasher.java b/legacy/src/main/java/org/fdroid/fdroid/Hasher.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/Hasher.java
rename to legacy/src/main/java/org/fdroid/fdroid/Hasher.java
diff --git a/app/src/main/java/org/fdroid/fdroid/IPreferencesIpfs.java b/legacy/src/main/java/org/fdroid/fdroid/IPreferencesIpfs.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/IPreferencesIpfs.java
rename to legacy/src/main/java/org/fdroid/fdroid/IPreferencesIpfs.java
diff --git a/app/src/main/java/org/fdroid/fdroid/Languages.java b/legacy/src/main/java/org/fdroid/fdroid/Languages.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/Languages.java
rename to legacy/src/main/java/org/fdroid/fdroid/Languages.java
diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationBroadcastReceiver.java b/legacy/src/main/java/org/fdroid/fdroid/NotificationBroadcastReceiver.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/NotificationBroadcastReceiver.java
rename to legacy/src/main/java/org/fdroid/fdroid/NotificationBroadcastReceiver.java
diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java b/legacy/src/main/java/org/fdroid/fdroid/NotificationHelper.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
rename to legacy/src/main/java/org/fdroid/fdroid/NotificationHelper.java
diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationManager.kt b/legacy/src/main/java/org/fdroid/fdroid/NotificationManager.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/NotificationManager.kt
rename to legacy/src/main/java/org/fdroid/fdroid/NotificationManager.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/Preferences.java b/legacy/src/main/java/org/fdroid/fdroid/Preferences.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/Preferences.java
rename to legacy/src/main/java/org/fdroid/fdroid/Preferences.java
diff --git a/app/src/main/java/org/fdroid/fdroid/RepoUpdateManager.kt b/legacy/src/main/java/org/fdroid/fdroid/RepoUpdateManager.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/RepoUpdateManager.kt
rename to legacy/src/main/java/org/fdroid/fdroid/RepoUpdateManager.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/legacy/src/main/java/org/fdroid/fdroid/Utils.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/Utils.java
rename to legacy/src/main/java/org/fdroid/fdroid/Utils.java
diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.kt b/legacy/src/main/java/org/fdroid/fdroid/Utils.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/Utils.kt
rename to legacy/src/main/java/org/fdroid/fdroid/Utils.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java b/legacy/src/main/java/org/fdroid/fdroid/compat/FileCompat.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java
rename to legacy/src/main/java/org/fdroid/fdroid/compat/FileCompat.java
diff --git a/app/src/main/java/org/fdroid/fdroid/compat/LocaleCompat.java b/legacy/src/main/java/org/fdroid/fdroid/compat/LocaleCompat.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/compat/LocaleCompat.java
rename to legacy/src/main/java/org/fdroid/fdroid/compat/LocaleCompat.java
diff --git a/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java b/legacy/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java
rename to legacy/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java
diff --git a/app/src/main/java/org/fdroid/fdroid/compose/ComposeUtils.kt b/legacy/src/main/java/org/fdroid/fdroid/compose/ComposeUtils.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/compose/ComposeUtils.kt
rename to legacy/src/main/java/org/fdroid/fdroid/compose/ComposeUtils.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/compose/FDroidExpandableRow.kt b/legacy/src/main/java/org/fdroid/fdroid/compose/FDroidExpandableRow.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/compose/FDroidExpandableRow.kt
rename to legacy/src/main/java/org/fdroid/fdroid/compose/FDroidExpandableRow.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/compose/FDroidSwitchRow.kt b/legacy/src/main/java/org/fdroid/fdroid/compose/FDroidSwitchRow.kt
similarity index 99%
rename from app/src/main/java/org/fdroid/fdroid/compose/FDroidSwitchRow.kt
rename to legacy/src/main/java/org/fdroid/fdroid/compose/FDroidSwitchRow.kt
index 0b3186752..d7444ae76 100644
--- a/app/src/main/java/org/fdroid/fdroid/compose/FDroidSwitchRow.kt
+++ b/legacy/src/main/java/org/fdroid/fdroid/compose/FDroidSwitchRow.kt
@@ -16,7 +16,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import kotlin.Unit
 
 @Composable
 fun FDroidSwitchRow(
diff --git a/app/src/main/java/org/fdroid/fdroid/data/Apk.java b/legacy/src/main/java/org/fdroid/fdroid/data/Apk.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/data/Apk.java
rename to legacy/src/main/java/org/fdroid/fdroid/data/Apk.java
diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/legacy/src/main/java/org/fdroid/fdroid/data/App.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/data/App.java
rename to legacy/src/main/java/org/fdroid/fdroid/data/App.java
diff --git a/app/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java b/legacy/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java
rename to legacy/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java
diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/legacy/src/main/java/org/fdroid/fdroid/data/DBHelper.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
rename to legacy/src/main/java/org/fdroid/fdroid/data/DBHelper.java
diff --git a/app/src/main/java/org/fdroid/fdroid/data/ObbUrlActivity.java b/legacy/src/main/java/org/fdroid/fdroid/data/ObbUrlActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/data/ObbUrlActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/data/ObbUrlActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java b/legacy/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java
rename to legacy/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkCache.java b/legacy/src/main/java/org/fdroid/fdroid/installer/ApkCache.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/ApkCache.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/ApkCache.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java b/legacy/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java b/legacy/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java b/legacy/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java b/legacy/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ErrorDialogActivity.java b/legacy/src/main/java/org/fdroid/fdroid/installer/ErrorDialogActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/ErrorDialogActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/ErrorDialogActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java b/legacy/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java b/legacy/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java b/legacy/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java b/legacy/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java b/legacy/src/main/java/org/fdroid/fdroid/installer/Installer.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/Installer.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/Installer.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java b/legacy/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallerService.java b/legacy/src/main/java/org/fdroid/fdroid/installer/InstallerService.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/InstallerService.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/InstallerService.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ObfInstallerService.java b/legacy/src/main/java/org/fdroid/fdroid/installer/ObfInstallerService.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/ObfInstallerService.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/ObfInstallerService.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java b/legacy/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java b/legacy/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/SessionInstaller.java b/legacy/src/main/java/org/fdroid/fdroid/installer/SessionInstaller.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/SessionInstaller.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/SessionInstaller.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/PublicSourceDirProvider.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/PublicSourceDirProvider.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/PublicSourceDirProvider.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/PublicSourceDirProvider.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java b/legacy/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java b/legacy/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/DnsCache.java b/legacy/src/main/java/org/fdroid/fdroid/net/DnsCache.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/DnsCache.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/DnsCache.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/DnsWithCache.java b/legacy/src/main/java/org/fdroid/fdroid/net/DnsWithCache.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/DnsWithCache.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/DnsWithCache.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java b/legacy/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java b/legacy/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/FDroidGlideModule.java b/legacy/src/main/java/org/fdroid/fdroid/net/FDroidGlideModule.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/FDroidGlideModule.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/FDroidGlideModule.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/FDroidMirrorParameterManager.java b/legacy/src/main/java/org/fdroid/fdroid/net/FDroidMirrorParameterManager.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/FDroidMirrorParameterManager.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/FDroidMirrorParameterManager.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java b/legacy/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java b/legacy/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java b/legacy/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java
rename to legacy/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/legacy/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
rename to legacy/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java b/legacy/src/main/java/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java
rename to legacy/src/main/java/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java b/legacy/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/TabsAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/privileged/views/TabsAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/privileged/views/TabsAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/privileged/views/TabsAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/UninstallDialogActivity.java b/legacy/src/main/java/org/fdroid/fdroid/privileged/views/UninstallDialogActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/privileged/views/UninstallDialogActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/privileged/views/UninstallDialogActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsChecker.java b/legacy/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsChecker.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsChecker.java
rename to legacy/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsChecker.java
diff --git a/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java b/legacy/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java
rename to legacy/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java
diff --git a/app/src/main/java/org/fdroid/fdroid/receiver/DeviceStorageReceiver.java b/legacy/src/main/java/org/fdroid/fdroid/receiver/DeviceStorageReceiver.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/receiver/DeviceStorageReceiver.java
rename to legacy/src/main/java/org/fdroid/fdroid/receiver/DeviceStorageReceiver.java
diff --git a/app/src/main/java/org/fdroid/fdroid/receiver/RepoUpdateReceiver.kt b/legacy/src/main/java/org/fdroid/fdroid/receiver/RepoUpdateReceiver.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/receiver/RepoUpdateReceiver.kt
rename to legacy/src/main/java/org/fdroid/fdroid/receiver/RepoUpdateReceiver.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java b/legacy/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java
rename to legacy/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java
diff --git a/app/src/main/java/org/fdroid/fdroid/receiver/UnarchivePackageReceiver.kt b/legacy/src/main/java/org/fdroid/fdroid/receiver/UnarchivePackageReceiver.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/receiver/UnarchivePackageReceiver.kt
rename to legacy/src/main/java/org/fdroid/fdroid/receiver/UnarchivePackageReceiver.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/ui/theme/Color.kt b/legacy/src/main/java/org/fdroid/fdroid/ui/theme/Color.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/ui/theme/Color.kt
rename to legacy/src/main/java/org/fdroid/fdroid/ui/theme/Color.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/ui/theme/Theme.kt b/legacy/src/main/java/org/fdroid/fdroid/ui/theme/Theme.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/ui/theme/Theme.kt
rename to legacy/src/main/java/org/fdroid/fdroid/ui/theme/Theme.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java b/legacy/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java b/legacy/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewayAddActivity.kt b/legacy/src/main/java/org/fdroid/fdroid/views/IpfsGatewayAddActivity.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/IpfsGatewayAddActivity.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/IpfsGatewayAddActivity.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt b/legacy/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java b/legacy/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java b/legacy/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java b/legacy/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java b/legacy/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/StatusBanner.java b/legacy/src/main/java/org/fdroid/fdroid/views/StatusBanner.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/StatusBanner.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/StatusBanner.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java b/legacy/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/appdetails/AppDetailsViewModel.kt b/legacy/src/main/java/org/fdroid/fdroid/views/appdetails/AppDetailsViewModel.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/appdetails/AppDetailsViewModel.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/appdetails/AppDetailsViewModel.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/appdetails/RepoChooser.kt b/legacy/src/main/java/org/fdroid/fdroid/views/appdetails/RepoChooser.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/appdetails/RepoChooser.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/appdetails/RepoChooser.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/FeatureImage.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/FeatureImage.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/FeatureImage.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/FeatureImage.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/FilterSpan.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/FilterSpan.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/FilterSpan.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/FilterSpan.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/FilterTextWatcher.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/FilterTextWatcher.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/FilterTextWatcher.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/FilterTextWatcher.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java b/legacy/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/categories/CategoryAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/categories/CategoryAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/categories/CategoryAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java b/legacy/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryItem.java b/legacy/src/main/java/org/fdroid/fdroid/views/categories/CategoryItem.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/categories/CategoryItem.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/categories/CategoryItem.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java b/legacy/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppsActivity.java b/legacy/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppsActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppsActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppsActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java b/legacy/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java
similarity index 99%
rename from app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java
index d6cdd0a90..9adc696f6 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java
+++ b/legacy/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java
@@ -1,11 +1,13 @@
 package org.fdroid.fdroid.views.main;
 
 import android.view.ViewGroup;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
 import org.fdroid.database.AppOverviewItem;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.views.categories.AppCardController;
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java b/legacy/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/legacy/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java b/legacy/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoActivity.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/AddRepoActivity.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoActivity.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/AddRepoActivity.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoErrorScreen.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/AddRepoErrorScreen.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoErrorScreen.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/AddRepoErrorScreen.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoIntroScreen.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/AddRepoIntroScreen.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoIntroScreen.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/AddRepoIntroScreen.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/ManageReposActivity.java b/legacy/src/main/java/org/fdroid/fdroid/views/repos/ManageReposActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/ManageReposActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/ManageReposActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/RepoAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsScreen.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsScreen.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsScreen.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsScreen.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsViewModel.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsViewModel.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsViewModel.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsViewModel.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoIconComposable.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoIconComposable.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/RepoIconComposable.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoIconComposable.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoProgressScreen.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoProgressScreen.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/RepoProgressScreen.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoProgressScreen.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppUpdateData.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/AppUpdateData.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/AppUpdateData.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/AppUpdateData.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppListItemController.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppListItemController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppListItemController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppListItemController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java
diff --git a/app/src/main/java/org/fdroid/fdroid/work/AppUpdateWorker.kt b/legacy/src/main/java/org/fdroid/fdroid/work/AppUpdateWorker.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/work/AppUpdateWorker.kt
rename to legacy/src/main/java/org/fdroid/fdroid/work/AppUpdateWorker.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/work/CleanCacheWorker.java b/legacy/src/main/java/org/fdroid/fdroid/work/CleanCacheWorker.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/work/CleanCacheWorker.java
rename to legacy/src/main/java/org/fdroid/fdroid/work/CleanCacheWorker.java
diff --git a/app/src/main/java/org/fdroid/fdroid/work/FDroidMetricsWorker.java b/legacy/src/main/java/org/fdroid/fdroid/work/FDroidMetricsWorker.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/work/FDroidMetricsWorker.java
rename to legacy/src/main/java/org/fdroid/fdroid/work/FDroidMetricsWorker.java
diff --git a/app/src/main/java/org/fdroid/fdroid/work/RepoUpdateWorker.kt b/legacy/src/main/java/org/fdroid/fdroid/work/RepoUpdateWorker.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/work/RepoUpdateWorker.kt
rename to legacy/src/main/java/org/fdroid/fdroid/work/RepoUpdateWorker.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/work/UnarchiveWorker.kt b/legacy/src/main/java/org/fdroid/fdroid/work/UnarchiveWorker.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/work/UnarchiveWorker.kt
rename to legacy/src/main/java/org/fdroid/fdroid/work/UnarchiveWorker.kt
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/BinaryDecoder.java b/legacy/src/main/java/vendored/org/apache/commons/codec/BinaryDecoder.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/BinaryDecoder.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/BinaryDecoder.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/BinaryEncoder.java b/legacy/src/main/java/vendored/org/apache/commons/codec/BinaryEncoder.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/BinaryEncoder.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/BinaryEncoder.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/CharEncoding.java b/legacy/src/main/java/vendored/org/apache/commons/codec/CharEncoding.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/CharEncoding.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/CharEncoding.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/Decoder.java b/legacy/src/main/java/vendored/org/apache/commons/codec/Decoder.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/Decoder.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/Decoder.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/DecoderException.java b/legacy/src/main/java/vendored/org/apache/commons/codec/DecoderException.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/DecoderException.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/DecoderException.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/Encoder.java b/legacy/src/main/java/vendored/org/apache/commons/codec/Encoder.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/Encoder.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/Encoder.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/EncoderException.java b/legacy/src/main/java/vendored/org/apache/commons/codec/EncoderException.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/EncoderException.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/EncoderException.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/binary/CharSequenceUtils.java b/legacy/src/main/java/vendored/org/apache/commons/codec/binary/CharSequenceUtils.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/binary/CharSequenceUtils.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/binary/CharSequenceUtils.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/binary/Hex.java b/legacy/src/main/java/vendored/org/apache/commons/codec/binary/Hex.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/binary/Hex.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/binary/Hex.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/binary/StringUtils.java b/legacy/src/main/java/vendored/org/apache/commons/codec/binary/StringUtils.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/binary/StringUtils.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/binary/StringUtils.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/digest/DigestUtils.java b/legacy/src/main/java/vendored/org/apache/commons/codec/digest/DigestUtils.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/digest/DigestUtils.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/digest/DigestUtils.java
index 0db245497..7af956e04 100644
--- a/app/src/main/java/vendored/org/apache/commons/codec/digest/DigestUtils.java
+++ b/legacy/src/main/java/vendored/org/apache/commons/codec/digest/DigestUtils.java
@@ -17,6 +17,8 @@
 
 package vendored.org.apache.commons.codec.digest;
 
+import androidx.annotation.RequiresApi;
+
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,8 +36,6 @@ import java.security.NoSuchAlgorithmException;
 import vendored.org.apache.commons.codec.binary.Hex;
 import vendored.org.apache.commons.codec.binary.StringUtils;
 
-import androidx.annotation.RequiresApi;
-
 /**
  * Operations to simplify common {@link java.security.MessageDigest} tasks.
  * This class is immutable and thread-safe.
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/digest/MessageDigestAlgorithms.java b/legacy/src/main/java/vendored/org/apache/commons/codec/digest/MessageDigestAlgorithms.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/digest/MessageDigestAlgorithms.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/digest/MessageDigestAlgorithms.java
diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher.xml b/legacy/src/main/res/drawable-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v26/ic_launcher.xml
rename to legacy/src/main/res/drawable-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml b/legacy/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml
rename to legacy/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml
diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml b/legacy/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
rename to legacy/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_file_install.xml b/legacy/src/main/res/drawable-anydpi/ic_file_install.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_file_install.xml
rename to legacy/src/main/res/drawable-anydpi/ic_file_install.xml
diff --git a/app/src/main/res/drawable-hdpi/ic_coins_s.png b/legacy/src/main/res/drawable-hdpi/ic_coins_s.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_coins_s.png
rename to legacy/src/main/res/drawable-hdpi/ic_coins_s.png
diff --git a/app/src/main/res/drawable-hdpi/ic_file_install.png b/legacy/src/main/res/drawable-hdpi/ic_file_install.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_file_install.png
rename to legacy/src/main/res/drawable-hdpi/ic_file_install.png
diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/legacy/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_launcher.png
rename to legacy/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-hdpi/ic_repo_app_default.png b/legacy/src/main/res/drawable-hdpi/ic_repo_app_default.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_repo_app_default.png
rename to legacy/src/main/res/drawable-hdpi/ic_repo_app_default.png
diff --git a/app/src/main/res/drawable-hdpi/tab_unselected_holo.9.png b/legacy/src/main/res/drawable-hdpi/tab_unselected_holo.9.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/tab_unselected_holo.9.png
rename to legacy/src/main/res/drawable-hdpi/tab_unselected_holo.9.png
diff --git a/app/src/main/res/drawable-ldpi/ic_launcher.png b/legacy/src/main/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-ldpi/ic_launcher.png
rename to legacy/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-ldpi/ic_repo_app_default.png b/legacy/src/main/res/drawable-ldpi/ic_repo_app_default.png
similarity index 100%
rename from app/src/main/res/drawable-ldpi/ic_repo_app_default.png
rename to legacy/src/main/res/drawable-ldpi/ic_repo_app_default.png
diff --git a/app/src/main/res/drawable-mdpi/ic_coins_s.png b/legacy/src/main/res/drawable-mdpi/ic_coins_s.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_coins_s.png
rename to legacy/src/main/res/drawable-mdpi/ic_coins_s.png
diff --git a/app/src/main/res/drawable-mdpi/ic_file_install.png b/legacy/src/main/res/drawable-mdpi/ic_file_install.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_file_install.png
rename to legacy/src/main/res/drawable-mdpi/ic_file_install.png
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/legacy/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_launcher.png
rename to legacy/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-mdpi/ic_repo_app_default.png b/legacy/src/main/res/drawable-mdpi/ic_repo_app_default.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_repo_app_default.png
rename to legacy/src/main/res/drawable-mdpi/ic_repo_app_default.png
diff --git a/app/src/main/res/drawable-mdpi/tab_unselected_holo.9.png b/legacy/src/main/res/drawable-mdpi/tab_unselected_holo.9.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/tab_unselected_holo.9.png
rename to legacy/src/main/res/drawable-mdpi/tab_unselected_holo.9.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_coins_s.png b/legacy/src/main/res/drawable-xhdpi/ic_coins_s.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_coins_s.png
rename to legacy/src/main/res/drawable-xhdpi/ic_coins_s.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_file_install.png b/legacy/src/main/res/drawable-xhdpi/ic_file_install.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_file_install.png
rename to legacy/src/main/res/drawable-xhdpi/ic_file_install.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/legacy/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_launcher.png
rename to legacy/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_repo_app_default.png b/legacy/src/main/res/drawable-xhdpi/ic_repo_app_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_repo_app_default.png
rename to legacy/src/main/res/drawable-xhdpi/ic_repo_app_default.png
diff --git a/app/src/main/res/drawable-xhdpi/tab_unselected_holo.9.png b/legacy/src/main/res/drawable-xhdpi/tab_unselected_holo.9.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/tab_unselected_holo.9.png
rename to legacy/src/main/res/drawable-xhdpi/tab_unselected_holo.9.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_install.png b/legacy/src/main/res/drawable-xxhdpi/ic_file_install.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_file_install.png
rename to legacy/src/main/res/drawable-xxhdpi/ic_file_install.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/legacy/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to legacy/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_repo_app_default.png b/legacy/src/main/res/drawable-xxhdpi/ic_repo_app_default.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_repo_app_default.png
rename to legacy/src/main/res/drawable-xxhdpi/ic_repo_app_default.png
diff --git a/app/src/main/res/drawable-xxhdpi/tab_unselected_holo.9.png b/legacy/src/main/res/drawable-xxhdpi/tab_unselected_holo.9.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/tab_unselected_holo.9.png
rename to legacy/src/main/res/drawable-xxhdpi/tab_unselected_holo.9.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_install.png b/legacy/src/main/res/drawable-xxxhdpi/ic_file_install.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_file_install.png
rename to legacy/src/main/res/drawable-xxxhdpi/ic_file_install.png
diff --git a/next/src/main/res/drawable/ic_launcher.png b/legacy/src/main/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from next/src/main/res/drawable/ic_launcher.png
rename to legacy/src/main/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_repo_app_default.png b/legacy/src/main/res/drawable-xxxhdpi/ic_repo_app_default.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_repo_app_default.png
rename to legacy/src/main/res/drawable-xxxhdpi/ic_repo_app_default.png
diff --git a/app/src/main/res/drawable/app_version_item_status_incompatible.xml b/legacy/src/main/res/drawable/app_version_item_status_incompatible.xml
similarity index 100%
rename from app/src/main/res/drawable/app_version_item_status_incompatible.xml
rename to legacy/src/main/res/drawable/app_version_item_status_incompatible.xml
diff --git a/app/src/main/res/drawable/app_version_item_status_installed.xml b/legacy/src/main/res/drawable/app_version_item_status_installed.xml
similarity index 100%
rename from app/src/main/res/drawable/app_version_item_status_installed.xml
rename to legacy/src/main/res/drawable/app_version_item_status_installed.xml
diff --git a/app/src/main/res/drawable/app_version_item_status_new.xml b/legacy/src/main/res/drawable/app_version_item_status_new.xml
similarity index 100%
rename from app/src/main/res/drawable/app_version_item_status_new.xml
rename to legacy/src/main/res/drawable/app_version_item_status_new.xml
diff --git a/app/src/main/res/drawable/app_version_item_status_suggested.xml b/legacy/src/main/res/drawable/app_version_item_status_suggested.xml
similarity index 100%
rename from app/src/main/res/drawable/app_version_item_status_suggested.xml
rename to legacy/src/main/res/drawable/app_version_item_status_suggested.xml
diff --git a/app/src/main/res/drawable/background_circle.xml b/legacy/src/main/res/drawable/background_circle.xml
similarity index 100%
rename from app/src/main/res/drawable/background_circle.xml
rename to legacy/src/main/res/drawable/background_circle.xml
diff --git a/app/src/main/res/drawable/category_preview_app_card_background_dark.xml b/legacy/src/main/res/drawable/category_preview_app_card_background_dark.xml
similarity index 100%
rename from app/src/main/res/drawable/category_preview_app_card_background_dark.xml
rename to legacy/src/main/res/drawable/category_preview_app_card_background_dark.xml
diff --git a/app/src/main/res/drawable/category_preview_app_card_background_light.xml b/legacy/src/main/res/drawable/category_preview_app_card_background_light.xml
similarity index 100%
rename from app/src/main/res/drawable/category_preview_app_card_background_light.xml
rename to legacy/src/main/res/drawable/category_preview_app_card_background_light.xml
diff --git a/app/src/main/res/drawable/donation_option_bitcoin.xml b/legacy/src/main/res/drawable/donation_option_bitcoin.xml
similarity index 100%
rename from app/src/main/res/drawable/donation_option_bitcoin.xml
rename to legacy/src/main/res/drawable/donation_option_bitcoin.xml
diff --git a/app/src/main/res/drawable/donation_option_liberapay.xml b/legacy/src/main/res/drawable/donation_option_liberapay.xml
similarity index 100%
rename from app/src/main/res/drawable/donation_option_liberapay.xml
rename to legacy/src/main/res/drawable/donation_option_liberapay.xml
diff --git a/app/src/main/res/drawable/donation_option_litecoin.xml b/legacy/src/main/res/drawable/donation_option_litecoin.xml
similarity index 100%
rename from app/src/main/res/drawable/donation_option_litecoin.xml
rename to legacy/src/main/res/drawable/donation_option_litecoin.xml
diff --git a/app/src/main/res/drawable/donation_option_opencollective.xml b/legacy/src/main/res/drawable/donation_option_opencollective.xml
similarity index 100%
rename from app/src/main/res/drawable/donation_option_opencollective.xml
rename to legacy/src/main/res/drawable/donation_option_opencollective.xml
diff --git a/app/src/main/res/drawable/ic_add.xml b/legacy/src/main/res/drawable/ic_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add.xml
rename to legacy/src/main/res/drawable/ic_add.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_ads.xml b/legacy/src/main/res/drawable/ic_antifeature_ads.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_ads.xml
rename to legacy/src/main/res/drawable/ic_antifeature_ads.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml b/legacy/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml
rename to legacy/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_knownvuln.xml b/legacy/src/main/res/drawable/ic_antifeature_knownvuln.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_knownvuln.xml
rename to legacy/src/main/res/drawable/ic_antifeature_knownvuln.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreeadd.xml b/legacy/src/main/res/drawable/ic_antifeature_nonfreeadd.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_nonfreeadd.xml
rename to legacy/src/main/res/drawable/ic_antifeature_nonfreeadd.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreeassets.xml b/legacy/src/main/res/drawable/ic_antifeature_nonfreeassets.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_nonfreeassets.xml
rename to legacy/src/main/res/drawable/ic_antifeature_nonfreeassets.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreedep.xml b/legacy/src/main/res/drawable/ic_antifeature_nonfreedep.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_nonfreedep.xml
rename to legacy/src/main/res/drawable/ic_antifeature_nonfreedep.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreenet.xml b/legacy/src/main/res/drawable/ic_antifeature_nonfreenet.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_nonfreenet.xml
rename to legacy/src/main/res/drawable/ic_antifeature_nonfreenet.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_nosourcesince.xml b/legacy/src/main/res/drawable/ic_antifeature_nosourcesince.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_nosourcesince.xml
rename to legacy/src/main/res/drawable/ic_antifeature_nosourcesince.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_nsfw.xml b/legacy/src/main/res/drawable/ic_antifeature_nsfw.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_nsfw.xml
rename to legacy/src/main/res/drawable/ic_antifeature_nsfw.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_tetherednet.xml b/legacy/src/main/res/drawable/ic_antifeature_tetherednet.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_tetherednet.xml
rename to legacy/src/main/res/drawable/ic_antifeature_tetherednet.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_tracking.xml b/legacy/src/main/res/drawable/ic_antifeature_tracking.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_tracking.xml
rename to legacy/src/main/res/drawable/ic_antifeature_tracking.xml
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/legacy/src/main/res/drawable/ic_arrow_back.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_back.xml
rename to legacy/src/main/res/drawable/ic_arrow_back.xml
diff --git a/app/src/main/res/drawable/ic_arrow_back_with_background.xml b/legacy/src/main/res/drawable/ic_arrow_back_with_background.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_back_with_background.xml
rename to legacy/src/main/res/drawable/ic_arrow_back_with_background.xml
diff --git a/app/src/main/res/drawable/ic_arrow_forward.xml b/legacy/src/main/res/drawable/ic_arrow_forward.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_forward.xml
rename to legacy/src/main/res/drawable/ic_arrow_forward.xml
diff --git a/app/src/main/res/drawable/ic_author.xml b/legacy/src/main/res/drawable/ic_author.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_author.xml
rename to legacy/src/main/res/drawable/ic_author.xml
diff --git a/app/src/main/res/drawable/ic_cancel.xml b/legacy/src/main/res/drawable/ic_cancel.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_cancel.xml
rename to legacy/src/main/res/drawable/ic_cancel.xml
diff --git a/app/src/main/res/drawable/ic_categories.xml b/legacy/src/main/res/drawable/ic_categories.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_categories.xml
rename to legacy/src/main/res/drawable/ic_categories.xml
diff --git a/app/src/main/res/drawable/ic_changelog.xml b/legacy/src/main/res/drawable/ic_changelog.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_changelog.xml
rename to legacy/src/main/res/drawable/ic_changelog.xml
diff --git a/app/src/main/res/drawable/ic_clear.xml b/legacy/src/main/res/drawable/ic_clear.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_clear.xml
rename to legacy/src/main/res/drawable/ic_clear.xml
diff --git a/app/src/main/res/drawable/ic_close.xml b/legacy/src/main/res/drawable/ic_close.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_close.xml
rename to legacy/src/main/res/drawable/ic_close.xml
diff --git a/app/src/main/res/drawable/ic_delete.xml b/legacy/src/main/res/drawable/ic_delete.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_delete.xml
rename to legacy/src/main/res/drawable/ic_delete.xml
diff --git a/app/src/main/res/drawable/ic_donate.xml b/legacy/src/main/res/drawable/ic_donate.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_donate.xml
rename to legacy/src/main/res/drawable/ic_donate.xml
diff --git a/app/src/main/res/drawable/ic_download.xml b/legacy/src/main/res/drawable/ic_download.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download.xml
rename to legacy/src/main/res/drawable/ic_download.xml
diff --git a/app/src/main/res/drawable/ic_download_progress.xml b/legacy/src/main/res/drawable/ic_download_progress.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress.xml
rename to legacy/src/main/res/drawable/ic_download_progress.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_0.xml b/legacy/src/main/res/drawable/ic_download_progress_0.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_0.xml
rename to legacy/src/main/res/drawable/ic_download_progress_0.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_105.xml b/legacy/src/main/res/drawable/ic_download_progress_105.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_105.xml
rename to legacy/src/main/res/drawable/ic_download_progress_105.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_120.xml b/legacy/src/main/res/drawable/ic_download_progress_120.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_120.xml
rename to legacy/src/main/res/drawable/ic_download_progress_120.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_135.xml b/legacy/src/main/res/drawable/ic_download_progress_135.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_135.xml
rename to legacy/src/main/res/drawable/ic_download_progress_135.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_15.xml b/legacy/src/main/res/drawable/ic_download_progress_15.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_15.xml
rename to legacy/src/main/res/drawable/ic_download_progress_15.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_150.xml b/legacy/src/main/res/drawable/ic_download_progress_150.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_150.xml
rename to legacy/src/main/res/drawable/ic_download_progress_150.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_165.xml b/legacy/src/main/res/drawable/ic_download_progress_165.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_165.xml
rename to legacy/src/main/res/drawable/ic_download_progress_165.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_180.xml b/legacy/src/main/res/drawable/ic_download_progress_180.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_180.xml
rename to legacy/src/main/res/drawable/ic_download_progress_180.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_195.xml b/legacy/src/main/res/drawable/ic_download_progress_195.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_195.xml
rename to legacy/src/main/res/drawable/ic_download_progress_195.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_210.xml b/legacy/src/main/res/drawable/ic_download_progress_210.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_210.xml
rename to legacy/src/main/res/drawable/ic_download_progress_210.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_225.xml b/legacy/src/main/res/drawable/ic_download_progress_225.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_225.xml
rename to legacy/src/main/res/drawable/ic_download_progress_225.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_240.xml b/legacy/src/main/res/drawable/ic_download_progress_240.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_240.xml
rename to legacy/src/main/res/drawable/ic_download_progress_240.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_255.xml b/legacy/src/main/res/drawable/ic_download_progress_255.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_255.xml
rename to legacy/src/main/res/drawable/ic_download_progress_255.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_270.xml b/legacy/src/main/res/drawable/ic_download_progress_270.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_270.xml
rename to legacy/src/main/res/drawable/ic_download_progress_270.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_285.xml b/legacy/src/main/res/drawable/ic_download_progress_285.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_285.xml
rename to legacy/src/main/res/drawable/ic_download_progress_285.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_30.xml b/legacy/src/main/res/drawable/ic_download_progress_30.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_30.xml
rename to legacy/src/main/res/drawable/ic_download_progress_30.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_300.xml b/legacy/src/main/res/drawable/ic_download_progress_300.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_300.xml
rename to legacy/src/main/res/drawable/ic_download_progress_300.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_315.xml b/legacy/src/main/res/drawable/ic_download_progress_315.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_315.xml
rename to legacy/src/main/res/drawable/ic_download_progress_315.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_330.xml b/legacy/src/main/res/drawable/ic_download_progress_330.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_330.xml
rename to legacy/src/main/res/drawable/ic_download_progress_330.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_345.xml b/legacy/src/main/res/drawable/ic_download_progress_345.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_345.xml
rename to legacy/src/main/res/drawable/ic_download_progress_345.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_360.xml b/legacy/src/main/res/drawable/ic_download_progress_360.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_360.xml
rename to legacy/src/main/res/drawable/ic_download_progress_360.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_45.xml b/legacy/src/main/res/drawable/ic_download_progress_45.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_45.xml
rename to legacy/src/main/res/drawable/ic_download_progress_45.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_60.xml b/legacy/src/main/res/drawable/ic_download_progress_60.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_60.xml
rename to legacy/src/main/res/drawable/ic_download_progress_60.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_75.xml b/legacy/src/main/res/drawable/ic_download_progress_75.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_75.xml
rename to legacy/src/main/res/drawable/ic_download_progress_75.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_90.xml b/legacy/src/main/res/drawable/ic_download_progress_90.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_90.xml
rename to legacy/src/main/res/drawable/ic_download_progress_90.xml
diff --git a/app/src/main/res/drawable/ic_email.xml b/legacy/src/main/res/drawable/ic_email.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_email.xml
rename to legacy/src/main/res/drawable/ic_email.xml
diff --git a/app/src/main/res/drawable/ic_error.xml b/legacy/src/main/res/drawable/ic_error.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_error.xml
rename to legacy/src/main/res/drawable/ic_error.xml
diff --git a/app/src/main/res/drawable/ic_expand_less.xml b/legacy/src/main/res/drawable/ic_expand_less.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_expand_less.xml
rename to legacy/src/main/res/drawable/ic_expand_less.xml
diff --git a/app/src/main/res/drawable/ic_expand_more.xml b/legacy/src/main/res/drawable/ic_expand_more.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_expand_more.xml
rename to legacy/src/main/res/drawable/ic_expand_more.xml
diff --git a/app/src/main/res/drawable/ic_file_download.xml b/legacy/src/main/res/drawable/ic_file_download.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_download.xml
rename to legacy/src/main/res/drawable/ic_file_download.xml
diff --git a/app/src/main/res/drawable/ic_info.xml b/legacy/src/main/res/drawable/ic_info.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_info.xml
rename to legacy/src/main/res/drawable/ic_info.xml
diff --git a/app/src/main/res/drawable/ic_known_vuln_overlay.xml b/legacy/src/main/res/drawable/ic_known_vuln_overlay.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_known_vuln_overlay.xml
rename to legacy/src/main/res/drawable/ic_known_vuln_overlay.xml
diff --git a/app/src/main/res/drawable/ic_last_updated.xml b/legacy/src/main/res/drawable/ic_last_updated.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_last_updated.xml
rename to legacy/src/main/res/drawable/ic_last_updated.xml
diff --git a/app/src/main/res/drawable/ic_latest.xml b/legacy/src/main/res/drawable/ic_latest.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_latest.xml
rename to legacy/src/main/res/drawable/ic_latest.xml
diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/legacy/src/main/res/drawable/ic_launcher_monochrome.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_launcher_monochrome.xml
rename to legacy/src/main/res/drawable/ic_launcher_monochrome.xml
diff --git a/app/src/main/res/drawable/ic_license.xml b/legacy/src/main/res/drawable/ic_license.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_license.xml
rename to legacy/src/main/res/drawable/ic_license.xml
diff --git a/app/src/main/res/drawable/ic_link.xml b/legacy/src/main/res/drawable/ic_link.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_link.xml
rename to legacy/src/main/res/drawable/ic_link.xml
diff --git a/app/src/main/res/drawable/ic_lock.xml b/legacy/src/main/res/drawable/ic_lock.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_lock.xml
rename to legacy/src/main/res/drawable/ic_lock.xml
diff --git a/app/src/main/res/drawable/ic_more.xml b/legacy/src/main/res/drawable/ic_more.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_more.xml
rename to legacy/src/main/res/drawable/ic_more.xml
diff --git a/app/src/main/res/drawable/ic_more_with_background.xml b/legacy/src/main/res/drawable/ic_more_with_background.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_more_with_background.xml
rename to legacy/src/main/res/drawable/ic_more_with_background.xml
diff --git a/next/src/main/res/drawable/ic_notification.xml b/legacy/src/main/res/drawable/ic_notification.xml
similarity index 96%
rename from next/src/main/res/drawable/ic_notification.xml
rename to legacy/src/main/res/drawable/ic_notification.xml
index 53951dfa5..ecba10fa2 100644
--- a/next/src/main/res/drawable/ic_notification.xml
+++ b/legacy/src/main/res/drawable/ic_notification.xml
@@ -1,6 +1,6 @@
 <vector android:height="24dp"
     android:viewportHeight="48.0"
-    android:tint="?android:attr/colorControlNormal"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="48.0"
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/ic_notification_download.xml b/legacy/src/main/res/drawable/ic_notification_download.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_notification_download.xml
rename to legacy/src/main/res/drawable/ic_notification_download.xml
diff --git a/app/src/main/res/drawable/ic_perm_device_info.xml b/legacy/src/main/res/drawable/ic_perm_device_info.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_perm_device_info.xml
rename to legacy/src/main/res/drawable/ic_perm_device_info.xml
diff --git a/next/src/main/res/drawable/ic_refresh.xml b/legacy/src/main/res/drawable/ic_refresh.xml
similarity index 90%
rename from next/src/main/res/drawable/ic_refresh.xml
rename to legacy/src/main/res/drawable/ic_refresh.xml
index 15e746762..e9b1ec853 100644
--- a/next/src/main/res/drawable/ic_refresh.xml
+++ b/legacy/src/main/res/drawable/ic_refresh.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?android:attr/colorControlNormal"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_repo.xml b/legacy/src/main/res/drawable/ic_repo.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_repo.xml
rename to legacy/src/main/res/drawable/ic_repo.xml
diff --git a/app/src/main/res/drawable/ic_search.xml b/legacy/src/main/res/drawable/ic_search.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_search.xml
rename to legacy/src/main/res/drawable/ic_search.xml
diff --git a/app/src/main/res/drawable/ic_settings.xml b/legacy/src/main/res/drawable/ic_settings.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_settings.xml
rename to legacy/src/main/res/drawable/ic_settings.xml
diff --git a/app/src/main/res/drawable/ic_share.xml b/legacy/src/main/res/drawable/ic_share.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_share.xml
rename to legacy/src/main/res/drawable/ic_share.xml
diff --git a/app/src/main/res/drawable/ic_share_with_background.xml b/legacy/src/main/res/drawable/ic_share_with_background.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_share_with_background.xml
rename to legacy/src/main/res/drawable/ic_share_with_background.xml
diff --git a/app/src/main/res/drawable/ic_sort.xml b/legacy/src/main/res/drawable/ic_sort.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_sort.xml
rename to legacy/src/main/res/drawable/ic_sort.xml
diff --git a/app/src/main/res/drawable/ic_source_code.xml b/legacy/src/main/res/drawable/ic_source_code.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_source_code.xml
rename to legacy/src/main/res/drawable/ic_source_code.xml
diff --git a/app/src/main/res/drawable/ic_translation.xml b/legacy/src/main/res/drawable/ic_translation.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_translation.xml
rename to legacy/src/main/res/drawable/ic_translation.xml
diff --git a/app/src/main/res/drawable/ic_updates.xml b/legacy/src/main/res/drawable/ic_updates.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_updates.xml
rename to legacy/src/main/res/drawable/ic_updates.xml
diff --git a/app/src/main/res/drawable/ic_versions.xml b/legacy/src/main/res/drawable/ic_versions.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_versions.xml
rename to legacy/src/main/res/drawable/ic_versions.xml
diff --git a/app/src/main/res/drawable/ic_video.xml b/legacy/src/main/res/drawable/ic_video.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_video.xml
rename to legacy/src/main/res/drawable/ic_video.xml
diff --git a/app/src/main/res/drawable/ic_warning.xml b/legacy/src/main/res/drawable/ic_warning.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_warning.xml
rename to legacy/src/main/res/drawable/ic_warning.xml
diff --git a/app/src/main/res/drawable/ic_website.xml b/legacy/src/main/res/drawable/ic_website.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_website.xml
rename to legacy/src/main/res/drawable/ic_website.xml
diff --git a/app/src/main/res/drawable/no_updates_bg.xml b/legacy/src/main/res/drawable/no_updates_bg.xml
similarity index 100%
rename from app/src/main/res/drawable/no_updates_bg.xml
rename to legacy/src/main/res/drawable/no_updates_bg.xml
diff --git a/app/src/main/res/drawable/screenshot_placeholder.xml b/legacy/src/main/res/drawable/screenshot_placeholder.xml
similarity index 100%
rename from app/src/main/res/drawable/screenshot_placeholder.xml
rename to legacy/src/main/res/drawable/screenshot_placeholder.xml
diff --git a/app/src/main/res/drawable/seekbar_background.xml b/legacy/src/main/res/drawable/seekbar_background.xml
similarity index 100%
rename from app/src/main/res/drawable/seekbar_background.xml
rename to legacy/src/main/res/drawable/seekbar_background.xml
diff --git a/app/src/main/res/drawable/seekbar_thumb.xml b/legacy/src/main/res/drawable/seekbar_thumb.xml
similarity index 100%
rename from app/src/main/res/drawable/seekbar_thumb.xml
rename to legacy/src/main/res/drawable/seekbar_thumb.xml
diff --git a/app/src/main/res/drawable/seekbar_tickmark.xml b/legacy/src/main/res/drawable/seekbar_tickmark.xml
similarity index 100%
rename from app/src/main/res/drawable/seekbar_tickmark.xml
rename to legacy/src/main/res/drawable/seekbar_tickmark.xml
diff --git a/app/src/main/res/drawable/swap_qr_example.png b/legacy/src/main/res/drawable/swap_qr_example.png
similarity index 100%
rename from app/src/main/res/drawable/swap_qr_example.png
rename to legacy/src/main/res/drawable/swap_qr_example.png
diff --git a/app/src/main/res/layout/about.xml b/legacy/src/main/res/layout/about.xml
similarity index 100%
rename from app/src/main/res/layout/about.xml
rename to legacy/src/main/res/layout/about.xml
diff --git a/app/src/main/res/layout/activity_app_list.xml b/legacy/src/main/res/layout/activity_app_list.xml
similarity index 100%
rename from app/src/main/res/layout/activity_app_list.xml
rename to legacy/src/main/res/layout/activity_app_list.xml
diff --git a/app/src/main/res/layout/activity_install_history.xml b/legacy/src/main/res/layout/activity_install_history.xml
similarity index 100%
rename from app/src/main/res/layout/activity_install_history.xml
rename to legacy/src/main/res/layout/activity_install_history.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/legacy/src/main/res/layout/activity_main.xml
similarity index 100%
rename from app/src/main/res/layout/activity_main.xml
rename to legacy/src/main/res/layout/activity_main.xml
diff --git a/app/src/main/res/layout/activity_screenshots.xml b/legacy/src/main/res/layout/activity_screenshots.xml
similarity index 100%
rename from app/src/main/res/layout/activity_screenshots.xml
rename to legacy/src/main/res/layout/activity_screenshots.xml
diff --git a/app/src/main/res/layout/activity_screenshots_page.xml b/legacy/src/main/res/layout/activity_screenshots_page.xml
similarity index 100%
rename from app/src/main/res/layout/activity_screenshots_page.xml
rename to legacy/src/main/res/layout/activity_screenshots_page.xml
diff --git a/app/src/main/res/layout/app_card_horizontal.xml b/legacy/src/main/res/layout/app_card_horizontal.xml
similarity index 100%
rename from app/src/main/res/layout/app_card_horizontal.xml
rename to legacy/src/main/res/layout/app_card_horizontal.xml
diff --git a/app/src/main/res/layout/app_card_large.xml b/legacy/src/main/res/layout/app_card_large.xml
similarity index 100%
rename from app/src/main/res/layout/app_card_large.xml
rename to legacy/src/main/res/layout/app_card_large.xml
diff --git a/app/src/main/res/layout/app_card_list_item.xml b/legacy/src/main/res/layout/app_card_list_item.xml
similarity index 100%
rename from app/src/main/res/layout/app_card_list_item.xml
rename to legacy/src/main/res/layout/app_card_list_item.xml
diff --git a/app/src/main/res/layout/app_card_normal.xml b/legacy/src/main/res/layout/app_card_normal.xml
similarity index 100%
rename from app/src/main/res/layout/app_card_normal.xml
rename to legacy/src/main/res/layout/app_card_normal.xml
diff --git a/app/src/main/res/layout/app_details2.xml b/legacy/src/main/res/layout/app_details2.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2.xml
rename to legacy/src/main/res/layout/app_details2.xml
diff --git a/app/src/main/res/layout/app_details2_donate.xml b/legacy/src/main/res/layout/app_details2_donate.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_donate.xml
rename to legacy/src/main/res/layout/app_details2_donate.xml
diff --git a/app/src/main/res/layout/app_details2_header.xml b/legacy/src/main/res/layout/app_details2_header.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_header.xml
rename to legacy/src/main/res/layout/app_details2_header.xml
diff --git a/app/src/main/res/layout/app_details2_link_item.xml b/legacy/src/main/res/layout/app_details2_link_item.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_link_item.xml
rename to legacy/src/main/res/layout/app_details2_link_item.xml
diff --git a/app/src/main/res/layout/app_details2_links.xml b/legacy/src/main/res/layout/app_details2_links.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_links.xml
rename to legacy/src/main/res/layout/app_details2_links.xml
diff --git a/app/src/main/res/layout/app_details2_loading.xml b/legacy/src/main/res/layout/app_details2_loading.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_loading.xml
rename to legacy/src/main/res/layout/app_details2_loading.xml
diff --git a/app/src/main/res/layout/app_details2_more_apps.xml b/legacy/src/main/res/layout/app_details2_more_apps.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_more_apps.xml
rename to legacy/src/main/res/layout/app_details2_more_apps.xml
diff --git a/app/src/main/res/layout/app_details2_screenshot_item.xml b/legacy/src/main/res/layout/app_details2_screenshot_item.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_screenshot_item.xml
rename to legacy/src/main/res/layout/app_details2_screenshot_item.xml
diff --git a/app/src/main/res/layout/app_details2_screenshots.xml b/legacy/src/main/res/layout/app_details2_screenshots.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_screenshots.xml
rename to legacy/src/main/res/layout/app_details2_screenshots.xml
diff --git a/app/src/main/res/layout/app_details2_version_item.xml b/legacy/src/main/res/layout/app_details2_version_item.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_version_item.xml
rename to legacy/src/main/res/layout/app_details2_version_item.xml
diff --git a/app/src/main/res/layout/app_list_item.xml b/legacy/src/main/res/layout/app_list_item.xml
similarity index 100%
rename from app/src/main/res/layout/app_list_item.xml
rename to legacy/src/main/res/layout/app_list_item.xml
diff --git a/app/src/main/res/layout/app_permission_item.xml b/legacy/src/main/res/layout/app_permission_item.xml
similarity index 100%
rename from app/src/main/res/layout/app_permission_item.xml
rename to legacy/src/main/res/layout/app_permission_item.xml
diff --git a/app/src/main/res/layout/app_permission_item_money.xml b/legacy/src/main/res/layout/app_permission_item_money.xml
similarity index 100%
rename from app/src/main/res/layout/app_permission_item_money.xml
rename to legacy/src/main/res/layout/app_permission_item_money.xml
diff --git a/app/src/main/res/layout/app_perms_summary.xml b/legacy/src/main/res/layout/app_perms_summary.xml
similarity index 100%
rename from app/src/main/res/layout/app_perms_summary.xml
rename to legacy/src/main/res/layout/app_perms_summary.xml
diff --git a/app/src/main/res/layout/app_status_new.xml b/legacy/src/main/res/layout/app_status_new.xml
similarity index 100%
rename from app/src/main/res/layout/app_status_new.xml
rename to legacy/src/main/res/layout/app_status_new.xml
diff --git a/app/src/main/res/layout/app_status_suggested.xml b/legacy/src/main/res/layout/app_status_suggested.xml
similarity index 100%
rename from app/src/main/res/layout/app_status_suggested.xml
rename to legacy/src/main/res/layout/app_status_suggested.xml
diff --git a/app/src/main/res/layout/category_item.xml b/legacy/src/main/res/layout/category_item.xml
similarity index 100%
rename from app/src/main/res/layout/category_item.xml
rename to legacy/src/main/res/layout/category_item.xml
diff --git a/app/src/main/res/layout/donate_bitcoin.xml b/legacy/src/main/res/layout/donate_bitcoin.xml
similarity index 100%
rename from app/src/main/res/layout/donate_bitcoin.xml
rename to legacy/src/main/res/layout/donate_bitcoin.xml
diff --git a/app/src/main/res/layout/donate_generic.xml b/legacy/src/main/res/layout/donate_generic.xml
similarity index 100%
rename from app/src/main/res/layout/donate_generic.xml
rename to legacy/src/main/res/layout/donate_generic.xml
diff --git a/app/src/main/res/layout/donate_liberapay.xml b/legacy/src/main/res/layout/donate_liberapay.xml
similarity index 100%
rename from app/src/main/res/layout/donate_liberapay.xml
rename to legacy/src/main/res/layout/donate_liberapay.xml
diff --git a/app/src/main/res/layout/donate_litecoin.xml b/legacy/src/main/res/layout/donate_litecoin.xml
similarity index 100%
rename from app/src/main/res/layout/donate_litecoin.xml
rename to legacy/src/main/res/layout/donate_litecoin.xml
diff --git a/app/src/main/res/layout/donate_opencollective.xml b/legacy/src/main/res/layout/donate_opencollective.xml
similarity index 100%
rename from app/src/main/res/layout/donate_opencollective.xml
rename to legacy/src/main/res/layout/donate_opencollective.xml
diff --git a/app/src/main/res/layout/fab_search.xml b/legacy/src/main/res/layout/fab_search.xml
similarity index 100%
rename from app/src/main/res/layout/fab_search.xml
rename to legacy/src/main/res/layout/fab_search.xml
diff --git a/app/src/main/res/layout/install_app_details.xml b/legacy/src/main/res/layout/install_app_details.xml
similarity index 100%
rename from app/src/main/res/layout/install_app_details.xml
rename to legacy/src/main/res/layout/install_app_details.xml
diff --git a/app/src/main/res/layout/install_confirm.xml b/legacy/src/main/res/layout/install_confirm.xml
similarity index 100%
rename from app/src/main/res/layout/install_confirm.xml
rename to legacy/src/main/res/layout/install_confirm.xml
diff --git a/app/src/main/res/layout/install_start.xml b/legacy/src/main/res/layout/install_start.xml
similarity index 100%
rename from app/src/main/res/layout/install_start.xml
rename to legacy/src/main/res/layout/install_start.xml
diff --git a/app/src/main/res/layout/installed_app_list_item.xml b/legacy/src/main/res/layout/installed_app_list_item.xml
similarity index 100%
rename from app/src/main/res/layout/installed_app_list_item.xml
rename to legacy/src/main/res/layout/installed_app_list_item.xml
diff --git a/app/src/main/res/layout/installed_apps_layout.xml b/legacy/src/main/res/layout/installed_apps_layout.xml
similarity index 100%
rename from app/src/main/res/layout/installed_apps_layout.xml
rename to legacy/src/main/res/layout/installed_apps_layout.xml
diff --git a/app/src/main/res/layout/known_vuln_app_list_item.xml b/legacy/src/main/res/layout/known_vuln_app_list_item.xml
similarity index 100%
rename from app/src/main/res/layout/known_vuln_app_list_item.xml
rename to legacy/src/main/res/layout/known_vuln_app_list_item.xml
diff --git a/app/src/main/res/layout/listitem_antifeaturelisting.xml b/legacy/src/main/res/layout/listitem_antifeaturelisting.xml
similarity index 100%
rename from app/src/main/res/layout/listitem_antifeaturelisting.xml
rename to legacy/src/main/res/layout/listitem_antifeaturelisting.xml
diff --git a/app/src/main/res/layout/login.xml b/legacy/src/main/res/layout/login.xml
similarity index 100%
rename from app/src/main/res/layout/login.xml
rename to legacy/src/main/res/layout/login.xml
diff --git a/app/src/main/res/layout/main_tab_categories.xml b/legacy/src/main/res/layout/main_tab_categories.xml
similarity index 100%
rename from app/src/main/res/layout/main_tab_categories.xml
rename to legacy/src/main/res/layout/main_tab_categories.xml
diff --git a/app/src/main/res/layout/main_tab_latest.xml b/legacy/src/main/res/layout/main_tab_latest.xml
similarity index 100%
rename from app/src/main/res/layout/main_tab_latest.xml
rename to legacy/src/main/res/layout/main_tab_latest.xml
diff --git a/app/src/main/res/layout/main_tab_settings.xml b/legacy/src/main/res/layout/main_tab_settings.xml
similarity index 100%
rename from app/src/main/res/layout/main_tab_settings.xml
rename to legacy/src/main/res/layout/main_tab_settings.xml
diff --git a/app/src/main/res/layout/main_tab_updates.xml b/legacy/src/main/res/layout/main_tab_updates.xml
similarity index 100%
rename from app/src/main/res/layout/main_tab_updates.xml
rename to legacy/src/main/res/layout/main_tab_updates.xml
diff --git a/app/src/main/res/layout/permissions_list.xml b/legacy/src/main/res/layout/permissions_list.xml
similarity index 100%
rename from app/src/main/res/layout/permissions_list.xml
rename to legacy/src/main/res/layout/permissions_list.xml
diff --git a/app/src/main/res/layout/preference_edit_text.xml b/legacy/src/main/res/layout/preference_edit_text.xml
similarity index 100%
rename from app/src/main/res/layout/preference_edit_text.xml
rename to legacy/src/main/res/layout/preference_edit_text.xml
diff --git a/app/src/main/res/layout/preference_seekbar.xml b/legacy/src/main/res/layout/preference_seekbar.xml
similarity index 100%
rename from app/src/main/res/layout/preference_seekbar.xml
rename to legacy/src/main/res/layout/preference_seekbar.xml
diff --git a/app/src/main/res/layout/preference_switch.xml b/legacy/src/main/res/layout/preference_switch.xml
similarity index 100%
rename from app/src/main/res/layout/preference_switch.xml
rename to legacy/src/main/res/layout/preference_switch.xml
diff --git a/app/src/main/res/layout/repo_item.xml b/legacy/src/main/res/layout/repo_item.xml
similarity index 100%
rename from app/src/main/res/layout/repo_item.xml
rename to legacy/src/main/res/layout/repo_item.xml
diff --git a/app/src/main/res/layout/repo_list_activity.xml b/legacy/src/main/res/layout/repo_list_activity.xml
similarity index 100%
rename from app/src/main/res/layout/repo_list_activity.xml
rename to legacy/src/main/res/layout/repo_list_activity.xml
diff --git a/app/src/main/res/layout/updateable_app_list_item.xml b/legacy/src/main/res/layout/updateable_app_list_item.xml
similarity index 100%
rename from app/src/main/res/layout/updateable_app_list_item.xml
rename to legacy/src/main/res/layout/updateable_app_list_item.xml
diff --git a/app/src/main/res/layout/updateable_app_status_item.xml b/legacy/src/main/res/layout/updateable_app_status_item.xml
similarity index 100%
rename from app/src/main/res/layout/updateable_app_status_item.xml
rename to legacy/src/main/res/layout/updateable_app_status_item.xml
diff --git a/app/src/main/res/layout/updates_header.xml b/legacy/src/main/res/layout/updates_header.xml
similarity index 100%
rename from app/src/main/res/layout/updates_header.xml
rename to legacy/src/main/res/layout/updates_header.xml
diff --git a/app/src/main/res/menu/details2.xml b/legacy/src/main/res/menu/details2.xml
similarity index 100%
rename from app/src/main/res/menu/details2.xml
rename to legacy/src/main/res/menu/details2.xml
diff --git a/app/src/main/res/menu/install_history.xml b/legacy/src/main/res/menu/install_history.xml
similarity index 100%
rename from app/src/main/res/menu/install_history.xml
rename to legacy/src/main/res/menu/install_history.xml
diff --git a/app/src/main/res/menu/installed_apps.xml b/legacy/src/main/res/menu/installed_apps.xml
similarity index 100%
rename from app/src/main/res/menu/installed_apps.xml
rename to legacy/src/main/res/menu/installed_apps.xml
diff --git a/app/src/main/res/menu/main_activity_screens.xml b/legacy/src/main/res/menu/main_activity_screens.xml
similarity index 100%
rename from app/src/main/res/menu/main_activity_screens.xml
rename to legacy/src/main/res/menu/main_activity_screens.xml
diff --git a/app/src/main/res/menu/repo_list.xml b/legacy/src/main/res/menu/repo_list.xml
similarity index 100%
rename from app/src/main/res/menu/repo_list.xml
rename to legacy/src/main/res/menu/repo_list.xml
diff --git a/app/src/main/res/values-af/strings.xml b/legacy/src/main/res/values-af/strings.xml
similarity index 100%
rename from app/src/main/res/values-af/strings.xml
rename to legacy/src/main/res/values-af/strings.xml
diff --git a/app/src/main/res/values-ar/strings.xml b/legacy/src/main/res/values-ar/strings.xml
similarity index 100%
rename from app/src/main/res/values-ar/strings.xml
rename to legacy/src/main/res/values-ar/strings.xml
diff --git a/app/src/main/res/values-ast/strings.xml b/legacy/src/main/res/values-ast/strings.xml
similarity index 100%
rename from app/src/main/res/values-ast/strings.xml
rename to legacy/src/main/res/values-ast/strings.xml
diff --git a/app/src/main/res/values-az/strings.xml b/legacy/src/main/res/values-az/strings.xml
similarity index 100%
rename from app/src/main/res/values-az/strings.xml
rename to legacy/src/main/res/values-az/strings.xml
diff --git a/app/src/main/res/values-b+hi+Latn/strings.xml b/legacy/src/main/res/values-b+hi+Latn/strings.xml
similarity index 100%
rename from app/src/main/res/values-b+hi+Latn/strings.xml
rename to legacy/src/main/res/values-b+hi+Latn/strings.xml
diff --git a/app/src/main/res/values-be/strings.xml b/legacy/src/main/res/values-be/strings.xml
similarity index 100%
rename from app/src/main/res/values-be/strings.xml
rename to legacy/src/main/res/values-be/strings.xml
diff --git a/app/src/main/res/values-ber/strings.xml b/legacy/src/main/res/values-ber/strings.xml
similarity index 100%
rename from app/src/main/res/values-ber/strings.xml
rename to legacy/src/main/res/values-ber/strings.xml
diff --git a/app/src/main/res/values-bg/strings.xml b/legacy/src/main/res/values-bg/strings.xml
similarity index 100%
rename from app/src/main/res/values-bg/strings.xml
rename to legacy/src/main/res/values-bg/strings.xml
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/legacy/src/main/res/values-bn-rBD/strings.xml
similarity index 100%
rename from app/src/main/res/values-bn-rBD/strings.xml
rename to legacy/src/main/res/values-bn-rBD/strings.xml
diff --git a/app/src/main/res/values-bn/strings.xml b/legacy/src/main/res/values-bn/strings.xml
similarity index 100%
rename from app/src/main/res/values-bn/strings.xml
rename to legacy/src/main/res/values-bn/strings.xml
diff --git a/app/src/main/res/values-bo/strings.xml b/legacy/src/main/res/values-bo/strings.xml
similarity index 100%
rename from app/src/main/res/values-bo/strings.xml
rename to legacy/src/main/res/values-bo/strings.xml
diff --git a/app/src/main/res/values-br/strings.xml b/legacy/src/main/res/values-br/strings.xml
similarity index 100%
rename from app/src/main/res/values-br/strings.xml
rename to legacy/src/main/res/values-br/strings.xml
diff --git a/app/src/main/res/values-ca/strings.xml b/legacy/src/main/res/values-ca/strings.xml
similarity index 100%
rename from app/src/main/res/values-ca/strings.xml
rename to legacy/src/main/res/values-ca/strings.xml
diff --git a/app/src/main/res/values-ckb/strings.xml b/legacy/src/main/res/values-ckb/strings.xml
similarity index 100%
rename from app/src/main/res/values-ckb/strings.xml
rename to legacy/src/main/res/values-ckb/strings.xml
diff --git a/app/src/main/res/values-cs/strings.xml b/legacy/src/main/res/values-cs/strings.xml
similarity index 100%
rename from app/src/main/res/values-cs/strings.xml
rename to legacy/src/main/res/values-cs/strings.xml
diff --git a/app/src/main/res/values-cy/strings.xml b/legacy/src/main/res/values-cy/strings.xml
similarity index 100%
rename from app/src/main/res/values-cy/strings.xml
rename to legacy/src/main/res/values-cy/strings.xml
diff --git a/app/src/main/res/values-da/strings.xml b/legacy/src/main/res/values-da/strings.xml
similarity index 100%
rename from app/src/main/res/values-da/strings.xml
rename to legacy/src/main/res/values-da/strings.xml
diff --git a/app/src/main/res/values-de/strings.xml b/legacy/src/main/res/values-de/strings.xml
similarity index 100%
rename from app/src/main/res/values-de/strings.xml
rename to legacy/src/main/res/values-de/strings.xml
diff --git a/app/src/main/res/values-el/strings.xml b/legacy/src/main/res/values-el/strings.xml
similarity index 100%
rename from app/src/main/res/values-el/strings.xml
rename to legacy/src/main/res/values-el/strings.xml
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/legacy/src/main/res/values-en-rGB/strings.xml
similarity index 100%
rename from app/src/main/res/values-en-rGB/strings.xml
rename to legacy/src/main/res/values-en-rGB/strings.xml
diff --git a/app/src/main/res/values-eo/strings.xml b/legacy/src/main/res/values-eo/strings.xml
similarity index 100%
rename from app/src/main/res/values-eo/strings.xml
rename to legacy/src/main/res/values-eo/strings.xml
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/legacy/src/main/res/values-es-rAR/strings.xml
similarity index 100%
rename from app/src/main/res/values-es-rAR/strings.xml
rename to legacy/src/main/res/values-es-rAR/strings.xml
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/legacy/src/main/res/values-es-rMX/strings.xml
similarity index 100%
rename from app/src/main/res/values-es-rMX/strings.xml
rename to legacy/src/main/res/values-es-rMX/strings.xml
diff --git a/app/src/main/res/values-es/strings.xml b/legacy/src/main/res/values-es/strings.xml
similarity index 100%
rename from app/src/main/res/values-es/strings.xml
rename to legacy/src/main/res/values-es/strings.xml
diff --git a/app/src/main/res/values-et/strings.xml b/legacy/src/main/res/values-et/strings.xml
similarity index 100%
rename from app/src/main/res/values-et/strings.xml
rename to legacy/src/main/res/values-et/strings.xml
diff --git a/app/src/main/res/values-eu/strings.xml b/legacy/src/main/res/values-eu/strings.xml
similarity index 100%
rename from app/src/main/res/values-eu/strings.xml
rename to legacy/src/main/res/values-eu/strings.xml
diff --git a/app/src/main/res/values-fa/strings.xml b/legacy/src/main/res/values-fa/strings.xml
similarity index 100%
rename from app/src/main/res/values-fa/strings.xml
rename to legacy/src/main/res/values-fa/strings.xml
diff --git a/app/src/main/res/values-fi/strings.xml b/legacy/src/main/res/values-fi/strings.xml
similarity index 100%
rename from app/src/main/res/values-fi/strings.xml
rename to legacy/src/main/res/values-fi/strings.xml
diff --git a/app/src/main/res/values-fil/strings.xml b/legacy/src/main/res/values-fil/strings.xml
similarity index 100%
rename from app/src/main/res/values-fil/strings.xml
rename to legacy/src/main/res/values-fil/strings.xml
diff --git a/app/src/main/res/values-fr/strings.xml b/legacy/src/main/res/values-fr/strings.xml
similarity index 100%
rename from app/src/main/res/values-fr/strings.xml
rename to legacy/src/main/res/values-fr/strings.xml
diff --git a/app/src/main/res/values-fy/strings.xml b/legacy/src/main/res/values-fy/strings.xml
similarity index 100%
rename from app/src/main/res/values-fy/strings.xml
rename to legacy/src/main/res/values-fy/strings.xml
diff --git a/app/src/main/res/values-ga/strings.xml b/legacy/src/main/res/values-ga/strings.xml
similarity index 100%
rename from app/src/main/res/values-ga/strings.xml
rename to legacy/src/main/res/values-ga/strings.xml
diff --git a/app/src/main/res/values-gd/strings.xml b/legacy/src/main/res/values-gd/strings.xml
similarity index 100%
rename from app/src/main/res/values-gd/strings.xml
rename to legacy/src/main/res/values-gd/strings.xml
diff --git a/app/src/main/res/values-gl/strings.xml b/legacy/src/main/res/values-gl/strings.xml
similarity index 100%
rename from app/src/main/res/values-gl/strings.xml
rename to legacy/src/main/res/values-gl/strings.xml
diff --git a/app/src/main/res/values-gu/strings.xml b/legacy/src/main/res/values-gu/strings.xml
similarity index 100%
rename from app/src/main/res/values-gu/strings.xml
rename to legacy/src/main/res/values-gu/strings.xml
diff --git a/app/src/main/res/values-he/strings.xml b/legacy/src/main/res/values-he/strings.xml
similarity index 100%
rename from app/src/main/res/values-he/strings.xml
rename to legacy/src/main/res/values-he/strings.xml
diff --git a/app/src/main/res/values-hi/strings.xml b/legacy/src/main/res/values-hi/strings.xml
similarity index 100%
rename from app/src/main/res/values-hi/strings.xml
rename to legacy/src/main/res/values-hi/strings.xml
diff --git a/app/src/main/res/values-hr/strings.xml b/legacy/src/main/res/values-hr/strings.xml
similarity index 100%
rename from app/src/main/res/values-hr/strings.xml
rename to legacy/src/main/res/values-hr/strings.xml
diff --git a/app/src/main/res/values-hu/strings.xml b/legacy/src/main/res/values-hu/strings.xml
similarity index 100%
rename from app/src/main/res/values-hu/strings.xml
rename to legacy/src/main/res/values-hu/strings.xml
diff --git a/app/src/main/res/values-hy/strings.xml b/legacy/src/main/res/values-hy/strings.xml
similarity index 100%
rename from app/src/main/res/values-hy/strings.xml
rename to legacy/src/main/res/values-hy/strings.xml
diff --git a/app/src/main/res/values-id/strings.xml b/legacy/src/main/res/values-id/strings.xml
similarity index 100%
rename from app/src/main/res/values-id/strings.xml
rename to legacy/src/main/res/values-id/strings.xml
diff --git a/app/src/main/res/values-in b/legacy/src/main/res/values-in
similarity index 100%
rename from app/src/main/res/values-in
rename to legacy/src/main/res/values-in
diff --git a/app/src/main/res/values-is/strings.xml b/legacy/src/main/res/values-is/strings.xml
similarity index 100%
rename from app/src/main/res/values-is/strings.xml
rename to legacy/src/main/res/values-is/strings.xml
diff --git a/app/src/main/res/values-it/strings.xml b/legacy/src/main/res/values-it/strings.xml
similarity index 100%
rename from app/src/main/res/values-it/strings.xml
rename to legacy/src/main/res/values-it/strings.xml
diff --git a/app/src/main/res/values-iw b/legacy/src/main/res/values-iw
similarity index 100%
rename from app/src/main/res/values-iw
rename to legacy/src/main/res/values-iw
diff --git a/app/src/main/res/values-ja/strings.xml b/legacy/src/main/res/values-ja/strings.xml
similarity index 100%
rename from app/src/main/res/values-ja/strings.xml
rename to legacy/src/main/res/values-ja/strings.xml
diff --git a/app/src/main/res/values-ka/strings.xml b/legacy/src/main/res/values-ka/strings.xml
similarity index 100%
rename from app/src/main/res/values-ka/strings.xml
rename to legacy/src/main/res/values-ka/strings.xml
diff --git a/app/src/main/res/values-kab/strings.xml b/legacy/src/main/res/values-kab/strings.xml
similarity index 100%
rename from app/src/main/res/values-kab/strings.xml
rename to legacy/src/main/res/values-kab/strings.xml
diff --git a/app/src/main/res/values-kk/strings.xml b/legacy/src/main/res/values-kk/strings.xml
similarity index 100%
rename from app/src/main/res/values-kk/strings.xml
rename to legacy/src/main/res/values-kk/strings.xml
diff --git a/app/src/main/res/values-kmr/strings.xml b/legacy/src/main/res/values-kmr/strings.xml
similarity index 100%
rename from app/src/main/res/values-kmr/strings.xml
rename to legacy/src/main/res/values-kmr/strings.xml
diff --git a/app/src/main/res/values-kn/strings.xml b/legacy/src/main/res/values-kn/strings.xml
similarity index 100%
rename from app/src/main/res/values-kn/strings.xml
rename to legacy/src/main/res/values-kn/strings.xml
diff --git a/app/src/main/res/values-ko/strings.xml b/legacy/src/main/res/values-ko/strings.xml
similarity index 100%
rename from app/src/main/res/values-ko/strings.xml
rename to legacy/src/main/res/values-ko/strings.xml
diff --git a/app/src/main/res/values-lb/strings.xml b/legacy/src/main/res/values-lb/strings.xml
similarity index 100%
rename from app/src/main/res/values-lb/strings.xml
rename to legacy/src/main/res/values-lb/strings.xml
diff --git a/app/src/main/res/values-lt/strings.xml b/legacy/src/main/res/values-lt/strings.xml
similarity index 100%
rename from app/src/main/res/values-lt/strings.xml
rename to legacy/src/main/res/values-lt/strings.xml
diff --git a/app/src/main/res/values-lv/strings.xml b/legacy/src/main/res/values-lv/strings.xml
similarity index 100%
rename from app/src/main/res/values-lv/strings.xml
rename to legacy/src/main/res/values-lv/strings.xml
diff --git a/app/src/main/res/values-mk/strings.xml b/legacy/src/main/res/values-mk/strings.xml
similarity index 100%
rename from app/src/main/res/values-mk/strings.xml
rename to legacy/src/main/res/values-mk/strings.xml
diff --git a/app/src/main/res/values-ml/strings.xml b/legacy/src/main/res/values-ml/strings.xml
similarity index 100%
rename from app/src/main/res/values-ml/strings.xml
rename to legacy/src/main/res/values-ml/strings.xml
diff --git a/app/src/main/res/values-mn/strings.xml b/legacy/src/main/res/values-mn/strings.xml
similarity index 100%
rename from app/src/main/res/values-mn/strings.xml
rename to legacy/src/main/res/values-mn/strings.xml
diff --git a/app/src/main/res/values-mr/strings.xml b/legacy/src/main/res/values-mr/strings.xml
similarity index 100%
rename from app/src/main/res/values-mr/strings.xml
rename to legacy/src/main/res/values-mr/strings.xml
diff --git a/app/src/main/res/values-my/strings.xml b/legacy/src/main/res/values-my/strings.xml
similarity index 100%
rename from app/src/main/res/values-my/strings.xml
rename to legacy/src/main/res/values-my/strings.xml
diff --git a/app/src/main/res/values-nah/strings.xml b/legacy/src/main/res/values-nah/strings.xml
similarity index 100%
rename from app/src/main/res/values-nah/strings.xml
rename to legacy/src/main/res/values-nah/strings.xml
diff --git a/app/src/main/res/values-nb/strings.xml b/legacy/src/main/res/values-nb/strings.xml
similarity index 100%
rename from app/src/main/res/values-nb/strings.xml
rename to legacy/src/main/res/values-nb/strings.xml
diff --git a/app/src/main/res/values-ne/strings.xml b/legacy/src/main/res/values-ne/strings.xml
similarity index 100%
rename from app/src/main/res/values-ne/strings.xml
rename to legacy/src/main/res/values-ne/strings.xml
diff --git a/app/src/main/res/values-night/colors.xml b/legacy/src/main/res/values-night/colors.xml
similarity index 100%
rename from app/src/main/res/values-night/colors.xml
rename to legacy/src/main/res/values-night/colors.xml
diff --git a/app/src/main/res/values-night/themes.xml b/legacy/src/main/res/values-night/themes.xml
similarity index 100%
rename from app/src/main/res/values-night/themes.xml
rename to legacy/src/main/res/values-night/themes.xml
diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/legacy/src/main/res/values-nl-rBE/strings.xml
similarity index 100%
rename from app/src/main/res/values-nl-rBE/strings.xml
rename to legacy/src/main/res/values-nl-rBE/strings.xml
diff --git a/app/src/main/res/values-nl/strings.xml b/legacy/src/main/res/values-nl/strings.xml
similarity index 100%
rename from app/src/main/res/values-nl/strings.xml
rename to legacy/src/main/res/values-nl/strings.xml
diff --git a/app/src/main/res/values-nn/strings.xml b/legacy/src/main/res/values-nn/strings.xml
similarity index 100%
rename from app/src/main/res/values-nn/strings.xml
rename to legacy/src/main/res/values-nn/strings.xml
diff --git a/app/src/main/res/values-oc/strings.xml b/legacy/src/main/res/values-oc/strings.xml
similarity index 100%
rename from app/src/main/res/values-oc/strings.xml
rename to legacy/src/main/res/values-oc/strings.xml
diff --git a/app/src/main/res/values-or/strings.xml b/legacy/src/main/res/values-or/strings.xml
similarity index 100%
rename from app/src/main/res/values-or/strings.xml
rename to legacy/src/main/res/values-or/strings.xml
diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/legacy/src/main/res/values-pa-rPK/strings.xml
similarity index 100%
rename from app/src/main/res/values-pa-rPK/strings.xml
rename to legacy/src/main/res/values-pa-rPK/strings.xml
diff --git a/app/src/main/res/values-pa/strings.xml b/legacy/src/main/res/values-pa/strings.xml
similarity index 100%
rename from app/src/main/res/values-pa/strings.xml
rename to legacy/src/main/res/values-pa/strings.xml
diff --git a/app/src/main/res/values-pl/strings.xml b/legacy/src/main/res/values-pl/strings.xml
similarity index 100%
rename from app/src/main/res/values-pl/strings.xml
rename to legacy/src/main/res/values-pl/strings.xml
diff --git a/app/src/main/res/values-ps/strings.xml b/legacy/src/main/res/values-ps/strings.xml
similarity index 100%
rename from app/src/main/res/values-ps/strings.xml
rename to legacy/src/main/res/values-ps/strings.xml
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/legacy/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from app/src/main/res/values-pt-rBR/strings.xml
rename to legacy/src/main/res/values-pt-rBR/strings.xml
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/legacy/src/main/res/values-pt-rPT/strings.xml
similarity index 100%
rename from app/src/main/res/values-pt-rPT/strings.xml
rename to legacy/src/main/res/values-pt-rPT/strings.xml
diff --git a/app/src/main/res/values-pt/strings.xml b/legacy/src/main/res/values-pt/strings.xml
similarity index 100%
rename from app/src/main/res/values-pt/strings.xml
rename to legacy/src/main/res/values-pt/strings.xml
diff --git a/app/src/main/res/values-ro/strings.xml b/legacy/src/main/res/values-ro/strings.xml
similarity index 100%
rename from app/src/main/res/values-ro/strings.xml
rename to legacy/src/main/res/values-ro/strings.xml
diff --git a/app/src/main/res/values-ru/strings.xml b/legacy/src/main/res/values-ru/strings.xml
similarity index 100%
rename from app/src/main/res/values-ru/strings.xml
rename to legacy/src/main/res/values-ru/strings.xml
diff --git a/app/src/main/res/values-sc/strings.xml b/legacy/src/main/res/values-sc/strings.xml
similarity index 100%
rename from app/src/main/res/values-sc/strings.xml
rename to legacy/src/main/res/values-sc/strings.xml
diff --git a/app/src/main/res/values-si/strings.xml b/legacy/src/main/res/values-si/strings.xml
similarity index 100%
rename from app/src/main/res/values-si/strings.xml
rename to legacy/src/main/res/values-si/strings.xml
diff --git a/app/src/main/res/values-sk/strings.xml b/legacy/src/main/res/values-sk/strings.xml
similarity index 100%
rename from app/src/main/res/values-sk/strings.xml
rename to legacy/src/main/res/values-sk/strings.xml
diff --git a/app/src/main/res/values-sl/strings.xml b/legacy/src/main/res/values-sl/strings.xml
similarity index 100%
rename from app/src/main/res/values-sl/strings.xml
rename to legacy/src/main/res/values-sl/strings.xml
diff --git a/app/src/main/res/values-sn/strings.xml b/legacy/src/main/res/values-sn/strings.xml
similarity index 100%
rename from app/src/main/res/values-sn/strings.xml
rename to legacy/src/main/res/values-sn/strings.xml
diff --git a/app/src/main/res/values-so/strings.xml b/legacy/src/main/res/values-so/strings.xml
similarity index 100%
rename from app/src/main/res/values-so/strings.xml
rename to legacy/src/main/res/values-so/strings.xml
diff --git a/app/src/main/res/values-sq/strings.xml b/legacy/src/main/res/values-sq/strings.xml
similarity index 100%
rename from app/src/main/res/values-sq/strings.xml
rename to legacy/src/main/res/values-sq/strings.xml
diff --git a/app/src/main/res/values-sr/strings.xml b/legacy/src/main/res/values-sr/strings.xml
similarity index 100%
rename from app/src/main/res/values-sr/strings.xml
rename to legacy/src/main/res/values-sr/strings.xml
diff --git a/app/src/main/res/values-sv/strings.xml b/legacy/src/main/res/values-sv/strings.xml
similarity index 100%
rename from app/src/main/res/values-sv/strings.xml
rename to legacy/src/main/res/values-sv/strings.xml
diff --git a/app/src/main/res/values-sw/strings.xml b/legacy/src/main/res/values-sw/strings.xml
similarity index 100%
rename from app/src/main/res/values-sw/strings.xml
rename to legacy/src/main/res/values-sw/strings.xml
diff --git a/app/src/main/res/values-sw360dp/values-preference.xml b/legacy/src/main/res/values-sw360dp/values-preference.xml
similarity index 100%
rename from app/src/main/res/values-sw360dp/values-preference.xml
rename to legacy/src/main/res/values-sw360dp/values-preference.xml
diff --git a/app/src/main/res/values-sw720dp/dimens.xml b/legacy/src/main/res/values-sw720dp/dimens.xml
similarity index 100%
rename from app/src/main/res/values-sw720dp/dimens.xml
rename to legacy/src/main/res/values-sw720dp/dimens.xml
diff --git a/app/src/main/res/values-ta/strings.xml b/legacy/src/main/res/values-ta/strings.xml
similarity index 100%
rename from app/src/main/res/values-ta/strings.xml
rename to legacy/src/main/res/values-ta/strings.xml
diff --git a/app/src/main/res/values-te/strings.xml b/legacy/src/main/res/values-te/strings.xml
similarity index 100%
rename from app/src/main/res/values-te/strings.xml
rename to legacy/src/main/res/values-te/strings.xml
diff --git a/app/src/main/res/values-th/strings.xml b/legacy/src/main/res/values-th/strings.xml
similarity index 100%
rename from app/src/main/res/values-th/strings.xml
rename to legacy/src/main/res/values-th/strings.xml
diff --git a/app/src/main/res/values-tok/strings.xml b/legacy/src/main/res/values-tok/strings.xml
similarity index 100%
rename from app/src/main/res/values-tok/strings.xml
rename to legacy/src/main/res/values-tok/strings.xml
diff --git a/app/src/main/res/values-tr/strings.xml b/legacy/src/main/res/values-tr/strings.xml
similarity index 100%
rename from app/src/main/res/values-tr/strings.xml
rename to legacy/src/main/res/values-tr/strings.xml
diff --git a/app/src/main/res/values-tt/strings.xml b/legacy/src/main/res/values-tt/strings.xml
similarity index 100%
rename from app/src/main/res/values-tt/strings.xml
rename to legacy/src/main/res/values-tt/strings.xml
diff --git a/app/src/main/res/values-tzm/strings.xml b/legacy/src/main/res/values-tzm/strings.xml
similarity index 100%
rename from app/src/main/res/values-tzm/strings.xml
rename to legacy/src/main/res/values-tzm/strings.xml
diff --git a/app/src/main/res/values-ug/strings.xml b/legacy/src/main/res/values-ug/strings.xml
similarity index 100%
rename from app/src/main/res/values-ug/strings.xml
rename to legacy/src/main/res/values-ug/strings.xml
diff --git a/app/src/main/res/values-uk/strings.xml b/legacy/src/main/res/values-uk/strings.xml
similarity index 100%
rename from app/src/main/res/values-uk/strings.xml
rename to legacy/src/main/res/values-uk/strings.xml
diff --git a/app/src/main/res/values-ur/strings.xml b/legacy/src/main/res/values-ur/strings.xml
similarity index 100%
rename from app/src/main/res/values-ur/strings.xml
rename to legacy/src/main/res/values-ur/strings.xml
diff --git a/app/src/main/res/values-uz/strings.xml b/legacy/src/main/res/values-uz/strings.xml
similarity index 100%
rename from app/src/main/res/values-uz/strings.xml
rename to legacy/src/main/res/values-uz/strings.xml
diff --git a/app/src/main/res/values-vi/strings.xml b/legacy/src/main/res/values-vi/strings.xml
similarity index 100%
rename from app/src/main/res/values-vi/strings.xml
rename to legacy/src/main/res/values-vi/strings.xml
diff --git a/app/src/main/res/values-yue/strings.xml b/legacy/src/main/res/values-yue/strings.xml
similarity index 100%
rename from app/src/main/res/values-yue/strings.xml
rename to legacy/src/main/res/values-yue/strings.xml
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/legacy/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from app/src/main/res/values-zh-rCN/strings.xml
rename to legacy/src/main/res/values-zh-rCN/strings.xml
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/legacy/src/main/res/values-zh-rHK/strings.xml
similarity index 100%
rename from app/src/main/res/values-zh-rHK/strings.xml
rename to legacy/src/main/res/values-zh-rHK/strings.xml
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/legacy/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from app/src/main/res/values-zh-rTW/strings.xml
rename to legacy/src/main/res/values-zh-rTW/strings.xml
diff --git a/app/src/main/res/values/array.xml b/legacy/src/main/res/values/array.xml
similarity index 100%
rename from app/src/main/res/values/array.xml
rename to legacy/src/main/res/values/array.xml
diff --git a/app/src/main/res/values/attrs.xml b/legacy/src/main/res/values/attrs.xml
similarity index 100%
rename from app/src/main/res/values/attrs.xml
rename to legacy/src/main/res/values/attrs.xml
diff --git a/app/src/main/res/values/colors.xml b/legacy/src/main/res/values/colors.xml
similarity index 100%
rename from app/src/main/res/values/colors.xml
rename to legacy/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/default_repos.xml b/legacy/src/main/res/values/default_repos.xml
similarity index 100%
rename from app/src/main/res/values/default_repos.xml
rename to legacy/src/main/res/values/default_repos.xml
diff --git a/app/src/main/res/values/dimens.xml b/legacy/src/main/res/values/dimens.xml
similarity index 100%
rename from app/src/main/res/values/dimens.xml
rename to legacy/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/donottranslate.xml b/legacy/src/main/res/values/donottranslate.xml
similarity index 100%
rename from app/src/main/res/values/donottranslate.xml
rename to legacy/src/main/res/values/donottranslate.xml
diff --git a/app/src/main/res/values/ids.xml b/legacy/src/main/res/values/ids.xml
similarity index 100%
rename from app/src/main/res/values/ids.xml
rename to legacy/src/main/res/values/ids.xml
diff --git a/app/src/main/res/values/shape.xml b/legacy/src/main/res/values/shape.xml
similarity index 100%
rename from app/src/main/res/values/shape.xml
rename to legacy/src/main/res/values/shape.xml
diff --git a/next/src/main/res/values/strings.xml b/legacy/src/main/res/values/strings.xml
similarity index 100%
rename from next/src/main/res/values/strings.xml
rename to legacy/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/styles.xml b/legacy/src/main/res/values/styles.xml
similarity index 100%
rename from app/src/main/res/values/styles.xml
rename to legacy/src/main/res/values/styles.xml
diff --git a/app/src/main/res/values/styles_detail.xml b/legacy/src/main/res/values/styles_detail.xml
similarity index 100%
rename from app/src/main/res/values/styles_detail.xml
rename to legacy/src/main/res/values/styles_detail.xml
diff --git a/app/src/main/res/values/theme_overlays.xml b/legacy/src/main/res/values/theme_overlays.xml
similarity index 100%
rename from app/src/main/res/values/theme_overlays.xml
rename to legacy/src/main/res/values/theme_overlays.xml
diff --git a/legacy/src/main/res/values/themes.xml b/legacy/src/main/res/values/themes.xml
new file mode 100644
index 000000000..90c68bdeb
--- /dev/null
+++ b/legacy/src/main/res/values/themes.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+~ Copyright (C) 2019 The Android Open Source Project
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~      http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+
+<!-- Generated by the Material Theme Builder with modifications-->
+<!-- https://www.figma.com/community/plugin/1034969338659738588&ndash;&gt;-->
+<resources>
+
+    <style name="Base.Theme.App" parent="Theme.Material3.DayNight.NoActionBar">
+        <!--Material shape attributes-->
+        <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.App.SmallComponent</item>
+        <item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.App.MediumComponent
+        </item>
+        <item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.App.LargeComponent</item>
+
+        <item name="borderlessButtonStyle">@style/Widget.App.Button.TextButton</item>
+        <item name="materialButtonOutlinedStyle">@style/Widget.App.Button.OutlinedButton</item>
+        <item name="materialButtonStyle">@style/Widget.App.Button</item>
+        <item name="materialCardViewStyle">@style/Widget.App.CardView</item>
+
+        <!--colorBackground appears behind scrollable content and is used for the default window-->
+        <!--background. colorSurface is mapped to the surface of components such as cards, sheets-->
+        <!--and menus. colorError is used to indicate an error state for components such as-->
+        <!--text fields.-->
+        <item name="appDetailsBackground">#fcfcfc</item>
+        <item name="categoryPreviewAppCardBackground">
+            @drawable/category_preview_app_card_background_light
+        </item>
+        <item name="detailPanel">?attr/colorSurfaceContainerHighest</item>
+        <item name="antiFeaturesWarning">@drawable/ic_warning</item>
+        <item name="backButtonDrawable">@drawable/abc_ic_ab_back_material</item>
+        <item name="clearButtonDrawable">@drawable/ic_close</item>
+
+        <item name="bottomNavigationStyle">@style/Widget.App.BottomNavigationView</item>
+        <item name="floatingActionButtonStyle">@style/Widget.App.FloatingActionButton</item>
+        <item name="mainTabSwapSplashTint">?attr/colorSurfaceDim</item>
+        <item name="warning">?attr/colorTertiaryContainer</item>
+        <item name="categoryName">#4a4a4a</item>
+        <item name="installedApps">#424242</item>
+        <item name="appListItem">#424242</item>
+        <item name="lightGrayTextColor">#4a4a4a</item>
+        <item name="preferenceTheme">@style/ThemeOverlay.App.Preference</item>
+        <item name="appDetailsAntiFeatureIconColor">#000000</item>
+
+        <item name="iconBackgroundColor">#801976D2</item>
+
+        <item name="screenshotPlaceholderIconColor">#e8e8e8</item>
+
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">true</item>
+
+        <!-- Adjust androidx.preference dialogs to follow Material You -->
+        <!-- https://github.com/material-components/material-components-android/issues/2732#issuecomment-1146086018 -->
+        <item name="alertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog</item>
+
+        <item name="colorPrimary">@color/md_theme_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_error</item>
+        <item name="colorOnError">@color/md_theme_onError</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground</item>
+        <item name="colorSurface">@color/md_theme_surface</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_outline</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
+    </style>
+
+    <!-- light app theme with accent colors following roughly android design guidelines -->
+    <style name="Theme.App" parent="Base.Theme.App">
+        <!-- customizations that are not API-level specific go here. -->
+    </style>
+
+    <!-- Same as Theme.App except a black background in Dark mode -->
+    <style name="Theme.App.Black" parent="Theme.App" />
+
+    <style name="Theme.App.Transparent" parent="Base.Theme.App">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/xml/apk_file_provider.xml b/legacy/src/main/res/xml/apk_file_provider.xml
similarity index 100%
rename from app/src/main/res/xml/apk_file_provider.xml
rename to legacy/src/main/res/xml/apk_file_provider.xml
diff --git a/app/src/main/res/xml/backup_extraction_rules.xml b/legacy/src/main/res/xml/backup_extraction_rules.xml
similarity index 100%
rename from app/src/main/res/xml/backup_extraction_rules.xml
rename to legacy/src/main/res/xml/backup_extraction_rules.xml
diff --git a/app/src/main/res/xml/backup_rules.xml b/legacy/src/main/res/xml/backup_rules.xml
similarity index 100%
rename from app/src/main/res/xml/backup_rules.xml
rename to legacy/src/main/res/xml/backup_rules.xml
diff --git a/app/src/main/res/xml/installer_file_provider.xml b/legacy/src/main/res/xml/installer_file_provider.xml
similarity index 100%
rename from app/src/main/res/xml/installer_file_provider.xml
rename to legacy/src/main/res/xml/installer_file_provider.xml
diff --git a/next/src/main/res/xml/locales_config.xml b/legacy/src/main/res/xml/locales_config.xml
similarity index 100%
rename from next/src/main/res/xml/locales_config.xml
rename to legacy/src/main/res/xml/locales_config.xml
diff --git a/legacy/src/main/res/xml/network_security_config.xml b/legacy/src/main/res/xml/network_security_config.xml
new file mode 100644
index 000000000..cfcccb746
--- /dev/null
+++ b/legacy/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <!-- Trust preinstalled CAs -->
+            <certificates src="system" />
+            <!-- Additionally trust user added CAs -->
+            <certificates src="user" />
+        </trust-anchors>
+    </base-config>
+
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="true">amazonaws.com</domain>
+        <certificateTransparency enabled="true"/>
+    </domain-config>
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="true">f-droid.org</domain>
+        <certificateTransparency enabled="true"/>
+    </domain-config>
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="true">github.com</domain>
+        <certificateTransparency enabled="true"/>
+    </domain-config>
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="true">githubusercontent.com</domain>
+        <certificateTransparency enabled="true"/>
+    </domain-config>
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="true">github.io</domain>
+        <certificateTransparency enabled="true"/>
+    </domain-config>
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="true">gitlab.com</domain>
+        <certificateTransparency enabled="true"/>
+    </domain-config>
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="true">gitlab.io</domain>
+        <certificateTransparency enabled="true"/>
+    </domain-config>
+</network-security-config>
diff --git a/app/src/main/res/xml/preferences.xml b/legacy/src/main/res/xml/preferences.xml
similarity index 100%
rename from app/src/main/res/xml/preferences.xml
rename to legacy/src/main/res/xml/preferences.xml
diff --git a/app/src/main/res/xml/searchable.xml b/legacy/src/main/res/xml/searchable.xml
similarity index 100%
rename from app/src/main/res/xml/searchable.xml
rename to legacy/src/main/res/xml/searchable.xml
diff --git a/app/src/main/scripts/update-binary b/legacy/src/main/scripts/update-binary
similarity index 100%
rename from app/src/main/scripts/update-binary
rename to legacy/src/main/scripts/update-binary
diff --git a/app/src/test/assets/urzip.apk b/legacy/src/test/assets/urzip.apk
similarity index 100%
rename from app/src/test/assets/urzip.apk
rename to legacy/src/test/assets/urzip.apk
diff --git a/app/src/test/java/org/fdroid/fdroid/AppUpdateManagerTest.kt b/legacy/src/test/java/org/fdroid/fdroid/AppUpdateManagerTest.kt
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/AppUpdateManagerTest.kt
rename to legacy/src/test/java/org/fdroid/fdroid/AppUpdateManagerTest.kt
diff --git a/app/src/test/java/org/fdroid/fdroid/PreferencesTest.java b/legacy/src/test/java/org/fdroid/fdroid/PreferencesTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/PreferencesTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/PreferencesTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/RepoUpdateManagerTest.kt b/legacy/src/test/java/org/fdroid/fdroid/RepoUpdateManagerTest.kt
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/RepoUpdateManagerTest.kt
rename to legacy/src/test/java/org/fdroid/fdroid/RepoUpdateManagerTest.kt
diff --git a/app/src/test/java/org/fdroid/fdroid/RepoUrlsTest.java b/legacy/src/test/java/org/fdroid/fdroid/RepoUrlsTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/RepoUrlsTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/RepoUrlsTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/TestFDroidApp.java b/legacy/src/test/java/org/fdroid/fdroid/TestFDroidApp.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/TestFDroidApp.java
rename to legacy/src/test/java/org/fdroid/fdroid/TestFDroidApp.java
diff --git a/app/src/test/java/org/fdroid/fdroid/TestUtils.java b/legacy/src/test/java/org/fdroid/fdroid/TestUtils.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/TestUtils.java
rename to legacy/src/test/java/org/fdroid/fdroid/TestUtils.java
diff --git a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java b/legacy/src/test/java/org/fdroid/fdroid/UtilsTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/UtilsTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/UtilsTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/data/ApkTest.java b/legacy/src/test/java/org/fdroid/fdroid/data/ApkTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/data/ApkTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/data/ApkTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/data/DBHelperTest.java b/legacy/src/test/java/org/fdroid/fdroid/data/DBHelperTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/data/DBHelperTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/data/DBHelperTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/data/SanitizedFileTest.java b/legacy/src/test/java/org/fdroid/fdroid/data/SanitizedFileTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/data/SanitizedFileTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/data/SanitizedFileTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java b/legacy/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java b/legacy/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/installer/FileInstallerTest.java b/legacy/src/test/java/org/fdroid/fdroid/installer/FileInstallerTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/installer/FileInstallerTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/installer/FileInstallerTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/installer/InstallerFactoryTest.java b/legacy/src/test/java/org/fdroid/fdroid/installer/InstallerFactoryTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/installer/InstallerFactoryTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/installer/InstallerFactoryTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java b/legacy/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/views/main/MainActivityTest.java b/legacy/src/test/java/org/fdroid/fdroid/views/main/MainActivityTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/views/main/MainActivityTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/views/main/MainActivityTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java b/legacy/src/test/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java b/legacy/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java
diff --git a/app/src/test/resources/Norway_bouvet_europe_2.obf.zip b/legacy/src/test/resources/Norway_bouvet_europe_2.obf.zip
similarity index 100%
rename from app/src/test/resources/Norway_bouvet_europe_2.obf.zip
rename to legacy/src/test/resources/Norway_bouvet_europe_2.obf.zip
diff --git a/app/src/test/resources/additional_repos.xml b/legacy/src/test/resources/additional_repos.xml
similarity index 100%
rename from app/src/test/resources/additional_repos.xml
rename to legacy/src/test/resources/additional_repos.xml
diff --git a/app/src/test/resources/all_fields_index-v1.json b/legacy/src/test/resources/all_fields_index-v1.json
similarity index 100%
rename from app/src/test/resources/all_fields_index-v1.json
rename to legacy/src/test/resources/all_fields_index-v1.json
diff --git a/app/src/test/resources/install_history_all b/legacy/src/test/resources/install_history_all
similarity index 100%
rename from app/src/test/resources/install_history_all
rename to legacy/src/test/resources/install_history_all
diff --git a/app/src/test/resources/org.fdroid.fdroid.privileged.ota_2110.zip b/legacy/src/test/resources/org.fdroid.fdroid.privileged.ota_2110.zip
similarity index 100%
rename from app/src/test/resources/org.fdroid.fdroid.privileged.ota_2110.zip
rename to legacy/src/test/resources/org.fdroid.fdroid.privileged.ota_2110.zip
diff --git a/app/src/test/resources/ugly_additional_repos.xml b/legacy/src/test/resources/ugly_additional_repos.xml
similarity index 100%
rename from app/src/test/resources/ugly_additional_repos.xml
rename to legacy/src/test/resources/ugly_additional_repos.xml
diff --git a/app/src/testFull/java/kellinwood/security/zipsigner/ZipSignerTest.java b/legacy/src/testFull/java/kellinwood/security/zipsigner/ZipSignerTest.java
similarity index 100%
rename from app/src/testFull/java/kellinwood/security/zipsigner/ZipSignerTest.java
rename to legacy/src/testFull/java/kellinwood/security/zipsigner/ZipSignerTest.java
diff --git a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java b/legacy/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
similarity index 100%
rename from app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
rename to legacy/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
diff --git a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java b/legacy/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java
similarity index 100%
rename from app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java
rename to legacy/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java
diff --git a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java b/legacy/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java
similarity index 100%
rename from app/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java
rename to legacy/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java
diff --git a/app/src/testFull/java/org/fdroid/fdroid/nearby/WifiStateChangeServiceTest.java b/legacy/src/testFull/java/org/fdroid/fdroid/nearby/WifiStateChangeServiceTest.java
similarity index 100%
rename from app/src/testFull/java/org/fdroid/fdroid/nearby/WifiStateChangeServiceTest.java
rename to legacy/src/testFull/java/org/fdroid/fdroid/nearby/WifiStateChangeServiceTest.java
diff --git a/app/src/testFull/resources/icon.png b/legacy/src/testFull/resources/icon.png
similarity index 100%
rename from app/src/testFull/resources/icon.png
rename to legacy/src/testFull/resources/icon.png
diff --git a/app/src/testFull/resources/index.html b/legacy/src/testFull/resources/index.html
similarity index 100%
rename from app/src/testFull/resources/index.html
rename to legacy/src/testFull/resources/index.html
diff --git a/app/src/testFull/resources/test.html b/legacy/src/testFull/resources/test.html
similarity index 100%
rename from app/src/testFull/resources/test.html
rename to legacy/src/testFull/resources/test.html
diff --git a/app/src/testFull/resources/urzip.apk b/legacy/src/testFull/resources/urzip.apk
similarity index 100%
rename from app/src/testFull/resources/urzip.apk
rename to legacy/src/testFull/resources/urzip.apk
diff --git a/app/tools/download-material-icon.sh b/legacy/tools/download-material-icon.sh
similarity index 100%
rename from app/tools/download-material-icon.sh
rename to legacy/tools/download-material-icon.sh
diff --git a/app/tools/svg-to-drawables.sh b/legacy/tools/svg-to-drawables.sh
similarity index 100%
rename from app/tools/svg-to-drawables.sh
rename to legacy/tools/svg-to-drawables.sh
diff --git a/app/tools/test-search-intents.sh b/legacy/tools/test-search-intents.sh
similarity index 100%
rename from app/tools/test-search-intents.sh
rename to legacy/tools/test-search-intents.sh
diff --git a/next/proguard-rules.pro b/next/proguard-rules.pro
deleted file mode 100644
index b37172aee..000000000
--- a/next/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
--dontobfuscate
--keepattributes SourceFile,LineNumberTable,Exceptions
-
-# Anything less causes issues like not finding primary constructor in ReflectionDiffer
--keep class org.fdroid.** {*;}
-
-# Logging
--keep class ch.qos.logback.classic.android.LogcatAppender
--keepclassmembers class ch.qos.logback.** { *; }
--keepclassmembers class  org.slf4j.impl.** { *; }
-
-# Needed for instrumentation tests (for some werid inexplicable reason)
--keep class kotlin.LazyKt
--keep class kotlin.collections.CollectionsKt
-
-# for debugging (comment in when needed)
-#-printconfiguration build/outputs/logs/r8-configuration.txt
diff --git a/next/src/main/AndroidManifest.xml b/next/src/main/AndroidManifest.xml
deleted file mode 100644
index cf22d92b6..000000000
--- a/next/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission
-        android:name="android.permission.FOREGROUND_SERVICE"
-        tools:ignore="ForegroundServicesPolicy" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
-
-    <uses-permission
-        android:name="android.permission.REQUEST_INSTALL_PACKAGES"
-        tools:ignore="RequestInstallPackagesPolicy" />
-    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
-    <uses-permission android:name="android.permission.ENFORCE_UPDATE_OWNERSHIP" />
-    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
-
-    <application
-        android:name="org.fdroid.App"
-        android:allowBackup="true"
-        android:enableOnBackInvokedCallback="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:localeConfig="@xml/locales_config"
-        android:networkSecurityConfig="@xml/network_security_config"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.Fdroidclient"
-        tools:targetApi="33">
-        <activity
-            android:name="org.fdroid.MainActivity"
-            android:exported="true"
-            android:launchMode="singleTop"
-            android:theme="@style/Theme.Fdroidclient"
-            android:windowSoftInputMode="adjustResize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.APP_MARKET" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SHOW_APP_INFO" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="details"
-                    android:scheme="market" />
-            </intent-filter>
-
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-                <data android:host="f-droid.org" />
-                <data android:host="staging.f-droid.org" />
-                <data android:host="cloudflare.f-droid.org" />
-                <data android:pathPrefix="/packages/" />
-                <data android:pathPattern="/.*/packages/.*" />
-            </intent-filter>
-
-            <!-- Repo URLs -->
-
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-                <data android:host="fdroid.link" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="fdroidrepos" />
-                <data
-                    android:scheme="FDROIDREPOS"
-                    tools:ignore="AppLinkUrlError" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="org.fdroid.ui.crash.CrashActivity"
-            android:excludeFromRecents="true"
-            android:finishOnTaskLaunch="true"
-            android:launchMode="singleInstance"
-            android:process=":acra"
-            android:windowSoftInputMode="adjustResize" />
-        <activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            android:screenOrientation="fullSensor"
-            tools:ignore="DiscouragedApi"
-            tools:replace="screenOrientation" />
-
-        <service
-            android:name="org.fdroid.install.AppInstallService"
-            android:exported="false"
-            android:foregroundServiceType="dataSync" />
-        <!-- needed for declaring foregroundServiceType for WorkManager -->
-        <service
-            android:name="androidx.work.impl.foreground.SystemForegroundService"
-            android:foregroundServiceType="dataSync"
-            tools:node="merge" />
-        <provider
-            android:name="org.fdroid.install.ApkFileProvider"
-            android:authorities="${applicationId}.install.ApkFileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true" />
-        <!-- disable WorkManager initialization, needed for Hilt -->
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            tools:node="remove" />
-    </application>
-
-</manifest>
diff --git a/next/src/main/kotlin/org/fdroid/fdroid/Compat.kt b/next/src/main/kotlin/org/fdroid/fdroid/Compat.kt
deleted file mode 100644
index 1275413f1..000000000
--- a/next/src/main/kotlin/org/fdroid/fdroid/Compat.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-@file:Suppress("ktlint:standard:filename")
-
-package org.fdroid.fdroid
-
-object Preferences {
-
-    fun get(): Preferences = Preferences
-
-    val isPureBlack: Boolean = true
-
-}
diff --git a/next/src/main/kotlin/org/fdroid/fdroid/ui/theme/Color.kt b/next/src/main/kotlin/org/fdroid/fdroid/ui/theme/Color.kt
deleted file mode 120000
index 9d0fa521d..000000000
--- a/next/src/main/kotlin/org/fdroid/fdroid/ui/theme/Color.kt
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../app/src/main/java/org/fdroid/fdroid/ui/theme/Color.kt
\ No newline at end of file
diff --git a/next/src/main/res/values/colors.xml b/next/src/main/res/values/colors.xml
deleted file mode 100644
index ca1931bca..000000000
--- a/next/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
diff --git a/next/src/main/res/values/themes.xml b/next/src/main/res/values/themes.xml
deleted file mode 100644
index 6e59254a1..000000000
--- a/next/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Theme.Fdroidclient" parent="Theme.AppCompat.DayNight.NoActionBar" />
-</resources>
diff --git a/next/src/main/res/xml/network_security_config.xml b/next/src/main/res/xml/network_security_config.xml
deleted file mode 100644
index f8b53ef87..000000000
--- a/next/src/main/res/xml/network_security_config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">onion</domain>
-    </domain-config>
-</network-security-config>
diff --git a/settings.gradle b/settings.gradle
index c7a2ed7ce..76413edd0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,4 +13,4 @@ include ':libs:download'
 include ':libs:index'
 include ':libs:database'
 
-include ':next'
+include ':legacy'