diff --git a/.gitignore b/.gitignore
index 0df13ab..0361113 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,13 @@
 *.iml
 .gradle
 /local.properties
-.idea
+/.idea
 .DS_Store
 /build
 /captures
-/gradle
-/gradlew
-/gradlew.bat
 /system_libs/*.jar
 /keystore.properties
+.externalNativeBuild
+.cxx
 *.jks
+local.properties
diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/Android.bp b/app/Android.bp
similarity index 63%
rename from Android.bp
rename to app/Android.bp
index da2137f..7878184 100644
--- a/Android.bp
+++ b/app/Android.bp
@@ -1,17 +1,7 @@
 //
-// Copyright (C) 2022 The LineageOS Project
+// Copyright (C) 2022-2023 The LineageOS 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.
+// SPDX-License-Identifier: Apache-2.0
 //
 
 android_app {
@@ -20,23 +10,26 @@ android_app {
     // Include SettingsLib and its dependencies
     defaults: ["SettingsLibDefaults"],
 
-    srcs: ["src/**/*.java"],
-    resource_dirs: ["res"],
-
-    static_libs: [
-        "com.google.android.material_material",
-        "androidx.core_core",
-        "androidx.appcompat_appcompat",
-        "androidx.cardview_cardview",
-        "androidx.localbroadcastmanager_localbroadcastmanager",
-        "androidx.preference_preference",
-        "androidx.recyclerview_recyclerview",
-    ],
+    srcs: ["src/main/java/**/*.java"],
+    resource_dirs: ["src/main/res"],
+    manifest: "src/main/AndroidManifest.xml",
 
     platform_apis: true,
     privileged: true,
     certificate: "platform",
     system_ext_specific: true,
+
+    static_libs: [
+        "androidx.core_core-ktx",
+        "androidx.appcompat_appcompat",
+        "androidx.cardview_cardview",
+        "androidx.lifecycle_lifecycle-viewmodel-ktx",
+        "androidx.localbroadcastmanager_localbroadcastmanager",
+        "androidx.preference_preference",
+        "androidx.recyclerview_recyclerview",
+        "com.google.android.material_material",
+    ],
+
     optimize: {
         proguard_flags_files: ["proguard.flags"],
     },
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000..ecaf622
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,80 @@
+import java.util.Properties
+
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+}
+
+val keystorePropertiesFile = rootProject.file("keystore.properties")
+val keystoreProperties = Properties().apply {
+    if (keystorePropertiesFile.exists()) {
+        load(keystorePropertiesFile.inputStream())
+    }
+}
+
+android {
+    compileSdk = 33
+
+    defaultConfig {
+        applicationId = "org.lineageos.updater"
+        minSdk = 27
+        targetSdk = 33
+        versionCode = 1
+        versionName = "1.0"
+    }
+
+    buildTypes {
+        getByName("release") {
+            // Includes the default ProGuard rules files.
+            setProguardFiles(
+                listOf(
+                    getDefaultProguardFile("proguard-android-optimize.txt"),
+                    "proguard-rules.pro"
+                )
+            )
+        }
+        getByName("debug") {
+            // Append .dev to package name so we won't conflict with AOSP build.
+            applicationIdSuffix = ".dev"
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    signingConfigs {
+        create("release") {
+            (keystoreProperties["keyAlias"] as String?)?.let {
+                keyAlias = it
+            }
+            (keystoreProperties["keyPassword"] as String?)?.let {
+                keyPassword = it
+            }
+            (keystoreProperties["storeFile"] as String?)?.let {
+                storeFile = file(it)
+            }
+            (keystoreProperties["storePassword"] as String?)?.let {
+                storePassword = it
+            }
+        }
+    }
+}
+
+dependencies {
+    compileOnly(fileTree(mapOf("dir" to "../system_libs", "include" to listOf("*.jar"))))
+
+    implementation("androidx.core:core-ktx:1.9.0")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.cardview:cardview:1.0.0")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
+    implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.1.0")
+    implementation("androidx.preference:preference:1.2.0")
+    implementation("androidx.recyclerview:recyclerview:1.2.1")
+    implementation("com.google.android.material:material:1.9.0-alpha01")
+}
diff --git a/default-permissions_org.lineageos.updater.xml b/app/default-permissions_org.lineageos.updater.xml
similarity index 100%
rename from default-permissions_org.lineageos.updater.xml
rename to app/default-permissions_org.lineageos.updater.xml
diff --git a/privapp_whitelist_org.lineageos.updater.xml b/app/privapp_whitelist_org.lineageos.updater.xml
similarity index 100%
rename from privapp_whitelist_org.lineageos.updater.xml
rename to app/privapp_whitelist_org.lineageos.updater.xml
diff --git a/proguard.flags b/app/proguard.flags
similarity index 100%
rename from proguard.flags
rename to app/proguard.flags
diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 100%
rename from AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
diff --git a/src/org/lineageos/updater/ExportUpdateService.java b/app/src/main/java/org/lineageos/updater/ExportUpdateService.java
similarity index 100%
rename from src/org/lineageos/updater/ExportUpdateService.java
rename to app/src/main/java/org/lineageos/updater/ExportUpdateService.java
diff --git a/src/org/lineageos/updater/UpdaterReceiver.java b/app/src/main/java/org/lineageos/updater/UpdaterReceiver.java
similarity index 100%
rename from src/org/lineageos/updater/UpdaterReceiver.java
rename to app/src/main/java/org/lineageos/updater/UpdaterReceiver.java
diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
similarity index 100%
rename from src/org/lineageos/updater/UpdatesActivity.java
rename to app/src/main/java/org/lineageos/updater/UpdatesActivity.java
diff --git a/src/org/lineageos/updater/UpdatesCheckReceiver.java b/app/src/main/java/org/lineageos/updater/UpdatesCheckReceiver.java
similarity index 100%
rename from src/org/lineageos/updater/UpdatesCheckReceiver.java
rename to app/src/main/java/org/lineageos/updater/UpdatesCheckReceiver.java
diff --git a/src/org/lineageos/updater/UpdatesDbHelper.java b/app/src/main/java/org/lineageos/updater/UpdatesDbHelper.java
similarity index 100%
rename from src/org/lineageos/updater/UpdatesDbHelper.java
rename to app/src/main/java/org/lineageos/updater/UpdatesDbHelper.java
diff --git a/src/org/lineageos/updater/UpdatesListActivity.java b/app/src/main/java/org/lineageos/updater/UpdatesListActivity.java
similarity index 100%
rename from src/org/lineageos/updater/UpdatesListActivity.java
rename to app/src/main/java/org/lineageos/updater/UpdatesListActivity.java
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/app/src/main/java/org/lineageos/updater/UpdatesListAdapter.java
similarity index 100%
rename from src/org/lineageos/updater/UpdatesListAdapter.java
rename to app/src/main/java/org/lineageos/updater/UpdatesListAdapter.java
diff --git a/src/org/lineageos/updater/controller/ABUpdateInstaller.java b/app/src/main/java/org/lineageos/updater/controller/ABUpdateInstaller.java
similarity index 100%
rename from src/org/lineageos/updater/controller/ABUpdateInstaller.java
rename to app/src/main/java/org/lineageos/updater/controller/ABUpdateInstaller.java
diff --git a/src/org/lineageos/updater/controller/UpdateInstaller.java b/app/src/main/java/org/lineageos/updater/controller/UpdateInstaller.java
similarity index 100%
rename from src/org/lineageos/updater/controller/UpdateInstaller.java
rename to app/src/main/java/org/lineageos/updater/controller/UpdateInstaller.java
diff --git a/src/org/lineageos/updater/controller/UpdaterController.java b/app/src/main/java/org/lineageos/updater/controller/UpdaterController.java
similarity index 100%
rename from src/org/lineageos/updater/controller/UpdaterController.java
rename to app/src/main/java/org/lineageos/updater/controller/UpdaterController.java
diff --git a/src/org/lineageos/updater/controller/UpdaterService.java b/app/src/main/java/org/lineageos/updater/controller/UpdaterService.java
similarity index 100%
rename from src/org/lineageos/updater/controller/UpdaterService.java
rename to app/src/main/java/org/lineageos/updater/controller/UpdaterService.java
diff --git a/src/org/lineageos/updater/download/DownloadClient.java b/app/src/main/java/org/lineageos/updater/download/DownloadClient.java
similarity index 100%
rename from src/org/lineageos/updater/download/DownloadClient.java
rename to app/src/main/java/org/lineageos/updater/download/DownloadClient.java
diff --git a/src/org/lineageos/updater/download/HttpURLConnectionClient.java b/app/src/main/java/org/lineageos/updater/download/HttpURLConnectionClient.java
similarity index 100%
rename from src/org/lineageos/updater/download/HttpURLConnectionClient.java
rename to app/src/main/java/org/lineageos/updater/download/HttpURLConnectionClient.java
diff --git a/src/org/lineageos/updater/misc/BuildInfoUtils.java b/app/src/main/java/org/lineageos/updater/misc/BuildInfoUtils.java
similarity index 100%
rename from src/org/lineageos/updater/misc/BuildInfoUtils.java
rename to app/src/main/java/org/lineageos/updater/misc/BuildInfoUtils.java
diff --git a/src/org/lineageos/updater/misc/Constants.java b/app/src/main/java/org/lineageos/updater/misc/Constants.java
similarity index 100%
rename from src/org/lineageos/updater/misc/Constants.java
rename to app/src/main/java/org/lineageos/updater/misc/Constants.java
diff --git a/src/org/lineageos/updater/misc/FileUtils.java b/app/src/main/java/org/lineageos/updater/misc/FileUtils.java
similarity index 100%
rename from src/org/lineageos/updater/misc/FileUtils.java
rename to app/src/main/java/org/lineageos/updater/misc/FileUtils.java
diff --git a/src/org/lineageos/updater/misc/StringGenerator.java b/app/src/main/java/org/lineageos/updater/misc/StringGenerator.java
similarity index 100%
rename from src/org/lineageos/updater/misc/StringGenerator.java
rename to app/src/main/java/org/lineageos/updater/misc/StringGenerator.java
diff --git a/src/org/lineageos/updater/misc/Utils.java b/app/src/main/java/org/lineageos/updater/misc/Utils.java
similarity index 100%
rename from src/org/lineageos/updater/misc/Utils.java
rename to app/src/main/java/org/lineageos/updater/misc/Utils.java
diff --git a/src/org/lineageos/updater/model/Update.java b/app/src/main/java/org/lineageos/updater/model/Update.java
similarity index 100%
rename from src/org/lineageos/updater/model/Update.java
rename to app/src/main/java/org/lineageos/updater/model/Update.java
diff --git a/src/org/lineageos/updater/model/UpdateBase.java b/app/src/main/java/org/lineageos/updater/model/UpdateBase.java
similarity index 100%
rename from src/org/lineageos/updater/model/UpdateBase.java
rename to app/src/main/java/org/lineageos/updater/model/UpdateBase.java
diff --git a/src/org/lineageos/updater/model/UpdateBaseInfo.java b/app/src/main/java/org/lineageos/updater/model/UpdateBaseInfo.java
similarity index 100%
rename from src/org/lineageos/updater/model/UpdateBaseInfo.java
rename to app/src/main/java/org/lineageos/updater/model/UpdateBaseInfo.java
diff --git a/src/org/lineageos/updater/model/UpdateInfo.java b/app/src/main/java/org/lineageos/updater/model/UpdateInfo.java
similarity index 100%
rename from src/org/lineageos/updater/model/UpdateInfo.java
rename to app/src/main/java/org/lineageos/updater/model/UpdateInfo.java
diff --git a/src/org/lineageos/updater/model/UpdateStatus.java b/app/src/main/java/org/lineageos/updater/model/UpdateStatus.java
similarity index 100%
rename from src/org/lineageos/updater/model/UpdateStatus.java
rename to app/src/main/java/org/lineageos/updater/model/UpdateStatus.java
diff --git a/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from res/drawable/ic_launcher_background.xml
rename to app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from res/drawable/ic_launcher_foreground.xml
rename to app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/res/drawable/ic_menu_preferences.xml b/app/src/main/res/drawable/ic_menu_preferences.xml
similarity index 100%
rename from res/drawable/ic_menu_preferences.xml
rename to app/src/main/res/drawable/ic_menu_preferences.xml
diff --git a/res/drawable/ic_menu_refresh.xml b/app/src/main/res/drawable/ic_menu_refresh.xml
similarity index 100%
rename from res/drawable/ic_menu_refresh.xml
rename to app/src/main/res/drawable/ic_menu_refresh.xml
diff --git a/res/drawable/ic_pause.xml b/app/src/main/res/drawable/ic_pause.xml
similarity index 100%
rename from res/drawable/ic_pause.xml
rename to app/src/main/res/drawable/ic_pause.xml
diff --git a/res/drawable/ic_system_update.xml b/app/src/main/res/drawable/ic_system_update.xml
similarity index 100%
rename from res/drawable/ic_system_update.xml
rename to app/src/main/res/drawable/ic_system_update.xml
diff --git a/res/layout-television/activity_updates.xml b/app/src/main/res/layout-television/activity_updates.xml
similarity index 100%
rename from res/layout-television/activity_updates.xml
rename to app/src/main/res/layout-television/activity_updates.xml
diff --git a/res/layout-television/update_item_view.xml b/app/src/main/res/layout-television/update_item_view.xml
similarity index 100%
rename from res/layout-television/update_item_view.xml
rename to app/src/main/res/layout-television/update_item_view.xml
diff --git a/res/layout/activity_updates.xml b/app/src/main/res/layout/activity_updates.xml
similarity index 100%
rename from res/layout/activity_updates.xml
rename to app/src/main/res/layout/activity_updates.xml
diff --git a/res/layout/checkbox_view.xml b/app/src/main/res/layout/checkbox_view.xml
similarity index 100%
rename from res/layout/checkbox_view.xml
rename to app/src/main/res/layout/checkbox_view.xml
diff --git a/res/layout/preferences_dialog.xml b/app/src/main/res/layout/preferences_dialog.xml
similarity index 100%
rename from res/layout/preferences_dialog.xml
rename to app/src/main/res/layout/preferences_dialog.xml
diff --git a/res/layout/update_item_view.xml b/app/src/main/res/layout/update_item_view.xml
similarity index 100%
rename from res/layout/update_item_view.xml
rename to app/src/main/res/layout/update_item_view.xml
diff --git a/res/menu/menu_action_mode.xml b/app/src/main/res/menu/menu_action_mode.xml
similarity index 100%
rename from res/menu/menu_action_mode.xml
rename to app/src/main/res/menu/menu_action_mode.xml
diff --git a/res/menu/menu_toolbar.xml b/app/src/main/res/menu/menu_toolbar.xml
similarity index 100%
rename from res/menu/menu_toolbar.xml
rename to app/src/main/res/menu/menu_toolbar.xml
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml
similarity index 100%
rename from res/mipmap-anydpi/ic_launcher.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher.xml
diff --git a/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
similarity index 100%
rename from res/values-ar/strings.xml
rename to app/src/main/res/values-ar/strings.xml
diff --git a/res/values-as/strings.xml b/app/src/main/res/values-as/strings.xml
similarity index 100%
rename from res/values-as/strings.xml
rename to app/src/main/res/values-as/strings.xml
diff --git a/res/values-ast-rES/strings.xml b/app/src/main/res/values-ast-rES/strings.xml
similarity index 100%
rename from res/values-ast-rES/strings.xml
rename to app/src/main/res/values-ast-rES/strings.xml
diff --git a/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
similarity index 100%
rename from res/values-az/strings.xml
rename to app/src/main/res/values-az/strings.xml
diff --git a/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
similarity index 100%
rename from res/values-be/strings.xml
rename to app/src/main/res/values-be/strings.xml
diff --git a/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
similarity index 100%
rename from res/values-bg/strings.xml
rename to app/src/main/res/values-bg/strings.xml
diff --git a/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
similarity index 100%
rename from res/values-bn/strings.xml
rename to app/src/main/res/values-bn/strings.xml
diff --git a/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
similarity index 100%
rename from res/values-bs/strings.xml
rename to app/src/main/res/values-bs/strings.xml
diff --git a/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
similarity index 100%
rename from res/values-ca/strings.xml
rename to app/src/main/res/values-ca/strings.xml
diff --git a/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
similarity index 100%
rename from res/values-cs/strings.xml
rename to app/src/main/res/values-cs/strings.xml
diff --git a/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
similarity index 100%
rename from res/values-cy/strings.xml
rename to app/src/main/res/values-cy/strings.xml
diff --git a/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
similarity index 100%
rename from res/values-da/strings.xml
rename to app/src/main/res/values-da/strings.xml
diff --git a/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
similarity index 100%
rename from res/values-de/strings.xml
rename to app/src/main/res/values-de/strings.xml
diff --git a/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
similarity index 100%
rename from res/values-el/strings.xml
rename to app/src/main/res/values-el/strings.xml
diff --git a/res/values-en-rAU/strings.xml b/app/src/main/res/values-en-rAU/strings.xml
similarity index 100%
rename from res/values-en-rAU/strings.xml
rename to app/src/main/res/values-en-rAU/strings.xml
diff --git a/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml
similarity index 100%
rename from res/values-en-rCA/strings.xml
rename to app/src/main/res/values-en-rCA/strings.xml
diff --git a/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
similarity index 100%
rename from res/values-en-rGB/strings.xml
rename to app/src/main/res/values-en-rGB/strings.xml
diff --git a/res/values-en-rIN/strings.xml b/app/src/main/res/values-en-rIN/strings.xml
similarity index 100%
rename from res/values-en-rIN/strings.xml
rename to app/src/main/res/values-en-rIN/strings.xml
diff --git a/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
similarity index 100%
rename from res/values-es-rMX/strings.xml
rename to app/src/main/res/values-es-rMX/strings.xml
diff --git a/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
similarity index 100%
rename from res/values-es-rUS/strings.xml
rename to app/src/main/res/values-es-rUS/strings.xml
diff --git a/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
similarity index 100%
rename from res/values-es/strings.xml
rename to app/src/main/res/values-es/strings.xml
diff --git a/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
similarity index 100%
rename from res/values-et/strings.xml
rename to app/src/main/res/values-et/strings.xml
diff --git a/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
similarity index 100%
rename from res/values-eu/strings.xml
rename to app/src/main/res/values-eu/strings.xml
diff --git a/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
similarity index 100%
rename from res/values-fi/strings.xml
rename to app/src/main/res/values-fi/strings.xml
diff --git a/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
similarity index 100%
rename from res/values-fr/strings.xml
rename to app/src/main/res/values-fr/strings.xml
diff --git a/res/values-fur-rIT/strings.xml b/app/src/main/res/values-fur-rIT/strings.xml
similarity index 100%
rename from res/values-fur-rIT/strings.xml
rename to app/src/main/res/values-fur-rIT/strings.xml
diff --git a/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
similarity index 100%
rename from res/values-fy-rNL/strings.xml
rename to app/src/main/res/values-fy-rNL/strings.xml
diff --git a/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml
similarity index 100%
rename from res/values-gd/strings.xml
rename to app/src/main/res/values-gd/strings.xml
diff --git a/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
similarity index 100%
rename from res/values-gl/strings.xml
rename to app/src/main/res/values-gl/strings.xml
diff --git a/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
similarity index 100%
rename from res/values-hr/strings.xml
rename to app/src/main/res/values-hr/strings.xml
diff --git a/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
similarity index 100%
rename from res/values-hu/strings.xml
rename to app/src/main/res/values-hu/strings.xml
diff --git a/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
similarity index 100%
rename from res/values-in/strings.xml
rename to app/src/main/res/values-in/strings.xml
diff --git a/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
similarity index 100%
rename from res/values-is/strings.xml
rename to app/src/main/res/values-is/strings.xml
diff --git a/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
similarity index 100%
rename from res/values-it/strings.xml
rename to app/src/main/res/values-it/strings.xml
diff --git a/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
similarity index 100%
rename from res/values-iw/strings.xml
rename to app/src/main/res/values-iw/strings.xml
diff --git a/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
similarity index 100%
rename from res/values-ja/strings.xml
rename to app/src/main/res/values-ja/strings.xml
diff --git a/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
similarity index 100%
rename from res/values-ka/strings.xml
rename to app/src/main/res/values-ka/strings.xml
diff --git a/res/values-kab-rDZ/strings.xml b/app/src/main/res/values-kab-rDZ/strings.xml
similarity index 100%
rename from res/values-kab-rDZ/strings.xml
rename to app/src/main/res/values-kab-rDZ/strings.xml
diff --git a/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
similarity index 100%
rename from res/values-kn/strings.xml
rename to app/src/main/res/values-kn/strings.xml
diff --git a/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
similarity index 100%
rename from res/values-ko/strings.xml
rename to app/src/main/res/values-ko/strings.xml
diff --git a/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
similarity index 100%
rename from res/values-nb/strings.xml
rename to app/src/main/res/values-nb/strings.xml
diff --git a/res/values-night/bools.xml b/app/src/main/res/values-night/bools.xml
similarity index 100%
rename from res/values-night/bools.xml
rename to app/src/main/res/values-night/bools.xml
diff --git a/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
similarity index 100%
rename from res/values-night/colors.xml
rename to app/src/main/res/values-night/colors.xml
diff --git a/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
similarity index 100%
rename from res/values-nl/strings.xml
rename to app/src/main/res/values-nl/strings.xml
diff --git a/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
similarity index 100%
rename from res/values-pl/strings.xml
rename to app/src/main/res/values-pl/strings.xml
diff --git a/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from res/values-pt-rBR/strings.xml
rename to app/src/main/res/values-pt-rBR/strings.xml
diff --git a/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
similarity index 100%
rename from res/values-pt-rPT/strings.xml
rename to app/src/main/res/values-pt-rPT/strings.xml
diff --git a/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
similarity index 100%
rename from res/values-ro/strings.xml
rename to app/src/main/res/values-ro/strings.xml
diff --git a/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
similarity index 100%
rename from res/values-ru/strings.xml
rename to app/src/main/res/values-ru/strings.xml
diff --git a/res/values-sc-rIT/strings.xml b/app/src/main/res/values-sc-rIT/strings.xml
similarity index 100%
rename from res/values-sc-rIT/strings.xml
rename to app/src/main/res/values-sc-rIT/strings.xml
diff --git a/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
similarity index 100%
rename from res/values-sk/strings.xml
rename to app/src/main/res/values-sk/strings.xml
diff --git a/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
similarity index 100%
rename from res/values-sl/strings.xml
rename to app/src/main/res/values-sl/strings.xml
diff --git a/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
similarity index 100%
rename from res/values-sq/strings.xml
rename to app/src/main/res/values-sq/strings.xml
diff --git a/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
similarity index 100%
rename from res/values-sr/strings.xml
rename to app/src/main/res/values-sr/strings.xml
diff --git a/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
similarity index 100%
rename from res/values-sv/strings.xml
rename to app/src/main/res/values-sv/strings.xml
diff --git a/res/values-television/styles.xml b/app/src/main/res/values-television/styles.xml
similarity index 100%
rename from res/values-television/styles.xml
rename to app/src/main/res/values-television/styles.xml
diff --git a/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
similarity index 100%
rename from res/values-th/strings.xml
rename to app/src/main/res/values-th/strings.xml
diff --git a/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
similarity index 100%
rename from res/values-tr/strings.xml
rename to app/src/main/res/values-tr/strings.xml
diff --git a/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
similarity index 100%
rename from res/values-uk/strings.xml
rename to app/src/main/res/values-uk/strings.xml
diff --git a/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
similarity index 100%
rename from res/values-vi/strings.xml
rename to app/src/main/res/values-vi/strings.xml
diff --git a/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from res/values-zh-rCN/strings.xml
rename to app/src/main/res/values-zh-rCN/strings.xml
diff --git a/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from res/values-zh-rTW/strings.xml
rename to app/src/main/res/values-zh-rTW/strings.xml
diff --git a/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
similarity index 100%
rename from res/values/arrays.xml
rename to app/src/main/res/values/arrays.xml
diff --git a/res/values/bools.xml b/app/src/main/res/values/bools.xml
similarity index 100%
rename from res/values/bools.xml
rename to app/src/main/res/values/bools.xml
diff --git a/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/res/values/config.xml b/app/src/main/res/values/config.xml
similarity index 100%
rename from res/values/config.xml
rename to app/src/main/res/values/config.xml
diff --git a/res/values/integers.xml b/app/src/main/res/values/integers.xml
similarity index 100%
rename from res/values/integers.xml
rename to app/src/main/res/values/integers.xml
diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 100%
rename from res/values/strings.xml
rename to app/src/main/res/values/strings.xml
diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from res/values/styles.xml
rename to app/src/main/res/values/styles.xml
diff --git a/res/values/symbols.xml b/app/src/main/res/values/symbols.xml
similarity index 100%
rename from res/values/symbols.xml
rename to app/src/main/res/values/symbols.xml
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 3a2eb82..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,66 +0,0 @@
-repositories {
-    google()
-    mavenCentral()
-}
-
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.1'
-    }
-}
-
-def keystorePropertiesFile = rootProject.file("keystore.properties")
-def keystoreProperties = new Properties()
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 31
-
-    defaultConfig {
-        minSdkVersion 27
-        targetSdkVersion 31
-    }
-
-
-    sourceSets {
-        main {
-            res.srcDirs = ['res']
-            java.srcDirs = ['src']
-            manifest.srcFile 'AndroidManifest.xml'
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    signingConfigs {
-        debug {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-        }
-    }
-    lint {
-        ignore 'ProtectedPermissions', 'ExtraTranslation', 'ImpliedQuantity', 'MissingQuantity', 'MissingTranslation'
-    }
-}
-
-dependencies {
-    compileOnly fileTree(dir: 'system_libs/', include: ['*.jar'])
-
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.preference:preference:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..1b97c0f
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,10 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    id("com.android.application") version "7.4.1" apply false
+    id("com.android.library") version "7.4.1" apply false
+    id("org.jetbrains.kotlin.android") version "1.7.10" apply false
+}
+
+tasks.register<Delete>("clean").configure {
+    delete(rootProject.buildDir)
+}
diff --git a/gradle.properties b/gradle.properties
index 5465fec..3c7a8bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,23 @@
-android.enableJetifier=true
-android.useAndroidX=true
\ No newline at end of file
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..41d9927
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..8049c68
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..4f906e0
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# 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
+#
+#      https://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.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..ac1b06f
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..f057661
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,16 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+rootProject.name = "Updater"
+include(":app")