diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts
index 53d71fbb0..f8c67ba76 100644
--- a/src/android/app/build.gradle.kts
+++ b/src/android/app/build.gradle.kts
@@ -26,7 +26,7 @@ val downloadedJniLibsPath = "${buildDir}/downloadedJniLibs"
 
 @Suppress("UnstableApiUsage")
 android {
-    namespace = "io.github.lime3ds"
+    namespace = "io.github.lime3ds.android"
 
     compileSdkVersion = "android-34"
     ndkVersion = "26.1.10909125"
@@ -61,7 +61,7 @@ android {
 
     defaultConfig {
         // TODO If this is ever modified, change application_id in strings.xml
-        applicationId = "io.github.lime3ds"
+        applicationId = "io.github.lime3ds.android"
         minSdk = 28
         targetSdk = 34
         versionCode = autoVersion
diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml
index e67778dba..f750ae487 100644
--- a/src/android/app/src/main/AndroidManifest.xml
+++ b/src/android/app/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
-        android:name="io.github.lime3ds.LimeApplication"
+        android:name="io.github.lime3ds.android.LimeApplication"
         android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="false"
@@ -46,7 +46,7 @@
             android:resource="@xml/game_mode_config" />
 
         <activity
-            android:name="io.github.lime3ds.ui.main.MainActivity"
+            android:name="io.github.lime3ds.android.ui.main.MainActivity"
             android:theme="@style/Theme.Lime.Splash.Main"
             android:exported="true">
 
@@ -59,13 +59,13 @@
         </activity>
 
         <activity
-            android:name="io.github.lime3ds.features.settings.ui.SettingsActivity"
+            android:name="io.github.lime3ds.android.features.settings.ui.SettingsActivity"
             android:configChanges="orientation|screenSize|uiMode"
             android:theme="@style/Theme.Lime.Main"
             android:label="@string/preferences_settings"/>
 
         <activity
-            android:name="io.github.lime3ds.activities.EmulationActivity"
+            android:name="io.github.lime3ds.android.activities.EmulationActivity"
             android:exported="true"
             android:theme="@style/Theme.Lime.Main"
             android:launchMode="singleTop">
@@ -80,12 +80,12 @@
 
         </activity>
 
-        <service android:name="io.github.lime3ds.utils.ForegroundService" android:foregroundServiceType="specialUse">
+        <service android:name="io.github.lime3ds.android.utils.ForegroundService" android:foregroundServiceType="specialUse">
             <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="Keep emulation running in background"/>
         </service>
 
         <activity
-            android:name="io.github.lime3ds.features.cheats.ui.CheatsActivity"
+            android:name="io.github.lime3ds.android.features.cheats.ui.CheatsActivity"
             android:exported="false"
             android:theme="@style/Theme.Lime.Main"
             android:label="@string/cheats"/>
diff --git a/src/android/app/src/main/java/io/github/lime3ds/CitraApplication.kt b/src/android/app/src/main/java/io/github/lime3ds/android/CitraApplication.kt
similarity index 88%
rename from src/android/app/src/main/java/io/github/lime3ds/CitraApplication.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/CitraApplication.kt
index 6efe4a366..2bd21ec99 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/CitraApplication.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/CitraApplication.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds
+package io.github.lime3ds.android
 
 import android.annotation.SuppressLint
 import android.app.Application
@@ -10,12 +10,12 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.os.Build
-import io.github.lime3ds.utils.DirectoryInitialization
-import io.github.lime3ds.utils.DocumentsTree
-import io.github.lime3ds.utils.GpuDriverHelper
-import io.github.lime3ds.utils.PermissionsHandler
-import io.github.lime3ds.utils.Log
-import io.github.lime3ds.utils.MemoryUtil
+import io.github.lime3ds.android.utils.DirectoryInitialization
+import io.github.lime3ds.android.utils.DocumentsTree
+import io.github.lime3ds.android.utils.GpuDriverHelper
+import io.github.lime3ds.android.utils.PermissionsHandler
+import io.github.lime3ds.android.utils.Log
+import io.github.lime3ds.android.utils.MemoryUtil
 
 class LimeApplication : Application() {
     private fun createNotificationChannel() {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/NativeLibrary.kt b/src/android/app/src/main/java/io/github/lime3ds/android/NativeLibrary.kt
similarity index 98%
rename from src/android/app/src/main/java/io/github/lime3ds/NativeLibrary.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/NativeLibrary.kt
index b9e0500a7..9b7261977 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/NativeLibrary.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/NativeLibrary.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds
+package io.github.lime3ds.android
 
 import android.Manifest.permission
 import android.app.Dialog
@@ -20,10 +20,10 @@ import androidx.annotation.Keep
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import io.github.lime3ds.activities.EmulationActivity
-import io.github.lime3ds.utils.EmulationMenuSettings
-import io.github.lime3ds.utils.FileUtil
-import io.github.lime3ds.utils.Log
+import io.github.lime3ds.android.activities.EmulationActivity
+import io.github.lime3ds.android.utils.EmulationMenuSettings
+import io.github.lime3ds.android.utils.FileUtil
+import io.github.lime3ds.android.utils.Log
 import java.lang.ref.WeakReference
 import java.util.Date
 
diff --git a/src/android/app/src/main/java/io/github/lime3ds/activities/EmulationActivity.kt b/src/android/app/src/main/java/io/github/lime3ds/android/activities/EmulationActivity.kt
similarity index 93%
rename from src/android/app/src/main/java/io/github/lime3ds/activities/EmulationActivity.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/activities/EmulationActivity.kt
index 2f17bb7f1..ffb4b7f6e 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/activities/EmulationActivity.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/activities/EmulationActivity.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.activities
+package io.github.lime3ds.android.activities
 
 import android.Manifest.permission
 import android.annotation.SuppressLint
@@ -25,24 +25,24 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.navigation.fragment.NavHostFragment
 import androidx.preference.PreferenceManager
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.R
-import io.github.lime3ds.camera.StillImageCameraHelper.OnFilePickerResult
-import io.github.lime3ds.contracts.OpenFileResultContract
-import io.github.lime3ds.databinding.ActivityEmulationBinding
-import io.github.lime3ds.display.ScreenAdjustmentUtil
-import io.github.lime3ds.features.hotkeys.HotkeyUtility
-import io.github.lime3ds.features.settings.model.SettingsViewModel
-import io.github.lime3ds.features.settings.model.view.InputBindingSetting
-import io.github.lime3ds.fragments.MessageDialogFragment
-import io.github.lime3ds.utils.ControllerMappingHelper
-import io.github.lime3ds.utils.FileBrowserHelper
-import io.github.lime3ds.utils.ForegroundService
-import io.github.lime3ds.utils.EmulationLifecycleUtil
-import io.github.lime3ds.utils.EmulationMenuSettings
-import io.github.lime3ds.utils.ThemeUtil
-import io.github.lime3ds.viewmodel.EmulationViewModel
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.camera.StillImageCameraHelper.OnFilePickerResult
+import io.github.lime3ds.android.contracts.OpenFileResultContract
+import io.github.lime3ds.android.databinding.ActivityEmulationBinding
+import io.github.lime3ds.android.display.ScreenAdjustmentUtil
+import io.github.lime3ds.android.features.hotkeys.HotkeyUtility
+import io.github.lime3ds.android.features.settings.model.SettingsViewModel
+import io.github.lime3ds.android.features.settings.model.view.InputBindingSetting
+import io.github.lime3ds.android.fragments.MessageDialogFragment
+import io.github.lime3ds.android.utils.ControllerMappingHelper
+import io.github.lime3ds.android.utils.FileBrowserHelper
+import io.github.lime3ds.android.utils.ForegroundService
+import io.github.lime3ds.android.utils.EmulationLifecycleUtil
+import io.github.lime3ds.android.utils.EmulationMenuSettings
+import io.github.lime3ds.android.utils.ThemeUtil
+import io.github.lime3ds.android.viewmodel.EmulationViewModel
 
 class EmulationActivity : AppCompatActivity() {
     private val preferences: SharedPreferences
diff --git a/src/android/app/src/main/java/io/github/lime3ds/adapters/DriverAdapter.kt b/src/android/app/src/main/java/io/github/lime3ds/android/adapters/DriverAdapter.kt
similarity index 93%
rename from src/android/app/src/main/java/io/github/lime3ds/adapters/DriverAdapter.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/adapters/DriverAdapter.kt
index b58b9cf06..b669bc23e 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/adapters/DriverAdapter.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/adapters/DriverAdapter.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.adapters
+package io.github.lime3ds.android.adapters
 
 import android.net.Uri
 import android.text.TextUtils
@@ -13,11 +13,11 @@ import androidx.recyclerview.widget.AsyncDifferConfig
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import io.github.lime3ds.R
-import io.github.lime3ds.databinding.CardDriverOptionBinding
-import io.github.lime3ds.utils.GpuDriverMetadata
-import io.github.lime3ds.viewmodel.DriverViewModel
-import io.github.lime3ds.utils.GpuDriverHelper
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.databinding.CardDriverOptionBinding
+import io.github.lime3ds.android.utils.GpuDriverMetadata
+import io.github.lime3ds.android.viewmodel.DriverViewModel
+import io.github.lime3ds.android.utils.GpuDriverHelper
 
 class DriverAdapter(private val driverViewModel: DriverViewModel) :
     ListAdapter<Pair<Uri, GpuDriverMetadata>, DriverAdapter.DriverViewHolder>(
diff --git a/src/android/app/src/main/java/io/github/lime3ds/adapters/GameAdapter.kt b/src/android/app/src/main/java/io/github/lime3ds/android/adapters/GameAdapter.kt
similarity index 92%
rename from src/android/app/src/main/java/io/github/lime3ds/adapters/GameAdapter.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/adapters/GameAdapter.kt
index 874ad5061..1b7aa14ec 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/adapters/GameAdapter.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/adapters/GameAdapter.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.adapters
+package io.github.lime3ds.android.adapters
 
 import android.net.Uri
 import android.os.SystemClock
@@ -23,15 +23,15 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import io.github.lime3ds.HomeNavigationDirections
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.R
-import io.github.lime3ds.adapters.GameAdapter.GameViewHolder
-import io.github.lime3ds.databinding.CardGameBinding
-import io.github.lime3ds.features.cheats.ui.CheatsFragmentDirections
-import io.github.lime3ds.model.Game
-import io.github.lime3ds.utils.GameIconUtils
-import io.github.lime3ds.viewmodel.GamesViewModel
+import io.github.lime3ds.android.HomeNavigationDirections
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.adapters.GameAdapter.GameViewHolder
+import io.github.lime3ds.android.databinding.CardGameBinding
+import io.github.lime3ds.android.features.cheats.ui.CheatsFragmentDirections
+import io.github.lime3ds.android.model.Game
+import io.github.lime3ds.android.utils.GameIconUtils
+import io.github.lime3ds.android.viewmodel.GamesViewModel
 
 class GameAdapter(private val activity: AppCompatActivity) :
     ListAdapter<Game, GameViewHolder>(AsyncDifferConfig.Builder(DiffCallback()).build()),
diff --git a/src/android/app/src/main/java/io/github/lime3ds/adapters/HomeSettingAdapter.kt b/src/android/app/src/main/java/io/github/lime3ds/android/adapters/HomeSettingAdapter.kt
similarity index 92%
rename from src/android/app/src/main/java/io/github/lime3ds/adapters/HomeSettingAdapter.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/adapters/HomeSettingAdapter.kt
index 4e8e347eb..68bae3e84 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/adapters/HomeSettingAdapter.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/adapters/HomeSettingAdapter.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.adapters
+package io.github.lime3ds.android.adapters
 
 import android.text.TextUtils
 import android.view.LayoutInflater
@@ -19,11 +19,11 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
-import io.github.lime3ds.R
-import io.github.lime3ds.databinding.CardHomeOptionBinding
-import io.github.lime3ds.fragments.MessageDialogFragment
-import io.github.lime3ds.model.HomeSetting
-import io.github.lime3ds.viewmodel.GamesViewModel
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.databinding.CardHomeOptionBinding
+import io.github.lime3ds.android.fragments.MessageDialogFragment
+import io.github.lime3ds.android.model.HomeSetting
+import io.github.lime3ds.android.viewmodel.GamesViewModel
 
 class HomeSettingAdapter(
     private val activity: AppCompatActivity,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/adapters/LicenseAdapter.kt b/src/android/app/src/main/java/io/github/lime3ds/android/adapters/LicenseAdapter.kt
similarity index 86%
rename from src/android/app/src/main/java/io/github/lime3ds/adapters/LicenseAdapter.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/adapters/LicenseAdapter.kt
index f54d35f39..a90398b84 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/adapters/LicenseAdapter.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/adapters/LicenseAdapter.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.adapters
+package io.github.lime3ds.android.adapters
 
 import android.view.LayoutInflater
 import android.view.View
@@ -10,10 +10,10 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.databinding.ListItemSettingBinding
-import io.github.lime3ds.fragments.LicenseBottomSheetDialogFragment
-import io.github.lime3ds.model.License
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.databinding.ListItemSettingBinding
+import io.github.lime3ds.android.fragments.LicenseBottomSheetDialogFragment
+import io.github.lime3ds.android.model.License
 
 class LicenseAdapter(private val activity: AppCompatActivity, var licenses: List<License>) :
     RecyclerView.Adapter<LicenseAdapter.LicenseViewHolder>(),
diff --git a/src/android/app/src/main/java/io/github/lime3ds/adapters/SetupAdapter.kt b/src/android/app/src/main/java/io/github/lime3ds/android/adapters/SetupAdapter.kt
similarity index 90%
rename from src/android/app/src/main/java/io/github/lime3ds/adapters/SetupAdapter.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/adapters/SetupAdapter.kt
index 66684b849..32d44e3aa 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/adapters/SetupAdapter.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/adapters/SetupAdapter.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.adapters
+package io.github.lime3ds.android.adapters
 
 import android.text.Html
 import android.text.method.LinkMovementMethod
@@ -13,11 +13,11 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.button.MaterialButton
-import io.github.lime3ds.databinding.PageSetupBinding
-import io.github.lime3ds.model.SetupCallback
-import io.github.lime3ds.model.SetupPage
-import io.github.lime3ds.model.StepState
-import io.github.lime3ds.utils.ViewUtils
+import io.github.lime3ds.android.databinding.PageSetupBinding
+import io.github.lime3ds.android.model.SetupCallback
+import io.github.lime3ds.android.model.SetupPage
+import io.github.lime3ds.android.model.StepState
+import io.github.lime3ds.android.utils.ViewUtils
 
 class SetupAdapter(val activity: AppCompatActivity, val pages: List<SetupPage>) :
     RecyclerView.Adapter<SetupAdapter.SetupPageViewHolder>() {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/applets/MiiSelector.kt b/src/android/app/src/main/java/io/github/lime3ds/android/applets/MiiSelector.kt
similarity index 89%
rename from src/android/app/src/main/java/io/github/lime3ds/applets/MiiSelector.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/applets/MiiSelector.kt
index e409f59e7..9b6d51747 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/applets/MiiSelector.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/applets/MiiSelector.kt
@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.applets
+package io.github.lime3ds.android.applets
 
 import androidx.annotation.Keep
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.fragments.MiiSelectorDialogFragment
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.fragments.MiiSelectorDialogFragment
 import java.io.Serializable
 
 @Keep
diff --git a/src/android/app/src/main/java/io/github/lime3ds/applets/SoftwareKeyboard.kt b/src/android/app/src/main/java/io/github/lime3ds/android/applets/SoftwareKeyboard.kt
similarity index 92%
rename from src/android/app/src/main/java/io/github/lime3ds/applets/SoftwareKeyboard.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/applets/SoftwareKeyboard.kt
index c6febaa30..c79e03d62 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/applets/SoftwareKeyboard.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/applets/SoftwareKeyboard.kt
@@ -2,17 +2,17 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.applets
+package io.github.lime3ds.android.applets
 
 import android.text.InputFilter
 import android.text.Spanned
 import androidx.annotation.Keep
-import io.github.lime3ds.LimeApplication.Companion.appContext
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.R
-import io.github.lime3ds.fragments.KeyboardDialogFragment
-import io.github.lime3ds.fragments.MessageDialogFragment
-import io.github.lime3ds.utils.Log
+import io.github.lime3ds.android.LimeApplication.Companion.appContext
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.fragments.KeyboardDialogFragment
+import io.github.lime3ds.android.fragments.MessageDialogFragment
+import io.github.lime3ds.android.utils.Log
 import java.io.Serializable
 
 @Keep
diff --git a/src/android/app/src/main/java/io/github/lime3ds/camera/StillImageCameraHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/android/camera/StillImageCameraHelper.kt
similarity index 93%
rename from src/android/app/src/main/java/io/github/lime3ds/camera/StillImageCameraHelper.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/camera/StillImageCameraHelper.kt
index 6309884e8..c5819bff3 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/camera/StillImageCameraHelper.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/camera/StillImageCameraHelper.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.camera
+package io.github.lime3ds.android.camera
 
 import android.graphics.Bitmap
 import androidx.activity.result.PickVisualMediaRequest
@@ -12,8 +12,8 @@ import androidx.core.graphics.drawable.toBitmap
 import coil.executeBlocking
 import coil.imageLoader
 import coil.request.ImageRequest
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.NativeLibrary
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.NativeLibrary
 
 // Used in native code.
 object StillImageCameraHelper {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/contracts/OpenFileResultContract.kt b/src/android/app/src/main/java/io/github/lime3ds/android/contracts/OpenFileResultContract.kt
similarity index 93%
rename from src/android/app/src/main/java/io/github/lime3ds/contracts/OpenFileResultContract.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/contracts/OpenFileResultContract.kt
index 433c98f33..deec6196c 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/contracts/OpenFileResultContract.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/contracts/OpenFileResultContract.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.contracts
+package io.github.lime3ds.android.contracts
 
 import android.content.Context
 import android.content.Intent
diff --git a/src/android/app/src/main/java/io/github/lime3ds/display/ScreenAdjustmentUtil.kt b/src/android/app/src/main/java/io/github/lime3ds/android/display/ScreenAdjustmentUtil.kt
similarity index 75%
rename from src/android/app/src/main/java/io/github/lime3ds/display/ScreenAdjustmentUtil.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/display/ScreenAdjustmentUtil.kt
index 19d2db22a..cd0310047 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/display/ScreenAdjustmentUtil.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/display/ScreenAdjustmentUtil.kt
@@ -2,15 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.display
+package io.github.lime3ds.android.display
 
 import android.view.WindowManager
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.features.settings.model.BooleanSetting
-import io.github.lime3ds.features.settings.model.IntSetting
-import io.github.lime3ds.features.settings.model.Settings
-import io.github.lime3ds.features.settings.utils.SettingsFile
-import io.github.lime3ds.utils.EmulationMenuSettings
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.features.settings.model.BooleanSetting
+import io.github.lime3ds.android.features.settings.model.IntSetting
+import io.github.lime3ds.android.features.settings.model.Settings
+import io.github.lime3ds.android.features.settings.utils.SettingsFile
+import io.github.lime3ds.android.utils.EmulationMenuSettings
 
 class ScreenAdjustmentUtil(private val windowManager: WindowManager,
                            private val settings: Settings) {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/display/ScreenLayout.kt b/src/android/app/src/main/java/io/github/lime3ds/android/display/ScreenLayout.kt
similarity index 92%
rename from src/android/app/src/main/java/io/github/lime3ds/display/ScreenLayout.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/display/ScreenLayout.kt
index 3617825e4..1c6635a78 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/display/ScreenLayout.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/display/ScreenLayout.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.display
+package io.github.lime3ds.android.display
 
 enum class ScreenLayout(val int: Int) {
     // These must match what is defined in src/common/settings.h
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/model/Cheat.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/model/Cheat.kt
similarity index 95%
rename from src/android/app/src/main/java/io/github/lime3ds/features/cheats/model/Cheat.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/model/Cheat.kt
index 83e67da87..fd56dca12 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/model/Cheat.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/model/Cheat.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.cheats.model
+package io.github.lime3ds.android.features.cheats.model
 
 import androidx.annotation.Keep
 
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/model/CheatEngine.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/model/CheatEngine.kt
similarity index 89%
rename from src/android/app/src/main/java/io/github/lime3ds/features/cheats/model/CheatEngine.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/model/CheatEngine.kt
index d6003d6f7..6e2ef13f2 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/model/CheatEngine.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/model/CheatEngine.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.cheats.model
+package io.github.lime3ds.android.features.cheats.model
 
 import androidx.annotation.Keep
 
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/model/CheatsViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/model/CheatsViewModel.kt
similarity index 98%
rename from src/android/app/src/main/java/io/github/lime3ds/features/cheats/model/CheatsViewModel.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/model/CheatsViewModel.kt
index b3a867451..b85d343ed 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/model/CheatsViewModel.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/model/CheatsViewModel.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.cheats.model
+package io.github.lime3ds.android.features.cheats.model
 
 import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatDetailsFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/ui/CheatDetailsFragment.kt
similarity index 96%
rename from src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatDetailsFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/ui/CheatDetailsFragment.kt
index 374959e0d..2b77d22c8 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatDetailsFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/ui/CheatDetailsFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.cheats.ui
+package io.github.lime3ds.android.features.cheats.ui
 
 import android.annotation.SuppressLint
 import android.content.DialogInterface
@@ -21,10 +21,10 @@ import androidx.lifecycle.repeatOnLifecycle
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
-import io.github.lime3ds.R
-import io.github.lime3ds.databinding.FragmentCheatDetailsBinding
-import io.github.lime3ds.features.cheats.model.Cheat
-import io.github.lime3ds.features.cheats.model.CheatsViewModel
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.databinding.FragmentCheatDetailsBinding
+import io.github.lime3ds.android.features.cheats.model.Cheat
+import io.github.lime3ds.android.features.cheats.model.CheatsViewModel
 
 class CheatDetailsFragment : Fragment() {
     private val cheatsViewModel: CheatsViewModel by activityViewModels()
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatListFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/ui/CheatListFragment.kt
similarity index 94%
rename from src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatListFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/ui/CheatListFragment.kt
index 81d05589e..505940e5b 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatListFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/ui/CheatListFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.cheats.ui
+package io.github.lime3ds.android.features.cheats.ui
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -23,10 +23,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.divider.MaterialDividerItemDecoration
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
-import io.github.lime3ds.R
-import io.github.lime3ds.databinding.FragmentCheatListBinding
-import io.github.lime3ds.features.cheats.model.CheatsViewModel
-import io.github.lime3ds.ui.main.MainActivity
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.databinding.FragmentCheatListBinding
+import io.github.lime3ds.android.features.cheats.model.CheatsViewModel
+import io.github.lime3ds.android.ui.main.MainActivity
 
 class CheatListFragment : Fragment() {
     private var _binding: FragmentCheatListBinding? = null
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatsActivity.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/ui/CheatsActivity.kt
similarity index 88%
rename from src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatsActivity.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/ui/CheatsActivity.kt
index 8d1b9ef58..52dbdb237 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatsActivity.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/ui/CheatsActivity.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.cheats.ui
+package io.github.lime3ds.android.features.cheats.ui
 
 import android.os.Bundle
 import android.view.View
@@ -12,10 +12,10 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.WindowCompat
 import androidx.navigation.fragment.NavHostFragment
 import com.google.android.material.color.MaterialColors
-import io.github.lime3ds.R
-import io.github.lime3ds.databinding.ActivityCheatsBinding
-import io.github.lime3ds.utils.InsetsHelper
-import io.github.lime3ds.utils.ThemeUtil
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.databinding.ActivityCheatsBinding
+import io.github.lime3ds.android.utils.InsetsHelper
+import io.github.lime3ds.android.utils.ThemeUtil
 
 class CheatsActivity : AppCompatActivity() {
     private lateinit var binding: ActivityCheatsBinding
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatsAdapter.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/ui/CheatsAdapter.kt
similarity index 91%
rename from src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatsAdapter.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/ui/CheatsAdapter.kt
index c6c28d15f..2e5086b81 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatsAdapter.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/ui/CheatsAdapter.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.cheats.ui
+package io.github.lime3ds.android.features.cheats.ui
 
 import android.view.LayoutInflater
 import android.view.View
@@ -11,9 +11,9 @@ import android.widget.CompoundButton
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.RecyclerView
-import io.github.lime3ds.databinding.ListItemCheatBinding
-import io.github.lime3ds.features.cheats.model.Cheat
-import io.github.lime3ds.features.cheats.model.CheatsViewModel
+import io.github.lime3ds.android.databinding.ListItemCheatBinding
+import io.github.lime3ds.android.features.cheats.model.Cheat
+import io.github.lime3ds.android.features.cheats.model.CheatsViewModel
 
 class CheatsAdapter(
     private val activity: FragmentActivity,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatsFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/ui/CheatsFragment.kt
similarity index 95%
rename from src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatsFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/ui/CheatsFragment.kt
index 127a68b65..f2d601b30 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatsFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/cheats/ui/CheatsFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.cheats.ui
+package io.github.lime3ds.android.features.cheats.ui
 
 import android.annotation.SuppressLint
 import android.os.Build
@@ -25,12 +25,12 @@ import androidx.slidingpanelayout.widget.SlidingPaneLayout
 import com.google.android.material.transition.MaterialSharedAxis
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
-import io.github.lime3ds.databinding.FragmentCheatsBinding
-import io.github.lime3ds.features.cheats.model.Cheat
-import io.github.lime3ds.features.cheats.model.CheatsViewModel
-import io.github.lime3ds.ui.TwoPaneOnBackPressedCallback
-import io.github.lime3ds.ui.main.MainActivity
-import io.github.lime3ds.viewmodel.HomeViewModel
+import io.github.lime3ds.android.databinding.FragmentCheatsBinding
+import io.github.lime3ds.android.features.cheats.model.Cheat
+import io.github.lime3ds.android.features.cheats.model.CheatsViewModel
+import io.github.lime3ds.android.ui.TwoPaneOnBackPressedCallback
+import io.github.lime3ds.android.ui.main.MainActivity
+import io.github.lime3ds.android.viewmodel.HomeViewModel
 
 class CheatsFragment : Fragment(), SlidingPaneLayout.PanelSlideListener {
     private var cheatListLastFocus: View? = null
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/hotkeys/Hotkey.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/hotkeys/Hotkey.kt
similarity index 84%
rename from src/android/app/src/main/java/io/github/lime3ds/features/hotkeys/Hotkey.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/hotkeys/Hotkey.kt
index f8c49721a..d20fe70c3 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/hotkeys/Hotkey.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/hotkeys/Hotkey.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.hotkeys
+package io.github.lime3ds.android.features.hotkeys
 
 enum class Hotkey(val button: Int) {
     SWAP_SCREEN(10001),
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/hotkeys/HotkeyUtility.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/hotkeys/HotkeyUtility.kt
similarity index 82%
rename from src/android/app/src/main/java/io/github/lime3ds/features/hotkeys/HotkeyUtility.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/hotkeys/HotkeyUtility.kt
index ed607a5a8..bc07064c3 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/hotkeys/HotkeyUtility.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/hotkeys/HotkeyUtility.kt
@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.hotkeys
+package io.github.lime3ds.android.features.hotkeys
 
-import io.github.lime3ds.utils.EmulationLifecycleUtil
-import io.github.lime3ds.display.ScreenAdjustmentUtil
+import io.github.lime3ds.android.utils.EmulationLifecycleUtil
+import io.github.lime3ds.android.display.ScreenAdjustmentUtil
 
 class HotkeyUtility(private val screenAdjustmentUtil: ScreenAdjustmentUtil) {
 
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractBooleanSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractBooleanSetting.kt
similarity index 78%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractBooleanSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractBooleanSetting.kt
index 222fb77c7..8dcafe60b 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractBooleanSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractBooleanSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model
+package io.github.lime3ds.android.features.settings.model
 
 interface AbstractBooleanSetting : AbstractSetting {
     var boolean: Boolean
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractFloatSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractFloatSetting.kt
similarity index 77%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractFloatSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractFloatSetting.kt
index 0c2779d56..e0727a651 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractFloatSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractFloatSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model
+package io.github.lime3ds.android.features.settings.model
 
 interface AbstractFloatSetting : AbstractSetting {
     var float: Float
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractIntSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractIntSetting.kt
similarity index 77%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractIntSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractIntSetting.kt
index d5133eaba..91a730b96 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractIntSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractIntSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model
+package io.github.lime3ds.android.features.settings.model
 
 interface AbstractIntSetting : AbstractSetting {
     var int: Int
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractSetting.kt
similarity index 83%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractSetting.kt
index 8bcffabfd..9fc95f26c 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model
+package io.github.lime3ds.android.features.settings.model
 
 interface AbstractSetting {
     val key: String?
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractShortSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractShortSetting.kt
similarity index 77%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractShortSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractShortSetting.kt
index 1d53a36e8..0aa36c7fd 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractShortSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractShortSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model
+package io.github.lime3ds.android.features.settings.model
 
 interface AbstractShortSetting : AbstractSetting {
     var short: Short
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractStringSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractStringSetting.kt
similarity index 78%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractStringSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractStringSetting.kt
index 6ee3fd1b0..be6ea4f6c 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractStringSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/AbstractStringSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model
+package io.github.lime3ds.android.features.settings.model
 
 interface AbstractStringSetting : AbstractSetting {
     var string: String
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/BooleanSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/BooleanSetting.kt
similarity index 95%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/BooleanSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/BooleanSetting.kt
index 82d76338d..7e3114c77 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/BooleanSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/BooleanSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model
+package io.github.lime3ds.android.features.settings.model
 
 enum class BooleanSetting(
     override val key: String,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/FloatSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/FloatSetting.kt
similarity index 94%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/FloatSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/FloatSetting.kt
index e93536147..3eb586858 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/FloatSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/FloatSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model
+package io.github.lime3ds.android.features.settings.model
 
 enum class FloatSetting(
     override val key: String,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/IntSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/IntSetting.kt
similarity index 98%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/IntSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/IntSetting.kt
index 2a2de3639..289d2f8c5 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/IntSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/IntSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model
+package io.github.lime3ds.android.features.settings.model
 
 enum class IntSetting(
     override val key: String,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/ScaledFloatSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/ScaledFloatSetting.kt
similarity index 95%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/ScaledFloatSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/ScaledFloatSetting.kt
index 2ebc99dce..a0cda6fc3 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/ScaledFloatSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/ScaledFloatSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model
+package io.github.lime3ds.android.features.settings.model
 
 enum class ScaledFloatSetting(
     override val key: String,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/SettingSection.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/SettingSection.kt
similarity index 94%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/SettingSection.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/SettingSection.kt
index 9c47f8ba7..b812f9a41 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/SettingSection.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/SettingSection.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model
+package io.github.lime3ds.android.features.settings.model
 
 /**
  * A semantically-related group of Settings objects. These Settings are
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/Settings.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/Settings.kt
similarity index 96%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/Settings.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/Settings.kt
index 57111a844..2ec43818f 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/Settings.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/Settings.kt
@@ -2,13 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model
+package io.github.lime3ds.android.features.settings.model
 
 import android.text.TextUtils
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.R
-import io.github.lime3ds.features.settings.ui.SettingsActivityView
-import io.github.lime3ds.features.settings.utils.SettingsFile
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.features.settings.ui.SettingsActivityView
+import io.github.lime3ds.android.features.settings.utils.SettingsFile
 import java.util.TreeMap
 
 class Settings {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/SettingsViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/SettingsViewModel.kt
similarity index 80%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/SettingsViewModel.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/SettingsViewModel.kt
index ed85570fb..bc79bb4d1 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/SettingsViewModel.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/SettingsViewModel.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model
+package io.github.lime3ds.android.features.settings.model
 
 import androidx.lifecycle.ViewModel
 
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/StringSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/StringSetting.kt
similarity index 96%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/StringSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/StringSetting.kt
index 5f49403b8..c90117ad1 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/StringSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/StringSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model
+package io.github.lime3ds.android.features.settings.model
 
 enum class StringSetting(
     override val key: String,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/DateTimeSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/DateTimeSetting.kt
similarity index 79%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/DateTimeSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/DateTimeSetting.kt
index f73288634..037c9718f 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/DateTimeSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/DateTimeSetting.kt
@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model.view
+package io.github.lime3ds.android.features.settings.model.view
 
-import io.github.lime3ds.features.settings.model.AbstractSetting
-import io.github.lime3ds.features.settings.model.AbstractStringSetting
+import io.github.lime3ds.android.features.settings.model.AbstractSetting
+import io.github.lime3ds.android.features.settings.model.AbstractStringSetting
 
 class DateTimeSetting(
     setting: AbstractSetting?,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/HeaderSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/HeaderSetting.kt
similarity index 79%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/HeaderSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/HeaderSetting.kt
index b1a66d1f9..c83bfe503 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/HeaderSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/HeaderSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model.view
+package io.github.lime3ds.android.features.settings.model.view
 
 class HeaderSetting(titleId: Int) : SettingsItem(null, titleId, 0) {
     override val type = TYPE_HEADER
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/InputBindingSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/InputBindingSetting.kt
similarity index 96%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/InputBindingSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/InputBindingSetting.kt
index 9de098b58..622bfb0e4 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/InputBindingSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/InputBindingSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model.view
+package io.github.lime3ds.android.features.settings.model.view
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -11,12 +11,12 @@ import android.view.InputDevice.MotionRange
 import android.view.KeyEvent
 import android.widget.Toast
 import androidx.preference.PreferenceManager
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.R
-import io.github.lime3ds.features.hotkeys.Hotkey
-import io.github.lime3ds.features.settings.model.AbstractSetting
-import io.github.lime3ds.features.settings.model.Settings
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.features.hotkeys.Hotkey
+import io.github.lime3ds.android.features.settings.model.AbstractSetting
+import io.github.lime3ds.android.features.settings.model.Settings
 
 class InputBindingSetting(
     val abstractSetting: AbstractSetting,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/RunnableSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/RunnableSetting.kt
similarity index 86%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/RunnableSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/RunnableSetting.kt
index 4649c7b9a..a91ea16f8 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/RunnableSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/RunnableSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model.view
+package io.github.lime3ds.android.features.settings.model.view
 
 class RunnableSetting(
     titleId: Int,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/SettingsItem.kt
similarity index 86%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SettingsItem.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/SettingsItem.kt
index bd1d53885..46a7ffbb0 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SettingsItem.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/SettingsItem.kt
@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model.view
+package io.github.lime3ds.android.features.settings.model.view
 
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.features.settings.model.AbstractSetting
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.features.settings.model.AbstractSetting
 
 /**
  * ViewModel abstraction for an Item in the RecyclerView powering SettingsFragments.
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SingleChoiceSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/SingleChoiceSetting.kt
similarity index 85%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SingleChoiceSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/SingleChoiceSetting.kt
index 8f2048e43..4e02f8510 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SingleChoiceSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/SingleChoiceSetting.kt
@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model.view
+package io.github.lime3ds.android.features.settings.model.view
 
-import io.github.lime3ds.features.settings.model.AbstractIntSetting
-import io.github.lime3ds.features.settings.model.AbstractSetting
-import io.github.lime3ds.features.settings.model.AbstractShortSetting
+import io.github.lime3ds.android.features.settings.model.AbstractIntSetting
+import io.github.lime3ds.android.features.settings.model.AbstractSetting
+import io.github.lime3ds.android.features.settings.model.AbstractShortSetting
 
 class SingleChoiceSetting(
     setting: AbstractSetting?,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SliderSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/SliderSetting.kt
similarity index 81%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SliderSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/SliderSetting.kt
index 3fe6459f6..2cfbc0d22 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SliderSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/SliderSetting.kt
@@ -2,14 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model.view
+package io.github.lime3ds.android.features.settings.model.view
 
-import io.github.lime3ds.features.settings.model.AbstractFloatSetting
-import io.github.lime3ds.features.settings.model.AbstractIntSetting
-import io.github.lime3ds.features.settings.model.AbstractSetting
-import io.github.lime3ds.features.settings.model.FloatSetting
-import io.github.lime3ds.features.settings.model.ScaledFloatSetting
-import io.github.lime3ds.utils.Log
+import io.github.lime3ds.android.features.settings.model.AbstractFloatSetting
+import io.github.lime3ds.android.features.settings.model.AbstractIntSetting
+import io.github.lime3ds.android.features.settings.model.AbstractSetting
+import io.github.lime3ds.android.features.settings.model.FloatSetting
+import io.github.lime3ds.android.features.settings.model.ScaledFloatSetting
+import io.github.lime3ds.android.utils.Log
 import kotlin.math.roundToInt
 
 class SliderSetting(
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/StringInputSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/StringInputSetting.kt
similarity index 76%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/StringInputSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/StringInputSetting.kt
index d0971c0e9..bcb97b5dc 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/StringInputSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/StringInputSetting.kt
@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model.view
+package io.github.lime3ds.android.features.settings.model.view
 
-import io.github.lime3ds.features.settings.model.AbstractSetting
-import io.github.lime3ds.features.settings.model.AbstractStringSetting
+import io.github.lime3ds.android.features.settings.model.AbstractSetting
+import io.github.lime3ds.android.features.settings.model.AbstractStringSetting
 
 class StringInputSetting(
     setting: AbstractSetting?,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/StringSingleChoiceSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/StringSingleChoiceSetting.kt
similarity index 88%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/StringSingleChoiceSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/StringSingleChoiceSetting.kt
index 116032b09..74b7d632e 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/StringSingleChoiceSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/StringSingleChoiceSetting.kt
@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model.view
+package io.github.lime3ds.android.features.settings.model.view
 
-import io.github.lime3ds.features.settings.model.AbstractSetting
-import io.github.lime3ds.features.settings.model.AbstractShortSetting
-import io.github.lime3ds.features.settings.model.AbstractStringSetting
+import io.github.lime3ds.android.features.settings.model.AbstractSetting
+import io.github.lime3ds.android.features.settings.model.AbstractShortSetting
+import io.github.lime3ds.android.features.settings.model.AbstractStringSetting
 
 class StringSingleChoiceSetting(
     setting: AbstractSetting?,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SubmenuSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/SubmenuSetting.kt
similarity index 82%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SubmenuSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/SubmenuSetting.kt
index b24add2a2..76a0e76c3 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SubmenuSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/SubmenuSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model.view
+package io.github.lime3ds.android.features.settings.model.view
 
 class SubmenuSetting(
     titleId: Int,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SwitchSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/SwitchSetting.kt
similarity index 85%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SwitchSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/SwitchSetting.kt
index 90ec5d3bf..6bcb2488c 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SwitchSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/SwitchSetting.kt
@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.model.view
+package io.github.lime3ds.android.features.settings.model.view
 
-import io.github.lime3ds.features.settings.model.AbstractBooleanSetting
-import io.github.lime3ds.features.settings.model.AbstractIntSetting
-import io.github.lime3ds.features.settings.model.AbstractSetting
+import io.github.lime3ds.android.features.settings.model.AbstractBooleanSetting
+import io.github.lime3ds.android.features.settings.model.AbstractIntSetting
+import io.github.lime3ds.android.features.settings.model.AbstractSetting
 
 class SwitchSetting(
     setting: AbstractSetting,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivity.kt
similarity index 90%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivity.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivity.kt
index 88065df5f..c22ab39cb 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivity.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivity.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui
+package io.github.lime3ds.android.features.settings.ui
 
 import android.content.Context
 import android.content.Intent
@@ -21,23 +21,23 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.preference.PreferenceManager
 import com.google.android.material.color.MaterialColors
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.R
-import io.github.lime3ds.databinding.ActivitySettingsBinding
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.databinding.ActivitySettingsBinding
 import java.io.IOException
-import io.github.lime3ds.features.settings.model.BooleanSetting
-import io.github.lime3ds.features.settings.model.FloatSetting
-import io.github.lime3ds.features.settings.model.IntSetting
-import io.github.lime3ds.features.settings.model.ScaledFloatSetting
-import io.github.lime3ds.features.settings.model.Settings
-import io.github.lime3ds.features.settings.model.SettingsViewModel
-import io.github.lime3ds.features.settings.model.StringSetting
-import io.github.lime3ds.features.settings.utils.SettingsFile
-import io.github.lime3ds.utils.SystemSaveGame
-import io.github.lime3ds.utils.DirectoryInitialization
-import io.github.lime3ds.utils.InsetsHelper
-import io.github.lime3ds.utils.ThemeUtil
+import io.github.lime3ds.android.features.settings.model.BooleanSetting
+import io.github.lime3ds.android.features.settings.model.FloatSetting
+import io.github.lime3ds.android.features.settings.model.IntSetting
+import io.github.lime3ds.android.features.settings.model.ScaledFloatSetting
+import io.github.lime3ds.android.features.settings.model.Settings
+import io.github.lime3ds.android.features.settings.model.SettingsViewModel
+import io.github.lime3ds.android.features.settings.model.StringSetting
+import io.github.lime3ds.android.features.settings.utils.SettingsFile
+import io.github.lime3ds.android.utils.SystemSaveGame
+import io.github.lime3ds.android.utils.DirectoryInitialization
+import io.github.lime3ds.android.utils.InsetsHelper
+import io.github.lime3ds.android.utils.ThemeUtil
 
 class SettingsActivity : AppCompatActivity(), SettingsActivityView {
     private val presenter = SettingsActivityPresenter(this)
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivityPresenter.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivityPresenter.kt
similarity index 86%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivityPresenter.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivityPresenter.kt
index 7dd3f2672..65307d0d2 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivityPresenter.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivityPresenter.kt
@@ -2,15 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui
+package io.github.lime3ds.android.features.settings.ui
 
 import android.os.Bundle
 import android.text.TextUtils
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.features.settings.model.Settings
-import io.github.lime3ds.utils.SystemSaveGame
-import io.github.lime3ds.utils.DirectoryInitialization
-import io.github.lime3ds.utils.Log
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.features.settings.model.Settings
+import io.github.lime3ds.android.utils.SystemSaveGame
+import io.github.lime3ds.android.utils.DirectoryInitialization
+import io.github.lime3ds.android.utils.Log
 
 class SettingsActivityPresenter(private val activityView: SettingsActivityView) {
     val settings: Settings get() = activityView.settings
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivityView.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivityView.kt
similarity index 92%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivityView.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivityView.kt
index 365c7da98..aedfb0c25 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivityView.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivityView.kt
@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui
+package io.github.lime3ds.android.features.settings.ui
 
-import io.github.lime3ds.features.settings.model.Settings
+import io.github.lime3ds.android.features.settings.model.Settings
 
 /**
  * Abstraction for the Activity that manages SettingsFragments.
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsAdapter.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsAdapter.kt
similarity index 86%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsAdapter.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsAdapter.kt
index afd0389d1..1f80bf408 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsAdapter.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsAdapter.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui
+package io.github.lime3ds.android.features.settings.ui
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -24,42 +24,42 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.slider.Slider
 import com.google.android.material.timepicker.MaterialTimePicker
 import com.google.android.material.timepicker.TimeFormat
-import io.github.lime3ds.R
-import io.github.lime3ds.databinding.DialogSliderBinding
-import io.github.lime3ds.databinding.DialogSoftwareKeyboardBinding
-import io.github.lime3ds.databinding.ListItemSettingBinding
-import io.github.lime3ds.databinding.ListItemSettingSwitchBinding
-import io.github.lime3ds.databinding.ListItemSettingsHeaderBinding
-import io.github.lime3ds.features.settings.model.AbstractBooleanSetting
-import io.github.lime3ds.features.settings.model.AbstractFloatSetting
-import io.github.lime3ds.features.settings.model.AbstractIntSetting
-import io.github.lime3ds.features.settings.model.AbstractSetting
-import io.github.lime3ds.features.settings.model.AbstractStringSetting
-import io.github.lime3ds.features.settings.model.FloatSetting
-import io.github.lime3ds.features.settings.model.ScaledFloatSetting
-import io.github.lime3ds.features.settings.model.AbstractShortSetting
-import io.github.lime3ds.features.settings.model.view.DateTimeSetting
-import io.github.lime3ds.features.settings.model.view.InputBindingSetting
-import io.github.lime3ds.features.settings.model.view.SettingsItem
-import io.github.lime3ds.features.settings.model.view.SingleChoiceSetting
-import io.github.lime3ds.features.settings.model.view.SliderSetting
-import io.github.lime3ds.features.settings.model.view.StringInputSetting
-import io.github.lime3ds.features.settings.model.view.StringSingleChoiceSetting
-import io.github.lime3ds.features.settings.model.view.SubmenuSetting
-import io.github.lime3ds.features.settings.model.view.SwitchSetting
-import io.github.lime3ds.features.settings.ui.viewholder.DateTimeViewHolder
-import io.github.lime3ds.features.settings.ui.viewholder.HeaderViewHolder
-import io.github.lime3ds.features.settings.ui.viewholder.InputBindingSettingViewHolder
-import io.github.lime3ds.features.settings.ui.viewholder.RunnableViewHolder
-import io.github.lime3ds.features.settings.ui.viewholder.SettingViewHolder
-import io.github.lime3ds.features.settings.ui.viewholder.SingleChoiceViewHolder
-import io.github.lime3ds.features.settings.ui.viewholder.SliderViewHolder
-import io.github.lime3ds.features.settings.ui.viewholder.StringInputViewHolder
-import io.github.lime3ds.features.settings.ui.viewholder.SubmenuViewHolder
-import io.github.lime3ds.features.settings.ui.viewholder.SwitchSettingViewHolder
-import io.github.lime3ds.fragments.MessageDialogFragment
-import io.github.lime3ds.fragments.MotionBottomSheetDialogFragment
-import io.github.lime3ds.utils.SystemSaveGame
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.databinding.DialogSliderBinding
+import io.github.lime3ds.android.databinding.DialogSoftwareKeyboardBinding
+import io.github.lime3ds.android.databinding.ListItemSettingBinding
+import io.github.lime3ds.android.databinding.ListItemSettingSwitchBinding
+import io.github.lime3ds.android.databinding.ListItemSettingsHeaderBinding
+import io.github.lime3ds.android.features.settings.model.AbstractBooleanSetting
+import io.github.lime3ds.android.features.settings.model.AbstractFloatSetting
+import io.github.lime3ds.android.features.settings.model.AbstractIntSetting
+import io.github.lime3ds.android.features.settings.model.AbstractSetting
+import io.github.lime3ds.android.features.settings.model.AbstractStringSetting
+import io.github.lime3ds.android.features.settings.model.FloatSetting
+import io.github.lime3ds.android.features.settings.model.ScaledFloatSetting
+import io.github.lime3ds.android.features.settings.model.AbstractShortSetting
+import io.github.lime3ds.android.features.settings.model.view.DateTimeSetting
+import io.github.lime3ds.android.features.settings.model.view.InputBindingSetting
+import io.github.lime3ds.android.features.settings.model.view.SettingsItem
+import io.github.lime3ds.android.features.settings.model.view.SingleChoiceSetting
+import io.github.lime3ds.android.features.settings.model.view.SliderSetting
+import io.github.lime3ds.android.features.settings.model.view.StringInputSetting
+import io.github.lime3ds.android.features.settings.model.view.StringSingleChoiceSetting
+import io.github.lime3ds.android.features.settings.model.view.SubmenuSetting
+import io.github.lime3ds.android.features.settings.model.view.SwitchSetting
+import io.github.lime3ds.android.features.settings.ui.viewholder.DateTimeViewHolder
+import io.github.lime3ds.android.features.settings.ui.viewholder.HeaderViewHolder
+import io.github.lime3ds.android.features.settings.ui.viewholder.InputBindingSettingViewHolder
+import io.github.lime3ds.android.features.settings.ui.viewholder.RunnableViewHolder
+import io.github.lime3ds.android.features.settings.ui.viewholder.SettingViewHolder
+import io.github.lime3ds.android.features.settings.ui.viewholder.SingleChoiceViewHolder
+import io.github.lime3ds.android.features.settings.ui.viewholder.SliderViewHolder
+import io.github.lime3ds.android.features.settings.ui.viewholder.StringInputViewHolder
+import io.github.lime3ds.android.features.settings.ui.viewholder.SubmenuViewHolder
+import io.github.lime3ds.android.features.settings.ui.viewholder.SwitchSettingViewHolder
+import io.github.lime3ds.android.fragments.MessageDialogFragment
+import io.github.lime3ds.android.fragments.MotionBottomSheetDialogFragment
+import io.github.lime3ds.android.utils.SystemSaveGame
 import java.lang.IllegalStateException
 import java.lang.NumberFormatException
 import java.text.SimpleDateFormat
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsFragment.kt
similarity index 93%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsFragment.kt
index d8f376f83..1c28a6dc6 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui
+package io.github.lime3ds.android.features.settings.ui
 
 import android.content.Context
 import android.os.Bundle
@@ -15,9 +15,9 @@ import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.divider.MaterialDividerItemDecoration
-import io.github.lime3ds.databinding.FragmentSettingsBinding
-import io.github.lime3ds.features.settings.model.AbstractSetting
-import io.github.lime3ds.features.settings.model.view.SettingsItem
+import io.github.lime3ds.android.databinding.FragmentSettingsBinding
+import io.github.lime3ds.android.features.settings.model.AbstractSetting
+import io.github.lime3ds.android.features.settings.model.view.SettingsItem
 
 class SettingsFragment : Fragment(), SettingsFragmentView {
     override var activityView: SettingsActivityView? = null
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsFragmentPresenter.kt
similarity index 95%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragmentPresenter.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsFragmentPresenter.kt
index ac2a07b45..cb4f33152 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragmentPresenter.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsFragmentPresenter.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui
+package io.github.lime3ds.android.features.settings.ui
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -12,35 +12,35 @@ import android.hardware.camera2.CameraManager
 import android.os.Build
 import android.text.TextUtils
 import androidx.preference.PreferenceManager
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.R
-import io.github.lime3ds.features.settings.model.AbstractBooleanSetting
-import io.github.lime3ds.features.settings.model.AbstractIntSetting
-import io.github.lime3ds.features.settings.model.AbstractSetting
-import io.github.lime3ds.features.settings.model.AbstractStringSetting
-import io.github.lime3ds.features.settings.model.BooleanSetting
-import io.github.lime3ds.features.settings.model.IntSetting
-import io.github.lime3ds.features.settings.model.ScaledFloatSetting
-import io.github.lime3ds.features.settings.model.Settings
-import io.github.lime3ds.features.settings.model.StringSetting
-import io.github.lime3ds.features.settings.model.AbstractShortSetting
-import io.github.lime3ds.features.settings.model.view.DateTimeSetting
-import io.github.lime3ds.features.settings.model.view.HeaderSetting
-import io.github.lime3ds.features.settings.model.view.InputBindingSetting
-import io.github.lime3ds.features.settings.model.view.RunnableSetting
-import io.github.lime3ds.features.settings.model.view.SettingsItem
-import io.github.lime3ds.features.settings.model.view.SingleChoiceSetting
-import io.github.lime3ds.features.settings.model.view.SliderSetting
-import io.github.lime3ds.features.settings.model.view.StringInputSetting
-import io.github.lime3ds.features.settings.model.view.StringSingleChoiceSetting
-import io.github.lime3ds.features.settings.model.view.SubmenuSetting
-import io.github.lime3ds.features.settings.model.view.SwitchSetting
-import io.github.lime3ds.features.settings.utils.SettingsFile
-import io.github.lime3ds.fragments.ResetSettingsDialogFragment
-import io.github.lime3ds.utils.BirthdayMonth
-import io.github.lime3ds.utils.Log
-import io.github.lime3ds.utils.SystemSaveGame
-import io.github.lime3ds.utils.ThemeUtil
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.features.settings.model.AbstractBooleanSetting
+import io.github.lime3ds.android.features.settings.model.AbstractIntSetting
+import io.github.lime3ds.android.features.settings.model.AbstractSetting
+import io.github.lime3ds.android.features.settings.model.AbstractStringSetting
+import io.github.lime3ds.android.features.settings.model.BooleanSetting
+import io.github.lime3ds.android.features.settings.model.IntSetting
+import io.github.lime3ds.android.features.settings.model.ScaledFloatSetting
+import io.github.lime3ds.android.features.settings.model.Settings
+import io.github.lime3ds.android.features.settings.model.StringSetting
+import io.github.lime3ds.android.features.settings.model.AbstractShortSetting
+import io.github.lime3ds.android.features.settings.model.view.DateTimeSetting
+import io.github.lime3ds.android.features.settings.model.view.HeaderSetting
+import io.github.lime3ds.android.features.settings.model.view.InputBindingSetting
+import io.github.lime3ds.android.features.settings.model.view.RunnableSetting
+import io.github.lime3ds.android.features.settings.model.view.SettingsItem
+import io.github.lime3ds.android.features.settings.model.view.SingleChoiceSetting
+import io.github.lime3ds.android.features.settings.model.view.SliderSetting
+import io.github.lime3ds.android.features.settings.model.view.StringInputSetting
+import io.github.lime3ds.android.features.settings.model.view.StringSingleChoiceSetting
+import io.github.lime3ds.android.features.settings.model.view.SubmenuSetting
+import io.github.lime3ds.android.features.settings.model.view.SwitchSetting
+import io.github.lime3ds.android.features.settings.utils.SettingsFile
+import io.github.lime3ds.android.fragments.ResetSettingsDialogFragment
+import io.github.lime3ds.android.utils.BirthdayMonth
+import io.github.lime3ds.android.utils.Log
+import io.github.lime3ds.android.utils.SystemSaveGame
+import io.github.lime3ds.android.utils.ThemeUtil
 
 class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) {
     private var menuTag: String? = null
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragmentView.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsFragmentView.kt
similarity index 89%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragmentView.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsFragmentView.kt
index 48c780c8b..7340cc091 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragmentView.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsFragmentView.kt
@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui
+package io.github.lime3ds.android.features.settings.ui
 
-import io.github.lime3ds.features.settings.model.AbstractSetting
-import io.github.lime3ds.features.settings.model.view.SettingsItem
+import io.github.lime3ds.android.features.settings.model.AbstractSetting
+import io.github.lime3ds.android.features.settings.model.view.SettingsItem
 
 /**
  * Abstraction for a screen showing a list of settings. Instances of
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/DateTimeViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/DateTimeViewHolder.kt
similarity index 88%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/DateTimeViewHolder.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/DateTimeViewHolder.kt
index bee126ac8..a384fa67b 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/DateTimeViewHolder.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/DateTimeViewHolder.kt
@@ -2,19 +2,19 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui.viewholder
+package io.github.lime3ds.android.features.settings.ui.viewholder
 
 import android.annotation.SuppressLint
 import android.view.View
-import io.github.lime3ds.databinding.ListItemSettingBinding
+import io.github.lime3ds.android.databinding.ListItemSettingBinding
 import java.time.Instant
 import java.time.ZoneId
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
-import io.github.lime3ds.features.settings.model.view.DateTimeSetting
-import io.github.lime3ds.features.settings.model.view.SettingsItem
-import io.github.lime3ds.features.settings.ui.SettingsAdapter
+import io.github.lime3ds.android.features.settings.model.view.DateTimeSetting
+import io.github.lime3ds.android.features.settings.model.view.SettingsItem
+import io.github.lime3ds.android.features.settings.ui.SettingsAdapter
 import java.text.SimpleDateFormat
 
 class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/HeaderViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/HeaderViewHolder.kt
similarity index 68%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/HeaderViewHolder.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/HeaderViewHolder.kt
index 5b12db486..0acae3022 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/HeaderViewHolder.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/HeaderViewHolder.kt
@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui.viewholder
+package io.github.lime3ds.android.features.settings.ui.viewholder
 
 import android.view.View
-import io.github.lime3ds.databinding.ListItemSettingsHeaderBinding
-import io.github.lime3ds.features.settings.model.view.SettingsItem
-import io.github.lime3ds.features.settings.ui.SettingsAdapter
+import io.github.lime3ds.android.databinding.ListItemSettingsHeaderBinding
+import io.github.lime3ds.android.features.settings.model.view.SettingsItem
+import io.github.lime3ds.android.features.settings.ui.SettingsAdapter
 
 class HeaderViewHolder(val binding: ListItemSettingsHeaderBinding, adapter: SettingsAdapter) :
     SettingViewHolder(binding.root, adapter) {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/InputBindingSettingViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/InputBindingSettingViewHolder.kt
similarity index 82%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/InputBindingSettingViewHolder.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/InputBindingSettingViewHolder.kt
index c27836379..4e4895809 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/InputBindingSettingViewHolder.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/InputBindingSettingViewHolder.kt
@@ -2,15 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui.viewholder
+package io.github.lime3ds.android.features.settings.ui.viewholder
 
 import android.view.View
 import androidx.preference.PreferenceManager
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.databinding.ListItemSettingBinding
-import io.github.lime3ds.features.settings.model.view.InputBindingSetting
-import io.github.lime3ds.features.settings.model.view.SettingsItem
-import io.github.lime3ds.features.settings.ui.SettingsAdapter
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.databinding.ListItemSettingBinding
+import io.github.lime3ds.android.features.settings.model.view.InputBindingSetting
+import io.github.lime3ds.android.features.settings.model.view.SettingsItem
+import io.github.lime3ds.android.features.settings.ui.SettingsAdapter
 
 class InputBindingSettingViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :
     SettingViewHolder(binding.root, adapter) {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/RunnableViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/RunnableViewHolder.kt
similarity index 80%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/RunnableViewHolder.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/RunnableViewHolder.kt
index 6a8ba59b5..5066e1bd8 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/RunnableViewHolder.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/RunnableViewHolder.kt
@@ -2,14 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui.viewholder
+package io.github.lime3ds.android.features.settings.ui.viewholder
 
 import android.view.View
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.databinding.ListItemSettingBinding
-import io.github.lime3ds.features.settings.model.view.RunnableSetting
-import io.github.lime3ds.features.settings.model.view.SettingsItem
-import io.github.lime3ds.features.settings.ui.SettingsAdapter
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.databinding.ListItemSettingBinding
+import io.github.lime3ds.android.features.settings.model.view.RunnableSetting
+import io.github.lime3ds.android.features.settings.model.view.SettingsItem
+import io.github.lime3ds.android.features.settings.ui.SettingsAdapter
 
 class RunnableViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :
     SettingViewHolder(binding.root, adapter) {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SettingViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/SettingViewHolder.kt
similarity index 83%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SettingViewHolder.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/SettingViewHolder.kt
index 10926c8e2..0b3cf4eda 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SettingViewHolder.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/SettingViewHolder.kt
@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui.viewholder
+package io.github.lime3ds.android.features.settings.ui.viewholder
 
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
-import io.github.lime3ds.features.settings.model.view.SettingsItem
-import io.github.lime3ds.features.settings.ui.SettingsAdapter
+import io.github.lime3ds.android.features.settings.model.view.SettingsItem
+import io.github.lime3ds.android.features.settings.ui.SettingsAdapter
 
 abstract class SettingViewHolder(itemView: View, protected val adapter: SettingsAdapter) :
     RecyclerView.ViewHolder(itemView), View.OnClickListener, View.OnLongClickListener {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SingleChoiceViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/SingleChoiceViewHolder.kt
similarity index 86%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SingleChoiceViewHolder.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/SingleChoiceViewHolder.kt
index 169e6ed71..67c105894 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SingleChoiceViewHolder.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/SingleChoiceViewHolder.kt
@@ -2,14 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui.viewholder
+package io.github.lime3ds.android.features.settings.ui.viewholder
 
 import android.view.View
-import io.github.lime3ds.databinding.ListItemSettingBinding
-import io.github.lime3ds.features.settings.model.view.SettingsItem
-import io.github.lime3ds.features.settings.model.view.SingleChoiceSetting
-import io.github.lime3ds.features.settings.model.view.StringSingleChoiceSetting
-import io.github.lime3ds.features.settings.ui.SettingsAdapter
+import io.github.lime3ds.android.databinding.ListItemSettingBinding
+import io.github.lime3ds.android.features.settings.model.view.SettingsItem
+import io.github.lime3ds.android.features.settings.model.view.SingleChoiceSetting
+import io.github.lime3ds.android.features.settings.model.view.StringSingleChoiceSetting
+import io.github.lime3ds.android.features.settings.ui.SettingsAdapter
 
 class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :
     SettingViewHolder(binding.root, adapter) {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SliderViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/SliderViewHolder.kt
similarity index 76%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SliderViewHolder.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/SliderViewHolder.kt
index 4f31dfaef..728258c7a 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SliderViewHolder.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/SliderViewHolder.kt
@@ -2,17 +2,17 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui.viewholder
+package io.github.lime3ds.android.features.settings.ui.viewholder
 
 import android.view.View
-import io.github.lime3ds.databinding.ListItemSettingBinding
-import io.github.lime3ds.features.settings.model.AbstractFloatSetting
-import io.github.lime3ds.features.settings.model.AbstractIntSetting
-import io.github.lime3ds.features.settings.model.FloatSetting
-import io.github.lime3ds.features.settings.model.ScaledFloatSetting
-import io.github.lime3ds.features.settings.model.view.SettingsItem
-import io.github.lime3ds.features.settings.model.view.SliderSetting
-import io.github.lime3ds.features.settings.ui.SettingsAdapter
+import io.github.lime3ds.android.databinding.ListItemSettingBinding
+import io.github.lime3ds.android.features.settings.model.AbstractFloatSetting
+import io.github.lime3ds.android.features.settings.model.AbstractIntSetting
+import io.github.lime3ds.android.features.settings.model.FloatSetting
+import io.github.lime3ds.android.features.settings.model.ScaledFloatSetting
+import io.github.lime3ds.android.features.settings.model.view.SettingsItem
+import io.github.lime3ds.android.features.settings.model.view.SliderSetting
+import io.github.lime3ds.android.features.settings.ui.SettingsAdapter
 
 class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :
     SettingViewHolder(binding.root, adapter) {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/StringInputViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/StringInputViewHolder.kt
similarity index 79%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/StringInputViewHolder.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/StringInputViewHolder.kt
index 8f87c15a9..262655490 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/StringInputViewHolder.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/StringInputViewHolder.kt
@@ -2,13 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui.viewholder
+package io.github.lime3ds.android.features.settings.ui.viewholder
 
 import android.view.View
-import io.github.lime3ds.databinding.ListItemSettingBinding
-import io.github.lime3ds.features.settings.model.view.SettingsItem
-import io.github.lime3ds.features.settings.model.view.StringInputSetting
-import io.github.lime3ds.features.settings.ui.SettingsAdapter
+import io.github.lime3ds.android.databinding.ListItemSettingBinding
+import io.github.lime3ds.android.features.settings.model.view.SettingsItem
+import io.github.lime3ds.android.features.settings.model.view.StringInputSetting
+import io.github.lime3ds.android.features.settings.ui.SettingsAdapter
 
 class StringInputViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :
     SettingViewHolder(binding.root, adapter) {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SubmenuViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/SubmenuViewHolder.kt
similarity index 72%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SubmenuViewHolder.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/SubmenuViewHolder.kt
index a3eaad96e..f8373091f 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SubmenuViewHolder.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/SubmenuViewHolder.kt
@@ -2,13 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui.viewholder
+package io.github.lime3ds.android.features.settings.ui.viewholder
 
 import android.view.View
-import io.github.lime3ds.databinding.ListItemSettingBinding
-import io.github.lime3ds.features.settings.model.view.SettingsItem
-import io.github.lime3ds.features.settings.model.view.SubmenuSetting
-import io.github.lime3ds.features.settings.ui.SettingsAdapter
+import io.github.lime3ds.android.databinding.ListItemSettingBinding
+import io.github.lime3ds.android.features.settings.model.view.SettingsItem
+import io.github.lime3ds.android.features.settings.model.view.SubmenuSetting
+import io.github.lime3ds.android.features.settings.ui.SettingsAdapter
 
 class SubmenuViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :
     SettingViewHolder(binding.root, adapter) {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SwitchSettingViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/SwitchSettingViewHolder.kt
similarity index 84%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SwitchSettingViewHolder.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/SwitchSettingViewHolder.kt
index b026d76e0..e4d099beb 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SwitchSettingViewHolder.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/viewholder/SwitchSettingViewHolder.kt
@@ -2,14 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.ui.viewholder
+package io.github.lime3ds.android.features.settings.ui.viewholder
 
 import android.view.View
 import android.widget.CompoundButton
-import io.github.lime3ds.databinding.ListItemSettingSwitchBinding
-import io.github.lime3ds.features.settings.model.view.SettingsItem
-import io.github.lime3ds.features.settings.model.view.SwitchSetting
-import io.github.lime3ds.features.settings.ui.SettingsAdapter
+import io.github.lime3ds.android.databinding.ListItemSettingSwitchBinding
+import io.github.lime3ds.android.features.settings.model.view.SettingsItem
+import io.github.lime3ds.android.features.settings.model.view.SwitchSetting
+import io.github.lime3ds.android.features.settings.ui.SettingsAdapter
 
 class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter: SettingsAdapter) :
     SettingViewHolder(binding.root, adapter) {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/features/settings/utils/SettingsFile.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/utils/SettingsFile.kt
similarity index 90%
rename from src/android/app/src/main/java/io/github/lime3ds/features/settings/utils/SettingsFile.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/features/settings/utils/SettingsFile.kt
index 22f7d39ad..f420c3213 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/features/settings/utils/SettingsFile.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/utils/SettingsFile.kt
@@ -2,25 +2,25 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.features.settings.utils
+package io.github.lime3ds.android.features.settings.utils
 
 import android.content.Context
 import android.net.Uri
 import androidx.documentfile.provider.DocumentFile
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.R
-import io.github.lime3ds.features.settings.model.AbstractSetting
-import io.github.lime3ds.features.settings.model.BooleanSetting
-import io.github.lime3ds.features.settings.model.FloatSetting
-import io.github.lime3ds.features.settings.model.IntSetting
-import io.github.lime3ds.features.settings.model.ScaledFloatSetting
-import io.github.lime3ds.features.settings.model.SettingSection
-import io.github.lime3ds.features.settings.model.Settings.SettingsSectionMap
-import io.github.lime3ds.features.settings.model.StringSetting
-import io.github.lime3ds.features.settings.ui.SettingsActivityView
-import io.github.lime3ds.utils.BiMap
-import io.github.lime3ds.utils.DirectoryInitialization.userDirectory
-import io.github.lime3ds.utils.Log
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.features.settings.model.AbstractSetting
+import io.github.lime3ds.android.features.settings.model.BooleanSetting
+import io.github.lime3ds.android.features.settings.model.FloatSetting
+import io.github.lime3ds.android.features.settings.model.IntSetting
+import io.github.lime3ds.android.features.settings.model.ScaledFloatSetting
+import io.github.lime3ds.android.features.settings.model.SettingSection
+import io.github.lime3ds.android.features.settings.model.Settings.SettingsSectionMap
+import io.github.lime3ds.android.features.settings.model.StringSetting
+import io.github.lime3ds.android.features.settings.ui.SettingsActivityView
+import io.github.lime3ds.android.utils.BiMap
+import io.github.lime3ds.android.utils.DirectoryInitialization.userDirectory
+import io.github.lime3ds.android.utils.Log
 import org.ini4j.Wini
 import java.io.BufferedReader
 import java.io.FileNotFoundException
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/AboutFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/AboutFragment.kt
similarity index 94%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/AboutFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/AboutFragment.kt
index f2d49461d..6aacececa 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/AboutFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/AboutFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -23,10 +23,10 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.findNavController
 import com.google.android.material.transition.MaterialSharedAxis
-import io.github.lime3ds.BuildConfig
-import io.github.lime3ds.R
-import io.github.lime3ds.databinding.FragmentAboutBinding
-import io.github.lime3ds.viewmodel.HomeViewModel
+import io.github.lime3ds.android.BuildConfig
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.databinding.FragmentAboutBinding
+import io.github.lime3ds.android.viewmodel.HomeViewModel
 
 class AboutFragment : Fragment() {
     private var _binding: FragmentAboutBinding? = null
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/CitraDirectoryDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/CitraDirectoryDialogFragment.kt
similarity index 90%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/CitraDirectoryDialogFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/CitraDirectoryDialogFragment.kt
index 49db104cb..35d16f115 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/CitraDirectoryDialogFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/CitraDirectoryDialogFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.app.Dialog
 import android.content.DialogInterface
@@ -14,11 +14,11 @@ import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.ViewModelProvider
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import io.github.lime3ds.R
-import io.github.lime3ds.databinding.DialogCitraDirectoryBinding
-import io.github.lime3ds.ui.main.MainActivity
-import io.github.lime3ds.utils.PermissionsHandler
-import io.github.lime3ds.viewmodel.HomeViewModel
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.databinding.DialogCitraDirectoryBinding
+import io.github.lime3ds.android.ui.main.MainActivity
+import io.github.lime3ds.android.utils.PermissionsHandler
+import io.github.lime3ds.android.viewmodel.HomeViewModel
 
 class CitraDirectoryDialogFragment : DialogFragment() {
     private lateinit var binding: DialogCitraDirectoryBinding
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/CopyDirProgressDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/CopyDirProgressDialogFragment.kt
similarity index 91%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/CopyDirProgressDialogFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/CopyDirProgressDialogFragment.kt
index 8ac00f6fa..277d22c45 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/CopyDirProgressDialogFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/CopyDirProgressDialogFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.app.Dialog
 import android.net.Uri
@@ -23,14 +23,14 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.R
-import io.github.lime3ds.databinding.DialogCopyDirBinding
-import io.github.lime3ds.model.SetupCallback
-import io.github.lime3ds.utils.CitraDirectoryHelper
-import io.github.lime3ds.utils.FileUtil
-import io.github.lime3ds.utils.PermissionsHandler
-import io.github.lime3ds.viewmodel.HomeViewModel
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.databinding.DialogCopyDirBinding
+import io.github.lime3ds.android.model.SetupCallback
+import io.github.lime3ds.android.utils.CitraDirectoryHelper
+import io.github.lime3ds.android.utils.FileUtil
+import io.github.lime3ds.android.utils.PermissionsHandler
+import io.github.lime3ds.android.viewmodel.HomeViewModel
 
 class CopyDirProgressDialog : DialogFragment() {
     private var _binding: DialogCopyDirBinding? = null
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/DownloadSystemFilesDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/DownloadSystemFilesDialogFragment.kt
similarity index 94%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/DownloadSystemFilesDialogFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/DownloadSystemFilesDialogFragment.kt
index b82b65bd1..a417dae8b 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/DownloadSystemFilesDialogFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/DownloadSystemFilesDialogFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.app.Dialog
 import android.os.Bundle
@@ -19,11 +19,11 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import io.github.lime3ds.NativeLibrary.InstallStatus
-import io.github.lime3ds.R
-import io.github.lime3ds.databinding.DialogProgressBarBinding
-import io.github.lime3ds.viewmodel.GamesViewModel
-import io.github.lime3ds.viewmodel.SystemFilesViewModel
+import io.github.lime3ds.android.NativeLibrary.InstallStatus
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.databinding.DialogProgressBarBinding
+import io.github.lime3ds.android.viewmodel.GamesViewModel
+import io.github.lime3ds.android.viewmodel.SystemFilesViewModel
 
 class DownloadSystemFilesDialogFragment : DialogFragment() {
     private var _binding: DialogProgressBarBinding? = null
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/DriverManagerFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/DriverManagerFragment.kt
similarity index 93%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/DriverManagerFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/DriverManagerFragment.kt
index 8f344cdb5..9accb3c90 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/DriverManagerFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/DriverManagerFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -21,14 +21,14 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.transition.MaterialSharedAxis
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import io.github.lime3ds.R
-import io.github.lime3ds.adapters.DriverAdapter
-import io.github.lime3ds.databinding.FragmentDriverManagerBinding
-import io.github.lime3ds.utils.FileUtil.asDocumentFile
-import io.github.lime3ds.utils.FileUtil.inputStream
-import io.github.lime3ds.utils.GpuDriverHelper
-import io.github.lime3ds.viewmodel.HomeViewModel
-import io.github.lime3ds.viewmodel.DriverViewModel
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.adapters.DriverAdapter
+import io.github.lime3ds.android.databinding.FragmentDriverManagerBinding
+import io.github.lime3ds.android.utils.FileUtil.asDocumentFile
+import io.github.lime3ds.android.utils.FileUtil.inputStream
+import io.github.lime3ds.android.utils.GpuDriverHelper
+import io.github.lime3ds.android.viewmodel.HomeViewModel
+import io.github.lime3ds.android.viewmodel.DriverViewModel
 import java.io.IOException
 
 class DriverManagerFragment : Fragment() {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/DriversLoadingDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/DriversLoadingDialogFragment.kt
similarity index 91%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/DriversLoadingDialogFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/DriversLoadingDialogFragment.kt
index 86b63c38b..558a65bee 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/DriversLoadingDialogFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/DriversLoadingDialogFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.app.Dialog
 import android.os.Bundle
@@ -16,9 +16,9 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.launch
-import io.github.lime3ds.R
-import io.github.lime3ds.databinding.DialogProgressBarBinding
-import io.github.lime3ds.viewmodel.DriverViewModel
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.databinding.DialogProgressBarBinding
+import io.github.lime3ds.android.viewmodel.DriverViewModel
 
 class DriversLoadingDialogFragment : DialogFragment() {
     private val driverViewModel: DriverViewModel by activityViewModels()
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/EmulationFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/EmulationFragment.kt
similarity index 96%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/EmulationFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/EmulationFragment.kt
index 7dd0f8378..0f3d77da6 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/EmulationFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -43,30 +43,30 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.slider.Slider
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.EmulationNavigationDirections
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.R
-import io.github.lime3ds.activities.EmulationActivity
-import io.github.lime3ds.databinding.DialogCheckboxBinding
-import io.github.lime3ds.databinding.DialogSliderBinding
-import io.github.lime3ds.databinding.FragmentEmulationBinding
-import io.github.lime3ds.display.ScreenAdjustmentUtil
-import io.github.lime3ds.display.ScreenLayout
-import io.github.lime3ds.features.settings.model.SettingsViewModel
-import io.github.lime3ds.features.settings.ui.SettingsActivity
-import io.github.lime3ds.features.settings.utils.SettingsFile
-import io.github.lime3ds.model.Game
-import io.github.lime3ds.utils.DirectoryInitialization
-import io.github.lime3ds.utils.DirectoryInitialization.DirectoryInitializationState
-import io.github.lime3ds.utils.EmulationMenuSettings
-import io.github.lime3ds.utils.FileUtil
-import io.github.lime3ds.utils.GameHelper
-import io.github.lime3ds.utils.GameIconUtils
-import io.github.lime3ds.utils.EmulationLifecycleUtil
-import io.github.lime3ds.utils.Log
-import io.github.lime3ds.utils.ViewUtils
-import io.github.lime3ds.viewmodel.EmulationViewModel
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.EmulationNavigationDirections
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.activities.EmulationActivity
+import io.github.lime3ds.android.databinding.DialogCheckboxBinding
+import io.github.lime3ds.android.databinding.DialogSliderBinding
+import io.github.lime3ds.android.databinding.FragmentEmulationBinding
+import io.github.lime3ds.android.display.ScreenAdjustmentUtil
+import io.github.lime3ds.android.display.ScreenLayout
+import io.github.lime3ds.android.features.settings.model.SettingsViewModel
+import io.github.lime3ds.android.features.settings.ui.SettingsActivity
+import io.github.lime3ds.android.features.settings.utils.SettingsFile
+import io.github.lime3ds.android.model.Game
+import io.github.lime3ds.android.utils.DirectoryInitialization
+import io.github.lime3ds.android.utils.DirectoryInitialization.DirectoryInitializationState
+import io.github.lime3ds.android.utils.EmulationMenuSettings
+import io.github.lime3ds.android.utils.FileUtil
+import io.github.lime3ds.android.utils.GameHelper
+import io.github.lime3ds.android.utils.GameIconUtils
+import io.github.lime3ds.android.utils.EmulationLifecycleUtil
+import io.github.lime3ds.android.utils.Log
+import io.github.lime3ds.android.utils.ViewUtils
+import io.github.lime3ds.android.viewmodel.EmulationViewModel
 
 class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.FrameCallback {
     private val preferences: SharedPreferences
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/GamesFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/GamesFragment.kt
similarity index 94%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/GamesFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/GamesFragment.kt
index bf5b4fe43..f641594a2 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/GamesFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/GamesFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -25,14 +25,14 @@ import com.google.android.material.color.MaterialColors
 import com.google.android.material.transition.MaterialFadeThrough
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.R
-import io.github.lime3ds.adapters.GameAdapter
-import io.github.lime3ds.databinding.FragmentGamesBinding
-import io.github.lime3ds.features.settings.model.Settings
-import io.github.lime3ds.model.Game
-import io.github.lime3ds.viewmodel.GamesViewModel
-import io.github.lime3ds.viewmodel.HomeViewModel
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.adapters.GameAdapter
+import io.github.lime3ds.android.databinding.FragmentGamesBinding
+import io.github.lime3ds.android.features.settings.model.Settings
+import io.github.lime3ds.android.model.Game
+import io.github.lime3ds.android.viewmodel.GamesViewModel
+import io.github.lime3ds.android.viewmodel.HomeViewModel
 
 class GamesFragment : Fragment() {
     private var _binding: FragmentGamesBinding? = null
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/HomeSettingsFragment.kt
similarity index 91%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/HomeSettingsFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/HomeSettingsFragment.kt
index 2c9bceb0e..1f538db87 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/HomeSettingsFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/HomeSettingsFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.content.Intent
 import android.os.Bundle
@@ -24,21 +24,21 @@ import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.transition.MaterialSharedAxis
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.R
-import io.github.lime3ds.adapters.HomeSettingAdapter
-import io.github.lime3ds.databinding.FragmentHomeSettingsBinding
-import io.github.lime3ds.features.settings.model.Settings
-import io.github.lime3ds.features.settings.ui.SettingsActivity
-import io.github.lime3ds.features.settings.utils.SettingsFile
-import io.github.lime3ds.model.HomeSetting
-import io.github.lime3ds.ui.main.MainActivity
-import io.github.lime3ds.utils.GameHelper
-import io.github.lime3ds.utils.PermissionsHandler
-import io.github.lime3ds.viewmodel.HomeViewModel
-import io.github.lime3ds.utils.GpuDriverHelper
-import io.github.lime3ds.utils.Log
-import io.github.lime3ds.viewmodel.DriverViewModel
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.adapters.HomeSettingAdapter
+import io.github.lime3ds.android.databinding.FragmentHomeSettingsBinding
+import io.github.lime3ds.android.features.settings.model.Settings
+import io.github.lime3ds.android.features.settings.ui.SettingsActivity
+import io.github.lime3ds.android.features.settings.utils.SettingsFile
+import io.github.lime3ds.android.model.HomeSetting
+import io.github.lime3ds.android.ui.main.MainActivity
+import io.github.lime3ds.android.utils.GameHelper
+import io.github.lime3ds.android.utils.PermissionsHandler
+import io.github.lime3ds.android.viewmodel.HomeViewModel
+import io.github.lime3ds.android.utils.GpuDriverHelper
+import io.github.lime3ds.android.utils.Log
+import io.github.lime3ds.android.viewmodel.DriverViewModel
 
 class HomeSettingsFragment : Fragment() {
     private var _binding: FragmentHomeSettingsBinding? = null
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/IndeterminateProgressDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/IndeterminateProgressDialogFragment.kt
similarity index 95%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/IndeterminateProgressDialogFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/IndeterminateProgressDialogFragment.kt
index 28fa020e1..6334b701b 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/IndeterminateProgressDialogFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/IndeterminateProgressDialogFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.app.Dialog
 import android.os.Bundle
@@ -20,9 +20,9 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.launch
-import io.github.lime3ds.R
-import io.github.lime3ds.databinding.DialogProgressBarBinding
-import io.github.lime3ds.viewmodel.TaskViewModel
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.databinding.DialogProgressBarBinding
+import io.github.lime3ds.android.viewmodel.TaskViewModel
 
 class IndeterminateProgressDialogFragment : DialogFragment() {
     private val taskViewModel: TaskViewModel by activityViewModels()
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/KeyboardDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/KeyboardDialogFragment.kt
similarity index 94%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/KeyboardDialogFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/KeyboardDialogFragment.kt
index 2823bfea0..08bad12c3 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/KeyboardDialogFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/KeyboardDialogFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.app.Dialog
 import android.content.DialogInterface
@@ -10,10 +10,10 @@ import android.os.Bundle
 import android.text.InputFilter
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import io.github.lime3ds.R
-import io.github.lime3ds.applets.SoftwareKeyboard
-import io.github.lime3ds.databinding.DialogSoftwareKeyboardBinding
-import io.github.lime3ds.utils.SerializableHelper.serializable
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.applets.SoftwareKeyboard
+import io.github.lime3ds.android.databinding.DialogSoftwareKeyboardBinding
+import io.github.lime3ds.android.utils.SerializableHelper.serializable
 
 class KeyboardDialogFragment : DialogFragment() {
     private lateinit var config: SoftwareKeyboard.KeyboardConfig
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/LicenseBottomSheetDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/LicenseBottomSheetDialogFragment.kt
similarity index 90%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/LicenseBottomSheetDialogFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/LicenseBottomSheetDialogFragment.kt
index 58d2c7fc1..382058981 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/LicenseBottomSheetDialogFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/LicenseBottomSheetDialogFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,9 +10,9 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import io.github.lime3ds.databinding.DialogLicenseBinding
-import io.github.lime3ds.model.License
-import io.github.lime3ds.utils.SerializableHelper.parcelable
+import io.github.lime3ds.android.databinding.DialogLicenseBinding
+import io.github.lime3ds.android.model.License
+import io.github.lime3ds.android.utils.SerializableHelper.parcelable
 
 class LicenseBottomSheetDialogFragment : BottomSheetDialogFragment() {
     private var _binding: DialogLicenseBinding? = null
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/LicensesFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/LicensesFragment.kt
similarity index 96%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/LicensesFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/LicensesFragment.kt
index 1c1c548b5..a6f59cb9f 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/LicensesFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/LicensesFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -18,11 +18,11 @@ import androidx.fragment.app.activityViewModels
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.transition.MaterialSharedAxis
-import io.github.lime3ds.R
-import io.github.lime3ds.adapters.LicenseAdapter
-import io.github.lime3ds.databinding.FragmentLicensesBinding
-import io.github.lime3ds.model.License
-import io.github.lime3ds.viewmodel.HomeViewModel
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.adapters.LicenseAdapter
+import io.github.lime3ds.android.databinding.FragmentLicensesBinding
+import io.github.lime3ds.android.model.License
+import io.github.lime3ds.android.viewmodel.HomeViewModel
 
 class LicensesFragment : Fragment() {
     private var _binding: FragmentLicensesBinding? = null
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/MessageDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/MessageDialogFragment.kt
similarity index 97%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/MessageDialogFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/MessageDialogFragment.kt
index 0b58b9c2e..a76fc431b 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/MessageDialogFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/MessageDialogFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.app.Dialog
 import android.content.Intent
@@ -10,7 +10,7 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import io.github.lime3ds.R
+import io.github.lime3ds.android.R
 
 class MessageDialogFragment : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/MiiSelectorDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/MiiSelectorDialogFragment.kt
similarity index 92%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/MiiSelectorDialogFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/MiiSelectorDialogFragment.kt
index e56e5a2cc..b20465723 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/MiiSelectorDialogFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/MiiSelectorDialogFragment.kt
@@ -2,16 +2,16 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import io.github.lime3ds.R
-import io.github.lime3ds.applets.MiiSelector
-import io.github.lime3ds.utils.SerializableHelper.serializable
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.applets.MiiSelector
+import io.github.lime3ds.android.utils.SerializableHelper.serializable
 
 class MiiSelectorDialogFragment : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/MotionBottomSheetDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/MotionBottomSheetDialogFragment.kt
similarity index 96%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/MotionBottomSheetDialogFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/MotionBottomSheetDialogFragment.kt
index 3c026784c..b01111e93 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/MotionBottomSheetDialogFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/MotionBottomSheetDialogFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.content.DialogInterface
 import android.os.Bundle
@@ -14,10 +14,10 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import io.github.lime3ds.R
-import io.github.lime3ds.databinding.DialogInputBinding
-import io.github.lime3ds.features.settings.model.view.InputBindingSetting
-import io.github.lime3ds.utils.Log
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.databinding.DialogInputBinding
+import io.github.lime3ds.android.features.settings.model.view.InputBindingSetting
+import io.github.lime3ds.android.utils.Log
 import kotlin.math.abs
 
 class MotionBottomSheetDialogFragment : BottomSheetDialogFragment() {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/ResetSettingsDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/ResetSettingsDialogFragment.kt
similarity index 86%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/ResetSettingsDialogFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/ResetSettingsDialogFragment.kt
index 956e891d2..5de608f2e 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/ResetSettingsDialogFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/ResetSettingsDialogFragment.kt
@@ -2,14 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.app.Dialog
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import io.github.lime3ds.R
-import io.github.lime3ds.features.settings.ui.SettingsActivity
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.features.settings.ui.SettingsActivity
 
 class ResetSettingsDialogFragment : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/SearchFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SearchFragment.kt
similarity index 96%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/SearchFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/SearchFragment.kt
index 90974b997..fa633d85c 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/SearchFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SearchFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -27,13 +27,13 @@ import androidx.recyclerview.widget.GridLayoutManager
 import info.debatty.java.stringsimilarity.Jaccard
 import info.debatty.java.stringsimilarity.JaroWinkler
 import kotlinx.coroutines.launch
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.R
-import io.github.lime3ds.adapters.GameAdapter
-import io.github.lime3ds.databinding.FragmentSearchBinding
-import io.github.lime3ds.model.Game
-import io.github.lime3ds.viewmodel.GamesViewModel
-import io.github.lime3ds.viewmodel.HomeViewModel
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.adapters.GameAdapter
+import io.github.lime3ds.android.databinding.FragmentSearchBinding
+import io.github.lime3ds.android.model.Game
+import io.github.lime3ds.android.viewmodel.GamesViewModel
+import io.github.lime3ds.android.viewmodel.HomeViewModel
 import java.time.temporal.ChronoField
 import java.util.Locale
 
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/SelectUserDirectoryDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SelectUserDirectoryDialogFragment.kt
similarity index 88%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/SelectUserDirectoryDialogFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/SelectUserDirectoryDialogFragment.kt
index 582900edd..873bd9a09 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/SelectUserDirectoryDialogFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SelectUserDirectoryDialogFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.app.Dialog
 import android.content.DialogInterface
@@ -11,9 +11,9 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.ViewModelProvider
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import io.github.lime3ds.R
-import io.github.lime3ds.ui.main.MainActivity
-import io.github.lime3ds.viewmodel.HomeViewModel
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.ui.main.MainActivity
+import io.github.lime3ds.android.viewmodel.HomeViewModel
 
 class SelectUserDirectoryDialogFragment : DialogFragment() {
     private lateinit var mainActivity: MainActivity
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/SetupFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SetupFragment.kt
similarity index 95%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/SetupFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/SetupFragment.kt
index a7cde27ad..71340a2cb 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/SetupFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SetupFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.Manifest
 import android.content.Intent
@@ -30,21 +30,21 @@ import androidx.preference.PreferenceManager
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.transition.MaterialFadeThrough
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.R
-import io.github.lime3ds.adapters.SetupAdapter
-import io.github.lime3ds.databinding.FragmentSetupBinding
-import io.github.lime3ds.features.settings.model.Settings
-import io.github.lime3ds.model.SetupCallback
-import io.github.lime3ds.model.SetupPage
-import io.github.lime3ds.model.StepState
-import io.github.lime3ds.ui.main.MainActivity
-import io.github.lime3ds.utils.CitraDirectoryHelper
-import io.github.lime3ds.utils.GameHelper
-import io.github.lime3ds.utils.PermissionsHandler
-import io.github.lime3ds.utils.ViewUtils
-import io.github.lime3ds.viewmodel.GamesViewModel
-import io.github.lime3ds.viewmodel.HomeViewModel
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.adapters.SetupAdapter
+import io.github.lime3ds.android.databinding.FragmentSetupBinding
+import io.github.lime3ds.android.features.settings.model.Settings
+import io.github.lime3ds.android.model.SetupCallback
+import io.github.lime3ds.android.model.SetupPage
+import io.github.lime3ds.android.model.StepState
+import io.github.lime3ds.android.ui.main.MainActivity
+import io.github.lime3ds.android.utils.CitraDirectoryHelper
+import io.github.lime3ds.android.utils.GameHelper
+import io.github.lime3ds.android.utils.PermissionsHandler
+import io.github.lime3ds.android.utils.ViewUtils
+import io.github.lime3ds.android.viewmodel.GamesViewModel
+import io.github.lime3ds.android.viewmodel.HomeViewModel
 
 class SetupFragment : Fragment() {
     private var _binding: FragmentSetupBinding? = null
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/SetupWarningDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SetupWarningDialogFragment.kt
similarity index 97%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/SetupWarningDialogFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/SetupWarningDialogFragment.kt
index 7c603652e..a7e6f432d 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/SetupWarningDialogFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SetupWarningDialogFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.app.Dialog
 import android.content.DialogInterface
@@ -11,7 +11,7 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import io.github.lime3ds.R
+import io.github.lime3ds.android.R
 
 class SetupWarningDialogFragment : DialogFragment() {
     private var titleId: Int = 0
diff --git a/src/android/app/src/main/java/io/github/lime3ds/fragments/SystemFilesFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SystemFilesFragment.kt
similarity index 94%
rename from src/android/app/src/main/java/io/github/lime3ds/fragments/SystemFilesFragment.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/SystemFilesFragment.kt
index a4b86c0d1..7e4f68ebc 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/fragments/SystemFilesFragment.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SystemFilesFragment.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.fragments
+package io.github.lime3ds.android.fragments
 
 import android.content.res.Resources
 import android.os.Bundle
@@ -26,18 +26,18 @@ import androidx.preference.PreferenceManager
 import com.google.android.material.textfield.MaterialAutoCompleteTextView
 import com.google.android.material.transition.MaterialSharedAxis
 import kotlinx.coroutines.launch
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.HomeNavigationDirections
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.R
-import io.github.lime3ds.activities.EmulationActivity
-import io.github.lime3ds.databinding.FragmentSystemFilesBinding
-import io.github.lime3ds.features.settings.model.Settings
-import io.github.lime3ds.model.Game
-import io.github.lime3ds.utils.SystemSaveGame
-import io.github.lime3ds.viewmodel.GamesViewModel
-import io.github.lime3ds.viewmodel.HomeViewModel
-import io.github.lime3ds.viewmodel.SystemFilesViewModel
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.HomeNavigationDirections
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.activities.EmulationActivity
+import io.github.lime3ds.android.databinding.FragmentSystemFilesBinding
+import io.github.lime3ds.android.features.settings.model.Settings
+import io.github.lime3ds.android.model.Game
+import io.github.lime3ds.android.utils.SystemSaveGame
+import io.github.lime3ds.android.viewmodel.GamesViewModel
+import io.github.lime3ds.android.viewmodel.HomeViewModel
+import io.github.lime3ds.android.viewmodel.SystemFilesViewModel
 
 class SystemFilesFragment : Fragment() {
     private var _binding: FragmentSystemFilesBinding? = null
diff --git a/src/android/app/src/main/java/io/github/lime3ds/model/CheapDocument.kt b/src/android/app/src/main/java/io/github/lime3ds/android/model/CheapDocument.kt
similarity index 92%
rename from src/android/app/src/main/java/io/github/lime3ds/model/CheapDocument.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/model/CheapDocument.kt
index 2eedce54a..984e54959 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/model/CheapDocument.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/model/CheapDocument.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.model
+package io.github.lime3ds.android.model
 
 import android.net.Uri
 import android.provider.DocumentsContract
diff --git a/src/android/app/src/main/java/io/github/lime3ds/model/Game.kt b/src/android/app/src/main/java/io/github/lime3ds/android/model/Game.kt
similarity index 97%
rename from src/android/app/src/main/java/io/github/lime3ds/model/Game.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/model/Game.kt
index eea6fba72..55a6fdfe4 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/model/Game.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/model/Game.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.model
+package io.github.lime3ds.android.model
 
 import android.os.Parcelable
 import java.util.HashSet
diff --git a/src/android/app/src/main/java/io/github/lime3ds/model/GameInfo.kt b/src/android/app/src/main/java/io/github/lime3ds/android/model/GameInfo.kt
similarity index 94%
rename from src/android/app/src/main/java/io/github/lime3ds/model/GameInfo.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/model/GameInfo.kt
index 3b4410439..dd259625c 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/model/GameInfo.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/model/GameInfo.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.model
+package io.github.lime3ds.android.model
 
 import androidx.annotation.Keep
 import java.io.IOException
diff --git a/src/android/app/src/main/java/io/github/lime3ds/model/HomeSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/model/HomeSetting.kt
similarity index 92%
rename from src/android/app/src/main/java/io/github/lime3ds/model/HomeSetting.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/model/HomeSetting.kt
index 871ed8140..0272e1ca6 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/model/HomeSetting.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/model/HomeSetting.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.model
+package io.github.lime3ds.android.model
 
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
diff --git a/src/android/app/src/main/java/io/github/lime3ds/model/License.kt b/src/android/app/src/main/java/io/github/lime3ds/android/model/License.kt
similarity index 92%
rename from src/android/app/src/main/java/io/github/lime3ds/model/License.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/model/License.kt
index 22cf3bc6c..4b44f3e51 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/model/License.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/model/License.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.model
+package io.github.lime3ds.android.model
 
 import android.os.Parcelable
 import androidx.annotation.StringRes
diff --git a/src/android/app/src/main/java/io/github/lime3ds/model/SetupPage.kt b/src/android/app/src/main/java/io/github/lime3ds/android/model/SetupPage.kt
similarity index 95%
rename from src/android/app/src/main/java/io/github/lime3ds/model/SetupPage.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/model/SetupPage.kt
index cfe2409d1..5d6396bce 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/model/SetupPage.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/model/SetupPage.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.model
+package io.github.lime3ds.android.model
 
 data class SetupPage(
     val iconId: Int,
diff --git a/src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlay.kt b/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlay.kt
similarity index 99%
rename from src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlay.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlay.kt
index 855ccabab..a479d8a8a 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlay.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlay.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.overlay
+package io.github.lime3ds.android.overlay
 
 import android.app.Activity
 import android.content.Context
@@ -21,10 +21,10 @@ import android.view.View
 import android.view.View.OnTouchListener
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.R
-import io.github.lime3ds.utils.EmulationMenuSettings
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.utils.EmulationMenuSettings
 import java.lang.NullPointerException
 import kotlin.math.min
 
diff --git a/src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlayDrawableButton.kt b/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlayDrawableButton.kt
similarity index 97%
rename from src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlayDrawableButton.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlayDrawableButton.kt
index 26f2f7323..5aede6fe7 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlayDrawableButton.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlayDrawableButton.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.overlay
+package io.github.lime3ds.android.overlay
 
 import android.content.res.Resources
 import android.graphics.Bitmap
@@ -10,7 +10,7 @@ import android.graphics.Canvas
 import android.graphics.Rect
 import android.graphics.drawable.BitmapDrawable
 import android.view.MotionEvent
-import io.github.lime3ds.NativeLibrary
+import io.github.lime3ds.android.NativeLibrary
 
 /**
  * Custom [BitmapDrawable] that is capable
diff --git a/src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlayDrawableDpad.kt b/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlayDrawableDpad.kt
similarity index 99%
rename from src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlayDrawableDpad.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlayDrawableDpad.kt
index ef043ea5d..bbebc7500 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlayDrawableDpad.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlayDrawableDpad.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.overlay
+package io.github.lime3ds.android.overlay
 
 import android.content.res.Resources
 import android.graphics.Bitmap
@@ -10,7 +10,7 @@ import android.graphics.Canvas
 import android.graphics.Rect
 import android.graphics.drawable.BitmapDrawable
 import android.view.MotionEvent
-import io.github.lime3ds.NativeLibrary
+import io.github.lime3ds.android.NativeLibrary
 
 /**
  * Custom [BitmapDrawable] that is capable
diff --git a/src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlayDrawableJoystick.kt b/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlayDrawableJoystick.kt
similarity index 98%
rename from src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlayDrawableJoystick.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlayDrawableJoystick.kt
index 2fed6864e..e963ad898 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlayDrawableJoystick.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlayDrawableJoystick.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.overlay
+package io.github.lime3ds.android.overlay
 
 import android.content.res.Resources
 import android.graphics.Bitmap
@@ -10,8 +10,8 @@ import android.graphics.Canvas
 import android.graphics.Rect
 import android.graphics.drawable.BitmapDrawable
 import android.view.MotionEvent
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.utils.EmulationMenuSettings
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.utils.EmulationMenuSettings
 import kotlin.math.atan2
 import kotlin.math.cos
 import kotlin.math.sin
diff --git a/src/android/app/src/main/java/io/github/lime3ds/ui/TwoPaneOnBackPressedCallback.kt b/src/android/app/src/main/java/io/github/lime3ds/android/ui/TwoPaneOnBackPressedCallback.kt
similarity index 97%
rename from src/android/app/src/main/java/io/github/lime3ds/ui/TwoPaneOnBackPressedCallback.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/ui/TwoPaneOnBackPressedCallback.kt
index de07acdcd..1b257ad47 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/ui/TwoPaneOnBackPressedCallback.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/ui/TwoPaneOnBackPressedCallback.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.ui
+package io.github.lime3ds.android.ui
 
 import android.content.Context
 import android.view.View
diff --git a/src/android/app/src/main/java/io/github/lime3ds/ui/main/MainActivity.kt b/src/android/app/src/main/java/io/github/lime3ds/android/ui/main/MainActivity.kt
similarity index 91%
rename from src/android/app/src/main/java/io/github/lime3ds/ui/main/MainActivity.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/ui/main/MainActivity.kt
index 93a8f214a..983c96969 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/ui/main/MainActivity.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/ui/main/MainActivity.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.ui.main
+package io.github.lime3ds.android.ui.main
 
 import android.content.Intent
 import android.net.Uri
@@ -36,24 +36,24 @@ import com.google.android.material.color.MaterialColors
 import com.google.android.material.navigation.NavigationBarView
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
-import io.github.lime3ds.R
-import io.github.lime3ds.activities.EmulationActivity
-import io.github.lime3ds.contracts.OpenFileResultContract
-import io.github.lime3ds.databinding.ActivityMainBinding
-import io.github.lime3ds.features.settings.model.Settings
-import io.github.lime3ds.features.settings.model.SettingsViewModel
-import io.github.lime3ds.features.settings.ui.SettingsActivity
-import io.github.lime3ds.features.settings.utils.SettingsFile
-import io.github.lime3ds.fragments.SelectUserDirectoryDialogFragment
-import io.github.lime3ds.utils.CiaInstallWorker
-import io.github.lime3ds.utils.CitraDirectoryHelper
-import io.github.lime3ds.utils.DirectoryInitialization
-import io.github.lime3ds.utils.FileBrowserHelper
-import io.github.lime3ds.utils.InsetsHelper
-import io.github.lime3ds.utils.PermissionsHandler
-import io.github.lime3ds.utils.ThemeUtil
-import io.github.lime3ds.viewmodel.GamesViewModel
-import io.github.lime3ds.viewmodel.HomeViewModel
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.activities.EmulationActivity
+import io.github.lime3ds.android.contracts.OpenFileResultContract
+import io.github.lime3ds.android.databinding.ActivityMainBinding
+import io.github.lime3ds.android.features.settings.model.Settings
+import io.github.lime3ds.android.features.settings.model.SettingsViewModel
+import io.github.lime3ds.android.features.settings.ui.SettingsActivity
+import io.github.lime3ds.android.features.settings.utils.SettingsFile
+import io.github.lime3ds.android.fragments.SelectUserDirectoryDialogFragment
+import io.github.lime3ds.android.utils.CiaInstallWorker
+import io.github.lime3ds.android.utils.CitraDirectoryHelper
+import io.github.lime3ds.android.utils.DirectoryInitialization
+import io.github.lime3ds.android.utils.FileBrowserHelper
+import io.github.lime3ds.android.utils.InsetsHelper
+import io.github.lime3ds.android.utils.PermissionsHandler
+import io.github.lime3ds.android.utils.ThemeUtil
+import io.github.lime3ds.android.viewmodel.GamesViewModel
+import io.github.lime3ds.android.viewmodel.HomeViewModel
 
 class MainActivity : AppCompatActivity(), ThemeProvider {
     private lateinit var binding: ActivityMainBinding
diff --git a/src/android/app/src/main/java/io/github/lime3ds/ui/main/ThemeProvider.kt b/src/android/app/src/main/java/io/github/lime3ds/android/ui/main/ThemeProvider.kt
similarity index 87%
rename from src/android/app/src/main/java/io/github/lime3ds/ui/main/ThemeProvider.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/ui/main/ThemeProvider.kt
index 9521989a2..06b2d3208 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/ui/main/ThemeProvider.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/ui/main/ThemeProvider.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.ui.main
+package io.github.lime3ds.android.ui.main
 
 interface ThemeProvider {
     /**
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/BiMap.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/BiMap.kt
similarity index 92%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/BiMap.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/BiMap.kt
index f78706651..b8fbdb0c0 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/BiMap.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/BiMap.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 class BiMap<K, V> {
     private val forward: MutableMap<K, V> = HashMap()
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/CiaInstallWorker.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/CiaInstallWorker.kt
similarity index 96%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/CiaInstallWorker.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/CiaInstallWorker.kt
index 34c034580..8828a685b 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/CiaInstallWorker.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/CiaInstallWorker.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.app.NotificationManager
 import android.content.Context
@@ -12,15 +12,15 @@ import androidx.core.app.NotificationCompat
 import androidx.work.ForegroundInfo
 import androidx.work.Worker
 import androidx.work.WorkerParameters
-import io.github.lime3ds.NativeLibrary.InstallStatus
-import io.github.lime3ds.R
-import io.github.lime3ds.utils.FileUtil.getFilename
+import io.github.lime3ds.android.NativeLibrary.InstallStatus
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.utils.FileUtil.getFilename
 
 class CiaInstallWorker(
     val context: Context,
     params: WorkerParameters
 ) : Worker(context, params) {
-    private val GROUP_KEY_CIA_INSTALL_STATUS = "io.github.lime3ds.CIA_INSTALL_STATUS"
+    private val GROUP_KEY_CIA_INSTALL_STATUS = "io.github.lime3ds.android.CIA_INSTALL_STATUS"
     private var lastNotifiedTime: Long = 0
     private val SUMMARY_NOTIFICATION_ID = 0xC1A0000
     private val PROGRESS_NOTIFICATION_ID = SUMMARY_NOTIFICATION_ID + 1
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/CitraDirectoryHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/CitraDirectoryHelper.kt
similarity index 89%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/CitraDirectoryHelper.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/CitraDirectoryHelper.kt
index e62006f79..34307e5a5 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/CitraDirectoryHelper.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/CitraDirectoryHelper.kt
@@ -2,16 +2,16 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.content.Intent
 import android.net.Uri
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.ViewModelProvider
-import io.github.lime3ds.fragments.CitraDirectoryDialogFragment
-import io.github.lime3ds.fragments.CopyDirProgressDialog
-import io.github.lime3ds.model.SetupCallback
-import io.github.lime3ds.viewmodel.HomeViewModel
+import io.github.lime3ds.android.fragments.CitraDirectoryDialogFragment
+import io.github.lime3ds.android.fragments.CopyDirProgressDialog
+import io.github.lime3ds.android.model.SetupCallback
+import io.github.lime3ds.android.viewmodel.HomeViewModel
 
 /**
  * Citra directory initialization ui flow controller.
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/ControllerMappingHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/ControllerMappingHelper.kt
similarity index 98%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/ControllerMappingHelper.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/ControllerMappingHelper.kt
index 4fe86636d..0d54e84b9 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/ControllerMappingHelper.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/ControllerMappingHelper.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.view.InputDevice
 import android.view.KeyEvent
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/DirectoryInitialization.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/DirectoryInitialization.kt
similarity index 95%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/DirectoryInitialization.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/DirectoryInitialization.kt
index 5526cf78d..cf5e8efb2 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/DirectoryInitialization.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/DirectoryInitialization.kt
@@ -2,15 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.content.Context
 import android.net.Uri
 import androidx.preference.PreferenceManager
-import io.github.lime3ds.BuildConfig
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.utils.PermissionsHandler.hasWriteAccess
+import io.github.lime3ds.android.BuildConfig
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.utils.PermissionsHandler.hasWriteAccess
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/DiskShaderCacheProgress.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/DiskShaderCacheProgress.kt
similarity index 87%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/DiskShaderCacheProgress.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/DiskShaderCacheProgress.kt
index 17988d82e..d6673d95e 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/DiskShaderCacheProgress.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/DiskShaderCacheProgress.kt
@@ -2,14 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import androidx.annotation.Keep
 import androidx.lifecycle.ViewModelProvider
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.R
-import io.github.lime3ds.activities.EmulationActivity
-import io.github.lime3ds.viewmodel.EmulationViewModel
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.activities.EmulationActivity
+import io.github.lime3ds.android.viewmodel.EmulationViewModel
 
 @Keep
 object DiskShaderCacheProgress {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/DocumentsTree.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/DocumentsTree.kt
similarity index 98%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/DocumentsTree.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/DocumentsTree.kt
index 7a5a193d8..915fb0480 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/DocumentsTree.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/DocumentsTree.kt
@@ -2,13 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.net.Uri
 import android.provider.DocumentsContract
 import androidx.documentfile.provider.DocumentFile
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.model.CheapDocument
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.model.CheapDocument
 import java.net.URLDecoder
 import java.util.StringTokenizer
 import java.util.concurrent.ConcurrentHashMap
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/EmulationLifecycleUtil.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/EmulationLifecycleUtil.kt
similarity index 94%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/EmulationLifecycleUtil.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/EmulationLifecycleUtil.kt
index 8d8f177c1..a28ddecb2 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/EmulationLifecycleUtil.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/EmulationLifecycleUtil.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 object EmulationLifecycleUtil {
     private var shutdownHooks: MutableList<Runnable> = ArrayList()
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/EmulationMenuSettings.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/EmulationMenuSettings.kt
similarity index 94%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/EmulationMenuSettings.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/EmulationMenuSettings.kt
index 0fdfd4ae8..b7916512b 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/EmulationMenuSettings.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/EmulationMenuSettings.kt
@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.preference.PreferenceManager
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.display.ScreenLayout
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.display.ScreenLayout
 
 object EmulationMenuSettings {
     private val preferences =
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/FileBrowserHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/FileBrowserHelper.kt
similarity index 97%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/FileBrowserHelper.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/FileBrowserHelper.kt
index 4d7163199..561ef3443 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/FileBrowserHelper.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/FileBrowserHelper.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.content.Context
 import android.content.Intent
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/FileUtil.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/FileUtil.kt
similarity index 99%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/FileUtil.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/FileUtil.kt
index c17ac76b9..802d8917e 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/FileUtil.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/FileUtil.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import okio.ByteString.Companion.readByteString
 import android.content.Context
@@ -12,8 +12,8 @@ import android.provider.DocumentsContract
 import android.system.Os
 import android.util.Pair
 import androidx.documentfile.provider.DocumentFile
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.model.CheapDocument
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.model.CheapDocument
 import java.io.BufferedInputStream
 import java.io.File
 import java.io.FileOutputStream
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/ForegroundService.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/ForegroundService.kt
similarity index 94%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/ForegroundService.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/ForegroundService.kt
index 6940c08fd..75ec8355f 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/ForegroundService.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/ForegroundService.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.app.PendingIntent
 import android.app.Service
@@ -10,8 +10,8 @@ import android.content.Intent
 import android.os.IBinder
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import io.github.lime3ds.R
-import io.github.lime3ds.activities.EmulationActivity
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.activities.EmulationActivity
 
 /**
  * A service that shows a permanent notification in the background to avoid the app getting
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/GameHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/GameHelper.kt
similarity index 92%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/GameHelper.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/GameHelper.kt
index 2eba65d3c..fd443c13e 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/GameHelper.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/GameHelper.kt
@@ -2,18 +2,18 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.content.SharedPreferences
 import android.net.Uri
 import androidx.preference.PreferenceManager
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.model.CheapDocument
-import io.github.lime3ds.model.Game
-import io.github.lime3ds.model.GameInfo
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.model.CheapDocument
+import io.github.lime3ds.android.model.Game
+import io.github.lime3ds.android.model.GameInfo
 import java.io.IOException
 
 object GameHelper {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/GameIconUtils.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/GameIconUtils.kt
similarity index 95%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/GameIconUtils.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/GameIconUtils.kt
index e8b3325c2..842df64ca 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/GameIconUtils.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/GameIconUtils.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.graphics.Bitmap
 import android.widget.ImageView
@@ -18,8 +18,8 @@ import coil.memory.MemoryCache
 import coil.request.ImageRequest
 import coil.request.Options
 import coil.transform.RoundedCornersTransformation
-import io.github.lime3ds.R
-import io.github.lime3ds.model.Game
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.model.Game
 import java.nio.IntBuffer
 
 class GameIconFetcher(
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/GpuDriverHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/GpuDriverHelper.kt
similarity index 96%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/GpuDriverHelper.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/GpuDriverHelper.kt
index f292d7b51..7f2ed056a 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/GpuDriverHelper.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/GpuDriverHelper.kt
@@ -2,15 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.net.Uri
 import android.os.Build
 import androidx.documentfile.provider.DocumentFile
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.utils.FileUtil.asDocumentFile
-import io.github.lime3ds.utils.FileUtil.inputStream
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.utils.FileUtil.asDocumentFile
+import io.github.lime3ds.android.utils.FileUtil.inputStream
 import java.io.BufferedInputStream
 import java.io.File
 import java.io.IOException
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/GpuDriverMetadata.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/GpuDriverMetadata.kt
similarity index 98%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/GpuDriverMetadata.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/GpuDriverMetadata.kt
index f0a3a0e85..c26f3d312 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/GpuDriverMetadata.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/GpuDriverMetadata.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import java.io.IOException
 import org.json.JSONException
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/InsetsHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/InsetsHelper.kt
similarity index 94%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/InsetsHelper.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/InsetsHelper.kt
index 0f5205b3d..e6e1af8a7 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/InsetsHelper.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/InsetsHelper.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/Log.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/Log.kt
similarity index 91%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/Log.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/Log.kt
index aefaad1e2..0a15e2cd7 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/Log.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/Log.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 object Log {
     // Tracks whether we should share the old log or the current log
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/MemoryUtil.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/MemoryUtil.kt
similarity index 96%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/MemoryUtil.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/MemoryUtil.kt
index 44c2eb4fe..bed2416ef 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/MemoryUtil.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/MemoryUtil.kt
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.app.ActivityManager
 import android.content.Context
 import android.os.Build
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.R
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.R
 import java.util.Locale
 import kotlin.math.ceil
 
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/PermissionsHandler.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/PermissionsHandler.kt
similarity index 94%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/PermissionsHandler.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/PermissionsHandler.kt
index 32fd1e94b..dd1d072d2 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/PermissionsHandler.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/PermissionsHandler.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.content.Context
 import android.content.Intent
@@ -10,7 +10,7 @@ import android.content.SharedPreferences
 import android.net.Uri
 import androidx.preference.PreferenceManager
 import androidx.documentfile.provider.DocumentFile
-import io.github.lime3ds.LimeApplication
+import io.github.lime3ds.android.LimeApplication
 
 object PermissionsHandler {
     const val CITRA_DIRECTORY = "CITRA_DIRECTORY"
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/SerializableHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/SerializableHelper.kt
similarity index 97%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/SerializableHelper.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/SerializableHelper.kt
index 97bc3d81c..594da2433 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/SerializableHelper.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/SerializableHelper.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.content.Intent
 import android.os.Build
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/SystemSaveGame.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/SystemSaveGame.kt
similarity index 97%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/SystemSaveGame.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/SystemSaveGame.kt
index a53800a19..313dfb732 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/SystemSaveGame.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/SystemSaveGame.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 object SystemSaveGame {
     external fun save()
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/ThemeUtil.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/ThemeUtil.kt
similarity index 93%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/ThemeUtil.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/ThemeUtil.kt
index 446faf555..d696ec1b6 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/ThemeUtil.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/ThemeUtil.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.content.SharedPreferences
 import android.content.res.Configuration
@@ -13,10 +13,10 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.preference.PreferenceManager
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.R
-import io.github.lime3ds.features.settings.model.Settings
-import io.github.lime3ds.ui.main.ThemeProvider
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.features.settings.model.Settings
+import io.github.lime3ds.android.ui.main.ThemeProvider
 import kotlin.math.roundToInt
 
 object ThemeUtil {
diff --git a/src/android/app/src/main/java/io/github/lime3ds/utils/ViewUtils.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/ViewUtils.kt
similarity index 95%
rename from src/android/app/src/main/java/io/github/lime3ds/utils/ViewUtils.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/ViewUtils.kt
index d81ed3415..172591da9 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/utils/ViewUtils.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/ViewUtils.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.utils
+package io.github.lime3ds.android.utils
 
 import android.view.View
 
diff --git a/src/android/app/src/main/java/io/github/lime3ds/viewmodel/DriverViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/DriverViewModel.kt
similarity index 94%
rename from src/android/app/src/main/java/io/github/lime3ds/viewmodel/DriverViewModel.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/DriverViewModel.kt
index 8f27acc9e..af6da7dd3 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/viewmodel/DriverViewModel.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/DriverViewModel.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.viewmodel
+package io.github.lime3ds.android.viewmodel
 
 import android.net.Uri
 import androidx.lifecycle.ViewModel
@@ -13,11 +13,11 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.R
-import io.github.lime3ds.utils.FileUtil.asDocumentFile
-import io.github.lime3ds.utils.GpuDriverMetadata
-import io.github.lime3ds.utils.GpuDriverHelper
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.utils.FileUtil.asDocumentFile
+import io.github.lime3ds.android.utils.GpuDriverMetadata
+import io.github.lime3ds.android.utils.GpuDriverHelper
 
 class DriverViewModel : ViewModel() {
     val areDriversLoading get() = _areDriversLoading.asStateFlow()
diff --git a/src/android/app/src/main/java/io/github/lime3ds/viewmodel/EmulationViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/EmulationViewModel.kt
similarity index 96%
rename from src/android/app/src/main/java/io/github/lime3ds/viewmodel/EmulationViewModel.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/EmulationViewModel.kt
index f515b190d..5891f5f19 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/viewmodel/EmulationViewModel.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/EmulationViewModel.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.viewmodel
+package io.github.lime3ds.android.viewmodel
 
 import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/src/android/app/src/main/java/io/github/lime3ds/viewmodel/GamesViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/GamesViewModel.kt
similarity index 95%
rename from src/android/app/src/main/java/io/github/lime3ds/viewmodel/GamesViewModel.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/GamesViewModel.kt
index 04970b142..8a15a4db2 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/viewmodel/GamesViewModel.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/GamesViewModel.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.viewmodel
+package io.github.lime3ds.android.viewmodel
 
 import android.net.Uri
 import androidx.documentfile.provider.DocumentFile
@@ -17,9 +17,9 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.model.Game
-import io.github.lime3ds.utils.GameHelper
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.model.Game
+import io.github.lime3ds.android.utils.GameHelper
 
 class GamesViewModel : ViewModel() {
     val games get() = _games.asStateFlow()
diff --git a/src/android/app/src/main/java/io/github/lime3ds/viewmodel/HomeViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/HomeViewModel.kt
similarity index 92%
rename from src/android/app/src/main/java/io/github/lime3ds/viewmodel/HomeViewModel.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/HomeViewModel.kt
index 149fe8f3a..546f8a364 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/viewmodel/HomeViewModel.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/HomeViewModel.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.viewmodel
+package io.github.lime3ds.android.viewmodel
 
 import android.content.res.Resources
 import android.net.Uri
@@ -12,11 +12,11 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import io.github.lime3ds.LimeApplication
-import io.github.lime3ds.R
-import io.github.lime3ds.fragments.CitraDirectoryDialogFragment
-import io.github.lime3ds.utils.GameHelper
-import io.github.lime3ds.utils.PermissionsHandler
+import io.github.lime3ds.android.LimeApplication
+import io.github.lime3ds.android.R
+import io.github.lime3ds.android.fragments.CitraDirectoryDialogFragment
+import io.github.lime3ds.android.utils.GameHelper
+import io.github.lime3ds.android.utils.PermissionsHandler
 
 class HomeViewModel : ViewModel() {
     val navigationVisible get() = _navigationVisible.asStateFlow()
diff --git a/src/android/app/src/main/java/io/github/lime3ds/viewmodel/SystemFilesViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/SystemFilesViewModel.kt
similarity index 95%
rename from src/android/app/src/main/java/io/github/lime3ds/viewmodel/SystemFilesViewModel.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/SystemFilesViewModel.kt
index 1b0b34c96..b52889a18 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/viewmodel/SystemFilesViewModel.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/SystemFilesViewModel.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.viewmodel
+package io.github.lime3ds.android.viewmodel
 
 import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.CoroutineScope
@@ -14,9 +14,9 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.yield
-import io.github.lime3ds.NativeLibrary
-import io.github.lime3ds.NativeLibrary.InstallStatus
-import io.github.lime3ds.utils.Log
+import io.github.lime3ds.android.NativeLibrary
+import io.github.lime3ds.android.NativeLibrary.InstallStatus
+import io.github.lime3ds.android.utils.Log
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.coroutines.CoroutineContext
 import kotlin.math.min
diff --git a/src/android/app/src/main/java/io/github/lime3ds/viewmodel/TaskViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/TaskViewModel.kt
similarity index 97%
rename from src/android/app/src/main/java/io/github/lime3ds/viewmodel/TaskViewModel.kt
rename to src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/TaskViewModel.kt
index 3b2919903..99aeb65f2 100644
--- a/src/android/app/src/main/java/io/github/lime3ds/viewmodel/TaskViewModel.kt
+++ b/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/TaskViewModel.kt
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package io.github.lime3ds.viewmodel
+package io.github.lime3ds.android.viewmodel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
diff --git a/src/android/app/src/main/jni/applets/mii_selector.cpp b/src/android/app/src/main/jni/applets/mii_selector.cpp
index 16e95a9b3..409941918 100644
--- a/src/android/app/src/main/jni/applets/mii_selector.cpp
+++ b/src/android/app/src/main/jni/applets/mii_selector.cpp
@@ -66,16 +66,16 @@ void AndroidMiiSelector::Setup(const Frontend::MiiSelectorConfig& config) {
 
 void InitJNI(JNIEnv* env) {
     s_mii_selector_class = reinterpret_cast<jclass>(
-        env->NewGlobalRef(env->FindClass("io/github/lime3ds/applets/MiiSelector")));
+        env->NewGlobalRef(env->FindClass("io/github/lime3ds/android/applets/MiiSelector")));
     s_mii_selector_config_class = reinterpret_cast<jclass>(env->NewGlobalRef(
-        env->FindClass("io/github/lime3ds/applets/MiiSelector$MiiSelectorConfig")));
+        env->FindClass("io/github/lime3ds/android/applets/MiiSelector$MiiSelectorConfig")));
     s_mii_selector_data_class = reinterpret_cast<jclass>(
-        env->NewGlobalRef(env->FindClass("io/github/lime3ds/applets/MiiSelector$MiiSelectorData")));
+        env->NewGlobalRef(env->FindClass("io/github/lime3ds/android/applets/MiiSelector$MiiSelectorData")));
 
     s_mii_selector_execute =
         env->GetStaticMethodID(s_mii_selector_class, "Execute",
-                               "(Lio/github/lime3ds/applets/MiiSelector$MiiSelectorConfig;)Lio/"
-                               "github/lime3ds/applets/MiiSelector$MiiSelectorData;");
+                               "(Lio/github/lime3ds/android/applets/MiiSelector$MiiSelectorConfig;)Lio/"
+                               "github/lime3ds/android/applets/MiiSelector$MiiSelectorData;");
 }
 
 void CleanupJNI(JNIEnv* env) {
diff --git a/src/android/app/src/main/jni/applets/swkbd.cpp b/src/android/app/src/main/jni/applets/swkbd.cpp
index f70b3025c..fa3986fc9 100644
--- a/src/android/app/src/main/jni/applets/swkbd.cpp
+++ b/src/android/app/src/main/jni/applets/swkbd.cpp
@@ -75,17 +75,17 @@ void AndroidKeyboard::ShowError(const std::string& error) {
 
 void InitJNI(JNIEnv* env) {
     s_software_keyboard_class = reinterpret_cast<jclass>(
-        env->NewGlobalRef(env->FindClass("io/github/lime3ds/applets/SoftwareKeyboard")));
+        env->NewGlobalRef(env->FindClass("io/github/lime3ds/android/applets/SoftwareKeyboard")));
     s_keyboard_config_class = reinterpret_cast<jclass>(env->NewGlobalRef(
-        env->FindClass("io/github/lime3ds/applets/SoftwareKeyboard$KeyboardConfig")));
+        env->FindClass("io/github/lime3ds/android/applets/SoftwareKeyboard$KeyboardConfig")));
     s_keyboard_data_class = reinterpret_cast<jclass>(env->NewGlobalRef(
-        env->FindClass("io/github/lime3ds/applets/SoftwareKeyboard$KeyboardData")));
+        env->FindClass("io/github/lime3ds/android/applets/SoftwareKeyboard$KeyboardData")));
     s_validation_error_class = reinterpret_cast<jclass>(env->NewGlobalRef(
-        env->FindClass("io/github/lime3ds/applets/SoftwareKeyboard$ValidationError")));
+        env->FindClass("io/github/lime3ds/android/applets/SoftwareKeyboard$ValidationError")));
 
     s_swkbd_execute = env->GetStaticMethodID(
         s_software_keyboard_class, "Execute",
-        "(Lio/github/lime3ds/applets/SoftwareKeyboard$KeyboardConfig;)Lio/github/lime3ds/"
+        "(Lio/github/lime3ds/android/applets/SoftwareKeyboard$KeyboardConfig;)Lio/github/lime3ds/android/"
         "applets/SoftwareKeyboard$KeyboardData;");
     s_swkbd_show_error =
         env->GetStaticMethodID(s_software_keyboard_class, "ShowError", "(Ljava/lang/String;)V");
@@ -121,10 +121,10 @@ jobject ToJavaValidationError(Frontend::ValidationError error) {
     return env->GetStaticObjectField(
         s_validation_error_class,
         env->GetStaticFieldID(s_validation_error_class, ValidationErrorNameMap.at(error),
-                              "Lio/github/lime3ds/applets/SoftwareKeyboard$ValidationError;"));
+                              "Lio/github/lime3ds/android/applets/SoftwareKeyboard$ValidationError;"));
 }
 
-jobject Java_io_github_lime3ds_applets_SoftwareKeyboard_ValidateFilters(JNIEnv* env, jclass clazz,
+jobject Java_io_github_lime3ds_android_applets_SoftwareKeyboard_ValidateFilters(JNIEnv* env, jclass clazz,
                                                                         jstring text) {
 
     const auto ret =
@@ -132,7 +132,7 @@ jobject Java_io_github_lime3ds_applets_SoftwareKeyboard_ValidateFilters(JNIEnv*
     return ToJavaValidationError(ret);
 }
 
-jobject Java_io_github_lime3ds_applets_SoftwareKeyboard_ValidateInput(JNIEnv* env, jclass clazz,
+jobject Java_io_github_lime3ds_android_applets_SoftwareKeyboard_ValidateInput(JNIEnv* env, jclass clazz,
                                                                       jstring text) {
 
     const auto ret =
diff --git a/src/android/app/src/main/jni/applets/swkbd.h b/src/android/app/src/main/jni/applets/swkbd.h
index f191690fc..cd487bb39 100644
--- a/src/android/app/src/main/jni/applets/swkbd.h
+++ b/src/android/app/src/main/jni/applets/swkbd.h
@@ -27,9 +27,9 @@ void CleanupJNI(JNIEnv* env);
 
 // Native function calls
 extern "C" {
-JNIEXPORT jobject JNICALL Java_io_github_lime3ds_applets_SoftwareKeyboard_ValidateFilters(
+JNIEXPORT jobject JNICALL Java_io_github_lime3ds_android_applets_SoftwareKeyboard_ValidateFilters(
     JNIEnv* env, jclass clazz, jstring text);
 
-JNIEXPORT jobject JNICALL Java_io_github_lime3ds_applets_SoftwareKeyboard_ValidateInput(
+JNIEXPORT jobject JNICALL Java_io_github_lime3ds_android_applets_SoftwareKeyboard_ValidateInput(
     JNIEnv* env, jclass clazz, jstring text);
 }
diff --git a/src/android/app/src/main/jni/camera/still_image_camera.cpp b/src/android/app/src/main/jni/camera/still_image_camera.cpp
index c9f7fcf02..e86599d2b 100644
--- a/src/android/app/src/main/jni/camera/still_image_camera.cpp
+++ b/src/android/app/src/main/jni/camera/still_image_camera.cpp
@@ -16,7 +16,7 @@ namespace Camera::StillImage {
 
 void InitJNI(JNIEnv* env) {
     s_still_image_camera_helper_class = reinterpret_cast<jclass>(
-        env->NewGlobalRef(env->FindClass("io/github/lime3ds/camera/StillImageCameraHelper")));
+        env->NewGlobalRef(env->FindClass("io/github/lime3ds/android/camera/StillImageCameraHelper")));
     s_open_file_picker = env->GetStaticMethodID(s_still_image_camera_helper_class, "OpenFilePicker",
                                                 "()Ljava/lang/String;");
     s_load_image_from_file =
diff --git a/src/android/app/src/main/jni/cheats/cheat.cpp b/src/android/app/src/main/jni/cheats/cheat.cpp
index 6d23301a3..95d46e4d0 100644
--- a/src/android/app/src/main/jni/cheats/cheat.cpp
+++ b/src/android/app/src/main/jni/cheats/cheat.cpp
@@ -29,37 +29,37 @@ jobject CheatToJava(JNIEnv* env, std::shared_ptr<Cheats::CheatBase> cheat) {
 
 extern "C" {
 
-JNIEXPORT void JNICALL Java_io_github_lime3ds_features_cheats_model_Cheat_finalize(JNIEnv* env,
+JNIEXPORT void JNICALL Java_io_github_lime3ds_android_features_cheats_model_Cheat_finalize(JNIEnv* env,
                                                                                    jobject obj) {
     delete CheatFromJava(env, obj);
 }
 
-JNIEXPORT jstring JNICALL Java_io_github_lime3ds_features_cheats_model_Cheat_getName(JNIEnv* env,
+JNIEXPORT jstring JNICALL Java_io_github_lime3ds_android_features_cheats_model_Cheat_getName(JNIEnv* env,
                                                                                      jobject obj) {
     return ToJString(env, (*CheatFromJava(env, obj))->GetName());
 }
 
-JNIEXPORT jstring JNICALL Java_io_github_lime3ds_features_cheats_model_Cheat_getNotes(JNIEnv* env,
+JNIEXPORT jstring JNICALL Java_io_github_lime3ds_android_features_cheats_model_Cheat_getNotes(JNIEnv* env,
                                                                                       jobject obj) {
     return ToJString(env, (*CheatFromJava(env, obj))->GetComments());
 }
 
-JNIEXPORT jstring JNICALL Java_io_github_lime3ds_features_cheats_model_Cheat_getCode(JNIEnv* env,
+JNIEXPORT jstring JNICALL Java_io_github_lime3ds_android_features_cheats_model_Cheat_getCode(JNIEnv* env,
                                                                                      jobject obj) {
     return ToJString(env, (*CheatFromJava(env, obj))->GetCode());
 }
 
 JNIEXPORT jboolean JNICALL
-Java_io_github_lime3ds_features_cheats_model_Cheat_getEnabled(JNIEnv* env, jobject obj) {
+Java_io_github_lime3ds_android_features_cheats_model_Cheat_getEnabled(JNIEnv* env, jobject obj) {
     return static_cast<jboolean>((*CheatFromJava(env, obj))->IsEnabled());
 }
 
-JNIEXPORT void JNICALL Java_io_github_lime3ds_features_cheats_model_Cheat_setEnabledImpl(
+JNIEXPORT void JNICALL Java_io_github_lime3ds_android_features_cheats_model_Cheat_setEnabledImpl(
     JNIEnv* env, jobject obj, jboolean j_enabled) {
     (*CheatFromJava(env, obj))->SetEnabled(static_cast<bool>(j_enabled));
 }
 
-JNIEXPORT jint JNICALL Java_io_github_lime3ds_features_cheats_model_Cheat_isValidGatewayCode(
+JNIEXPORT jint JNICALL Java_io_github_lime3ds_android_features_cheats_model_Cheat_isValidGatewayCode(
     JNIEnv* env, jclass, jstring j_code) {
     const std::string code = GetJString(env, j_code);
     const auto code_lines = Common::SplitString(code, '\n');
@@ -74,7 +74,7 @@ JNIEXPORT jint JNICALL Java_io_github_lime3ds_features_cheats_model_Cheat_isVali
     return 0;
 }
 
-JNIEXPORT jobject JNICALL Java_io_github_lime3ds_features_cheats_model_Cheat_createGatewayCode(
+JNIEXPORT jobject JNICALL Java_io_github_lime3ds_android_features_cheats_model_Cheat_createGatewayCode(
     JNIEnv* env, jclass, jstring j_name, jstring j_notes, jstring j_code) {
     return CheatToJava(env, std::make_shared<Cheats::GatewayCheat>(GetJString(env, j_name),
                                                                    GetJString(env, j_code),
diff --git a/src/android/app/src/main/jni/cheats/cheat_engine.cpp b/src/android/app/src/main/jni/cheats/cheat_engine.cpp
index 0f0cb0d41..5a04236bd 100644
--- a/src/android/app/src/main/jni/cheats/cheat_engine.cpp
+++ b/src/android/app/src/main/jni/cheats/cheat_engine.cpp
@@ -20,18 +20,18 @@ static Cheats::CheatEngine& GetEngine() {
     return system.CheatEngine();
 }
 
-JNIEXPORT void JNICALL Java_io_github_lime3ds_features_cheats_model_CheatEngine_loadCheatFile(
+JNIEXPORT void JNICALL Java_io_github_lime3ds_android_features_cheats_model_CheatEngine_loadCheatFile(
     JNIEnv* env, jclass, jlong title_id) {
     GetEngine().LoadCheatFile(title_id);
 }
 
-JNIEXPORT void JNICALL Java_io_github_lime3ds_features_cheats_model_CheatEngine_saveCheatFile(
+JNIEXPORT void JNICALL Java_io_github_lime3ds_android_features_cheats_model_CheatEngine_saveCheatFile(
     JNIEnv* env, jclass, jlong title_id) {
     GetEngine().SaveCheatFile(title_id);
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_io_github_lime3ds_features_cheats_model_CheatEngine_getCheats(JNIEnv* env, jclass) {
+Java_io_github_lime3ds_android_features_cheats_model_CheatEngine_getCheats(JNIEnv* env, jclass) {
     auto cheats = GetEngine().GetCheats();
 
     const jobjectArray array =
@@ -44,18 +44,18 @@ Java_io_github_lime3ds_features_cheats_model_CheatEngine_getCheats(JNIEnv* env,
     return array;
 }
 
-JNIEXPORT void JNICALL Java_io_github_lime3ds_features_cheats_model_CheatEngine_addCheat(
+JNIEXPORT void JNICALL Java_io_github_lime3ds_android_features_cheats_model_CheatEngine_addCheat(
     JNIEnv* env, jclass, jobject j_cheat) {
     auto cheat = *CheatFromJava(env, j_cheat);
     GetEngine().AddCheat(std::move(cheat));
 }
 
-JNIEXPORT void JNICALL Java_io_github_lime3ds_features_cheats_model_CheatEngine_removeCheat(
+JNIEXPORT void JNICALL Java_io_github_lime3ds_android_features_cheats_model_CheatEngine_removeCheat(
     JNIEnv* env, jclass, jint index) {
     GetEngine().RemoveCheat(index);
 }
 
-JNIEXPORT void JNICALL Java_io_github_lime3ds_features_cheats_model_CheatEngine_updateCheat(
+JNIEXPORT void JNICALL Java_io_github_lime3ds_android_features_cheats_model_CheatEngine_updateCheat(
     JNIEnv* env, jclass, jint index, jobject j_new_cheat) {
     auto cheat = *CheatFromJava(env, j_new_cheat);
     GetEngine().UpdateCheat(index, std::move(cheat));
diff --git a/src/android/app/src/main/jni/game_info.cpp b/src/android/app/src/main/jni/game_info.cpp
index 4668d7aef..b6c784ab9 100644
--- a/src/android/app/src/main/jni/game_info.cpp
+++ b/src/android/app/src/main/jni/game_info.cpp
@@ -60,7 +60,7 @@ static Loader::SMDH* GetPointer(JNIEnv* env, jobject obj) {
     return reinterpret_cast<Loader::SMDH*>(env->GetLongField(obj, IDCache::GetGameInfoPointer()));
 }
 
-JNIEXPORT jlong JNICALL Java_io_github_lime3ds_model_GameInfo_initialize(JNIEnv* env, jclass,
+JNIEXPORT jlong JNICALL Java_io_github_lime3ds_android_model_GameInfo_initialize(JNIEnv* env, jclass,
                                                                          jstring j_path) {
     std::vector<u8> smdh_data = GetSMDHData(GetJString(env, j_path));
 
@@ -72,11 +72,11 @@ JNIEXPORT jlong JNICALL Java_io_github_lime3ds_model_GameInfo_initialize(JNIEnv*
     return reinterpret_cast<jlong>(smdh);
 }
 
-JNIEXPORT void JNICALL Java_io_github_lime3ds_model_GameInfo_finalize(JNIEnv* env, jobject obj) {
+JNIEXPORT void JNICALL Java_io_github_lime3ds_android_model_GameInfo_finalize(JNIEnv* env, jobject obj) {
     delete GetPointer(env, obj);
 }
 
-jstring Java_io_github_lime3ds_model_GameInfo_getTitle(JNIEnv* env, jobject obj) {
+jstring Java_io_github_lime3ds_android_model_GameInfo_getTitle(JNIEnv* env, jobject obj) {
     Loader::SMDH* smdh = GetPointer(env, obj);
     Loader::SMDH::TitleLanguage language = Loader::SMDH::TitleLanguage::English;
 
@@ -87,7 +87,7 @@ jstring Java_io_github_lime3ds_model_GameInfo_getTitle(JNIEnv* env, jobject obj)
     return ToJString(env, Common::UTF16ToUTF8(title).data());
 }
 
-jstring Java_io_github_lime3ds_model_GameInfo_getCompany(JNIEnv* env, jobject obj) {
+jstring Java_io_github_lime3ds_android_model_GameInfo_getCompany(JNIEnv* env, jobject obj) {
     Loader::SMDH* smdh = GetPointer(env, obj);
     Loader::SMDH::TitleLanguage language = Loader::SMDH::TitleLanguage::English;
 
@@ -99,7 +99,7 @@ jstring Java_io_github_lime3ds_model_GameInfo_getCompany(JNIEnv* env, jobject ob
     return ToJString(env, Common::UTF16ToUTF8(publisher).data());
 }
 
-jstring Java_io_github_lime3ds_model_GameInfo_getRegions(JNIEnv* env, jobject obj) {
+jstring Java_io_github_lime3ds_android_model_GameInfo_getRegions(JNIEnv* env, jobject obj) {
     Loader::SMDH* smdh = GetPointer(env, obj);
 
     using GameRegion = Loader::SMDH::GameRegion;
@@ -132,7 +132,7 @@ jstring Java_io_github_lime3ds_model_GameInfo_getRegions(JNIEnv* env, jobject ob
     return ToJString(env, result);
 }
 
-jintArray Java_io_github_lime3ds_model_GameInfo_getIcon(JNIEnv* env, jobject obj) {
+jintArray Java_io_github_lime3ds_android_model_GameInfo_getIcon(JNIEnv* env, jobject obj) {
     Loader::SMDH* smdh = GetPointer(env, obj);
 
     // Always get a 48x48(large) icon
@@ -148,7 +148,7 @@ jintArray Java_io_github_lime3ds_model_GameInfo_getIcon(JNIEnv* env, jobject obj
     return icon;
 }
 
-jboolean Java_io_github_lime3ds_model_GameInfo_getIsVisibleSystemTitle(JNIEnv* env, jobject obj) {
+jboolean Java_io_github_lime3ds_android_model_GameInfo_getIsVisibleSystemTitle(JNIEnv* env, jobject obj) {
     Loader::SMDH* smdh = GetPointer(env, obj);
     if (smdh == nullptr) {
         return false;
diff --git a/src/android/app/src/main/jni/id_cache.cpp b/src/android/app/src/main/jni/id_cache.cpp
index 399bd928a..8ae487518 100644
--- a/src/android/app/src/main/jni/id_cache.cpp
+++ b/src/android/app/src/main/jni/id_cache.cpp
@@ -161,16 +161,16 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
 
     // Initialize misc classes
     s_savestate_info_class = reinterpret_cast<jclass>(
-        env->NewGlobalRef(env->FindClass("io/github/lime3ds/NativeLibrary$SaveStateInfo")));
+        env->NewGlobalRef(env->FindClass("io/github/lime3ds/android/NativeLibrary$SaveStateInfo")));
     s_core_error_class = reinterpret_cast<jclass>(
-        env->NewGlobalRef(env->FindClass("io/github/lime3ds/NativeLibrary$CoreError")));
+        env->NewGlobalRef(env->FindClass("io/github/lime3ds/android/NativeLibrary$CoreError")));
 
     // Initialize NativeLibrary
-    const jclass native_library_class = env->FindClass("io/github/lime3ds/NativeLibrary");
+    const jclass native_library_class = env->FindClass("io/github/lime3ds/android/NativeLibrary");
     s_native_library_class = reinterpret_cast<jclass>(env->NewGlobalRef(native_library_class));
     s_on_core_error =
         env->GetStaticMethodID(s_native_library_class, "onCoreError",
-                               "(Lio/github/lime3ds/NativeLibrary$CoreError;Ljava/lang/String;)Z");
+                               "(Lio/github/lime3ds/android/NativeLibrary$CoreError;Ljava/lang/String;)Z");
     s_is_portrait_mode = env->GetStaticMethodID(s_native_library_class, "isPortraitMode", "()Z");
     s_landscape_screen_layout =
         env->GetStaticMethodID(s_native_library_class, "landscapeScreenLayout", "()I");
@@ -183,32 +183,32 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     env->DeleteLocalRef(native_library_class);
 
     // Initialize Cheat
-    const jclass cheat_class = env->FindClass("io/github/lime3ds/features/cheats/model/Cheat");
+    const jclass cheat_class = env->FindClass("io/github/lime3ds/android/features/cheats/model/Cheat");
     s_cheat_class = reinterpret_cast<jclass>(env->NewGlobalRef(cheat_class));
     s_cheat_pointer = env->GetFieldID(cheat_class, "mPointer", "J");
     s_cheat_constructor = env->GetMethodID(cheat_class, "<init>", "(J)V");
     env->DeleteLocalRef(cheat_class);
 
     // Initialize GameInfo
-    const jclass game_info_class = env->FindClass("io/github/lime3ds/model/GameInfo");
+    const jclass game_info_class = env->FindClass("io/github/lime3ds/android/model/GameInfo");
     s_game_info_pointer = env->GetFieldID(game_info_class, "pointer", "J");
     env->DeleteLocalRef(game_info_class);
 
     // Initialize Disk Shader Cache Progress Dialog
     s_disk_cache_progress_class = reinterpret_cast<jclass>(
-        env->NewGlobalRef(env->FindClass("io/github/lime3ds/utils/DiskShaderCacheProgress")));
+        env->NewGlobalRef(env->FindClass("io/github/lime3ds/android/utils/DiskShaderCacheProgress")));
     jclass load_callback_stage_class =
-        env->FindClass("io/github/lime3ds/utils/DiskShaderCacheProgress$LoadCallbackStage");
+        env->FindClass("io/github/lime3ds/android/utils/DiskShaderCacheProgress$LoadCallbackStage");
     s_disk_cache_load_progress = env->GetStaticMethodID(
         s_disk_cache_progress_class, "loadProgress",
-        "(Lio/github/lime3ds/utils/DiskShaderCacheProgress$LoadCallbackStage;II)V");
+        "(Lio/github/lime3ds/android/utils/DiskShaderCacheProgress$LoadCallbackStage;II)V");
     // Initialize LoadCallbackStage map
     const auto to_java_load_callback_stage = [env,
                                               load_callback_stage_class](const std::string& stage) {
         return env->NewGlobalRef(env->GetStaticObjectField(
             load_callback_stage_class,
             env->GetStaticFieldID(load_callback_stage_class, stage.c_str(),
-                                  "Lio/github/lime3ds/utils/"
+                                  "Lio/github/lime3ds/android/utils/"
                                   "DiskShaderCacheProgress$LoadCallbackStage;")));
     };
     s_java_load_callback_stages.emplace(VideoCore::LoadCallbackStage::Prepare,
@@ -223,17 +223,17 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
 
     // CIA Install
     s_cia_install_helper_class = reinterpret_cast<jclass>(
-        env->NewGlobalRef(env->FindClass("io/github/lime3ds/utils/CiaInstallWorker")));
+        env->NewGlobalRef(env->FindClass("io/github/lime3ds/android/utils/CiaInstallWorker")));
     s_cia_install_helper_set_progress =
         env->GetMethodID(s_cia_install_helper_class, "setProgressCallback", "(II)V");
     // Initialize CIA InstallStatus map
     jclass cia_install_status_class =
-        env->FindClass("io/github/lime3ds/NativeLibrary$InstallStatus");
+        env->FindClass("io/github/lime3ds/android/NativeLibrary$InstallStatus");
     const auto to_java_cia_install_status = [env,
                                              cia_install_status_class](const std::string& stage) {
         return env->NewGlobalRef(env->GetStaticObjectField(
             cia_install_status_class, env->GetStaticFieldID(cia_install_status_class, stage.c_str(),
-                                                            "Lio/github/lime3ds/"
+                                                            "Lio/github/lime3ds/android/"
                                                             "NativeLibrary$InstallStatus;")));
     };
     s_java_cia_install_status.emplace(Service::AM::InstallStatus::Success,
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index 20c835047..b4b57257c 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -91,7 +91,7 @@ static jobject ToJavaCoreError(Core::System::ResultStatus result) {
     const jclass core_error_class = IDCache::GetCoreErrorClass();
     return env->GetStaticObjectField(
         core_error_class, env->GetStaticFieldID(core_error_class, name,
-                                                "Lio/github/lime3ds/NativeLibrary$CoreError;"));
+                                                "Lio/github/lime3ds/android/NativeLibrary$CoreError;"));
 }
 
 static bool HandleCoreError(Core::System::ResultStatus result, const std::string& details) {
@@ -283,7 +283,7 @@ void InitializeGpuDriver(const std::string& hook_lib_dir, const std::string& cus
 
 extern "C" {
 
-void Java_io_github_lime3ds_NativeLibrary_surfaceChanged(JNIEnv* env, [[maybe_unused]] jobject obj,
+void Java_io_github_lime3ds_android_NativeLibrary_surfaceChanged(JNIEnv* env, [[maybe_unused]] jobject obj,
                                                          jobject surf) {
     s_surf = ANativeWindow_fromSurface(env, surf);
 
@@ -299,7 +299,7 @@ void Java_io_github_lime3ds_NativeLibrary_surfaceChanged(JNIEnv* env, [[maybe_un
     LOG_INFO(Frontend, "Surface changed");
 }
 
-void Java_io_github_lime3ds_NativeLibrary_surfaceDestroyed([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_surfaceDestroyed([[maybe_unused]] JNIEnv* env,
                                                            [[maybe_unused]] jobject obj) {
     ANativeWindow_release(s_surf);
     s_surf = nullptr;
@@ -308,7 +308,7 @@ void Java_io_github_lime3ds_NativeLibrary_surfaceDestroyed([[maybe_unused]] JNIE
     }
 }
 
-void Java_io_github_lime3ds_NativeLibrary_doFrame([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_doFrame([[maybe_unused]] JNIEnv* env,
                                                   [[maybe_unused]] jobject obj) {
     if (stop_run || pause_emulation) {
         return;
@@ -316,7 +316,7 @@ void Java_io_github_lime3ds_NativeLibrary_doFrame([[maybe_unused]] JNIEnv* env,
     window->TryPresenting();
 }
 
-void JNICALL Java_io_github_lime3ds_NativeLibrary_initializeGpuDriver(JNIEnv* env, jobject obj,
+void JNICALL Java_io_github_lime3ds_android_NativeLibrary_initializeGpuDriver(JNIEnv* env, jobject obj,
                                                                       jstring hook_lib_dir,
                                                                       jstring custom_driver_dir,
                                                                       jstring custom_driver_name,
@@ -325,7 +325,7 @@ void JNICALL Java_io_github_lime3ds_NativeLibrary_initializeGpuDriver(JNIEnv* en
                         GetJString(env, custom_driver_name), GetJString(env, file_redirect_dir));
 }
 
-void Java_io_github_lime3ds_NativeLibrary_notifyOrientationChange([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_notifyOrientationChange([[maybe_unused]] JNIEnv* env,
                                                                   [[maybe_unused]] jobject obj,
                                                                   jint layout_option,
                                                                   jint rotation) {
@@ -338,7 +338,7 @@ void Java_io_github_lime3ds_NativeLibrary_notifyOrientationChange([[maybe_unused
     Camera::NDK::g_rotation = rotation;
 }
 
-void Java_io_github_lime3ds_NativeLibrary_swapScreens([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_swapScreens([[maybe_unused]] JNIEnv* env,
                                                       [[maybe_unused]] jobject obj,
                                                       jboolean swap_screens, jint rotation) {
     Settings::values.swap_screen = swap_screens;
@@ -350,14 +350,14 @@ void Java_io_github_lime3ds_NativeLibrary_swapScreens([[maybe_unused]] JNIEnv* e
     Camera::NDK::g_rotation = rotation;
 }
 
-jboolean Java_io_github_lime3ds_NativeLibrary_areKeysAvailable([[maybe_unused]] JNIEnv* env,
+jboolean Java_io_github_lime3ds_android_NativeLibrary_areKeysAvailable([[maybe_unused]] JNIEnv* env,
                                                                [[maybe_unused]] jobject obj) {
     HW::AES::InitKeys();
     return HW::AES::IsKeyXAvailable(HW::AES::KeySlotID::NCCHSecure1) &&
            HW::AES::IsKeyXAvailable(HW::AES::KeySlotID::NCCHSecure2);
 }
 
-jstring Java_io_github_lime3ds_NativeLibrary_getHomeMenuPath(JNIEnv* env,
+jstring Java_io_github_lime3ds_android_NativeLibrary_getHomeMenuPath(JNIEnv* env,
                                                              [[maybe_unused]] jobject obj,
                                                              jint region) {
     const std::string path = Core::GetHomeMenuNcchPath(region);
@@ -367,13 +367,13 @@ jstring Java_io_github_lime3ds_NativeLibrary_getHomeMenuPath(JNIEnv* env,
     return ToJString(env, "");
 }
 
-void Java_io_github_lime3ds_NativeLibrary_setUserDirectory(JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_setUserDirectory(JNIEnv* env,
                                                            [[maybe_unused]] jobject obj,
                                                            jstring j_directory) {
     FileUtil::SetCurrentDir(GetJString(env, j_directory));
 }
 
-jobjectArray Java_io_github_lime3ds_NativeLibrary_getInstalledGamePaths(
+jobjectArray Java_io_github_lime3ds_android_NativeLibrary_getInstalledGamePaths(
     JNIEnv* env, [[maybe_unused]] jclass clazz) {
     std::vector<std::string> games;
     const FileUtil::DirectoryEntryCallable ScanDir =
@@ -411,7 +411,7 @@ jobjectArray Java_io_github_lime3ds_NativeLibrary_getInstalledGamePaths(
     return jgames;
 }
 
-jlongArray Java_io_github_lime3ds_NativeLibrary_getSystemTitleIds(JNIEnv* env,
+jlongArray Java_io_github_lime3ds_android_NativeLibrary_getSystemTitleIds(JNIEnv* env,
                                                                   [[maybe_unused]] jobject obj,
                                                                   jint system_type, jint region) {
     const auto mode = static_cast<Core::SystemTitleSet>(system_type);
@@ -422,7 +422,7 @@ jlongArray Java_io_github_lime3ds_NativeLibrary_getSystemTitleIds(JNIEnv* env,
     return jTitles;
 }
 
-jobject Java_io_github_lime3ds_NativeLibrary_downloadTitleFromNus([[maybe_unused]] JNIEnv* env,
+jobject Java_io_github_lime3ds_android_NativeLibrary_downloadTitleFromNus([[maybe_unused]] JNIEnv* env,
                                                                   [[maybe_unused]] jobject obj,
                                                                   jlong title) {
     const auto title_id = static_cast<u64>(title);
@@ -443,7 +443,7 @@ jobject Java_io_github_lime3ds_NativeLibrary_downloadTitleFromNus([[maybe_unused
     return android_get_device_api_level() >= 28 && CheckKgslPresent();
 }
 
-jboolean JNICALL Java_io_github_lime3ds_utils_GpuDriverHelper_supportsCustomDriverLoading(
+jboolean JNICALL Java_io_github_lime3ds_android_utils_GpuDriverHelper_supportsCustomDriverLoading(
     JNIEnv* env, jobject instance) {
 #ifdef CITRA_ARCH_arm64
     // If the KGSL device exists custom drivers can be loaded using adrenotools
@@ -454,20 +454,20 @@ jboolean JNICALL Java_io_github_lime3ds_utils_GpuDriverHelper_supportsCustomDriv
 }
 
 // TODO(xperia64): ensure these cannot be called in an invalid state (e.g. after StopEmulation)
-void Java_io_github_lime3ds_NativeLibrary_unPauseEmulation([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_unPauseEmulation([[maybe_unused]] JNIEnv* env,
                                                            [[maybe_unused]] jobject obj) {
     pause_emulation = false;
     running_cv.notify_all();
     InputManager::NDKMotionHandler()->EnableSensors();
 }
 
-void Java_io_github_lime3ds_NativeLibrary_pauseEmulation([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_pauseEmulation([[maybe_unused]] JNIEnv* env,
                                                          [[maybe_unused]] jobject obj) {
     pause_emulation = true;
     InputManager::NDKMotionHandler()->DisableSensors();
 }
 
-void Java_io_github_lime3ds_NativeLibrary_stopEmulation([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_stopEmulation([[maybe_unused]] JNIEnv* env,
                                                         [[maybe_unused]] jobject obj) {
     stop_run = true;
     pause_emulation = false;
@@ -475,19 +475,19 @@ void Java_io_github_lime3ds_NativeLibrary_stopEmulation([[maybe_unused]] JNIEnv*
     running_cv.notify_all();
 }
 
-jboolean Java_io_github_lime3ds_NativeLibrary_isRunning([[maybe_unused]] JNIEnv* env,
+jboolean Java_io_github_lime3ds_android_NativeLibrary_isRunning([[maybe_unused]] JNIEnv* env,
                                                         [[maybe_unused]] jobject obj) {
     return static_cast<jboolean>(!stop_run);
 }
 
-jlong Java_io_github_lime3ds_NativeLibrary_getRunningTitleId([[maybe_unused]] JNIEnv* env,
+jlong Java_io_github_lime3ds_android_NativeLibrary_getRunningTitleId([[maybe_unused]] JNIEnv* env,
                                                              [[maybe_unused]] jobject obj) {
     u64 title_id{};
     Core::System::GetInstance().GetAppLoader().ReadProgramId(title_id);
     return static_cast<jlong>(title_id);
 }
 
-jboolean Java_io_github_lime3ds_NativeLibrary_onGamePadEvent([[maybe_unused]] JNIEnv* env,
+jboolean Java_io_github_lime3ds_android_NativeLibrary_onGamePadEvent([[maybe_unused]] JNIEnv* env,
                                                              [[maybe_unused]] jobject obj,
                                                              [[maybe_unused]] jstring j_device,
                                                              jint j_button, jint action) {
@@ -501,7 +501,7 @@ jboolean Java_io_github_lime3ds_NativeLibrary_onGamePadEvent([[maybe_unused]] JN
     return static_cast<jboolean>(consumed);
 }
 
-jboolean Java_io_github_lime3ds_NativeLibrary_onGamePadMoveEvent([[maybe_unused]] JNIEnv* env,
+jboolean Java_io_github_lime3ds_android_NativeLibrary_onGamePadMoveEvent([[maybe_unused]] JNIEnv* env,
                                                                  [[maybe_unused]] jobject obj,
                                                                  [[maybe_unused]] jstring j_device,
                                                                  jint axis, jfloat x, jfloat y) {
@@ -521,7 +521,7 @@ jboolean Java_io_github_lime3ds_NativeLibrary_onGamePadMoveEvent([[maybe_unused]
     return static_cast<jboolean>(InputManager::AnalogHandler()->MoveJoystick(axis, x, y));
 }
 
-jboolean Java_io_github_lime3ds_NativeLibrary_onGamePadAxisEvent([[maybe_unused]] JNIEnv* env,
+jboolean Java_io_github_lime3ds_android_NativeLibrary_onGamePadAxisEvent([[maybe_unused]] JNIEnv* env,
                                                                  [[maybe_unused]] jobject obj,
                                                                  [[maybe_unused]] jstring j_device,
                                                                  jint axis_id, jfloat axis_val) {
@@ -529,20 +529,20 @@ jboolean Java_io_github_lime3ds_NativeLibrary_onGamePadAxisEvent([[maybe_unused]
         InputManager::ButtonHandler()->AnalogButtonEvent(axis_id, axis_val));
 }
 
-jboolean Java_io_github_lime3ds_NativeLibrary_onTouchEvent([[maybe_unused]] JNIEnv* env,
+jboolean Java_io_github_lime3ds_android_NativeLibrary_onTouchEvent([[maybe_unused]] JNIEnv* env,
                                                            [[maybe_unused]] jobject obj, jfloat x,
                                                            jfloat y, jboolean pressed) {
     return static_cast<jboolean>(
         window->OnTouchEvent(static_cast<int>(x + 0.5), static_cast<int>(y + 0.5), pressed));
 }
 
-void Java_io_github_lime3ds_NativeLibrary_onTouchMoved([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_onTouchMoved([[maybe_unused]] JNIEnv* env,
                                                        [[maybe_unused]] jobject obj, jfloat x,
                                                        jfloat y) {
     window->OnTouchMoved((int)x, (int)y);
 }
 
-jlong Java_io_github_lime3ds_NativeLibrary_getTitleId(JNIEnv* env, [[maybe_unused]] jobject obj,
+jlong Java_io_github_lime3ds_android_NativeLibrary_getTitleId(JNIEnv* env, [[maybe_unused]] jobject obj,
                                                       jstring j_filename) {
     std::string filepath = GetJString(env, j_filename);
     const auto loader = Loader::GetLoader(filepath);
@@ -554,7 +554,7 @@ jlong Java_io_github_lime3ds_NativeLibrary_getTitleId(JNIEnv* env, [[maybe_unuse
     return static_cast<jlong>(title_id);
 }
 
-jboolean Java_io_github_lime3ds_NativeLibrary_getIsSystemTitle(JNIEnv* env,
+jboolean Java_io_github_lime3ds_android_NativeLibrary_getIsSystemTitle(JNIEnv* env,
                                                                [[maybe_unused]] jobject obj,
                                                                jstring path) {
     const std::string filepath = GetJString(env, path);
@@ -570,19 +570,19 @@ jboolean Java_io_github_lime3ds_NativeLibrary_getIsSystemTitle(JNIEnv* env,
     return ((program_id >> 32) & 0xFFFFFFFF) == 0x00040010;
 }
 
-void Java_io_github_lime3ds_NativeLibrary_createConfigFile([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_createConfigFile([[maybe_unused]] JNIEnv* env,
                                                            [[maybe_unused]] jobject obj) {
     Config{};
 }
 
-void Java_io_github_lime3ds_NativeLibrary_createLogFile([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_createLogFile([[maybe_unused]] JNIEnv* env,
                                                         [[maybe_unused]] jobject obj) {
     Common::Log::Initialize();
     Common::Log::Start();
     LOG_INFO(Frontend, "Logging backend initialised");
 }
 
-void Java_io_github_lime3ds_NativeLibrary_logUserDirectory(JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_logUserDirectory(JNIEnv* env,
                                                            [[maybe_unused]] jobject obj,
                                                            jstring j_path) {
     std::string_view path = env->GetStringUTFChars(j_path, 0);
@@ -590,7 +590,7 @@ void Java_io_github_lime3ds_NativeLibrary_logUserDirectory(JNIEnv* env,
     env->ReleaseStringUTFChars(j_path, path.data());
 }
 
-void Java_io_github_lime3ds_NativeLibrary_reloadSettings([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_reloadSettings([[maybe_unused]] JNIEnv* env,
                                                          [[maybe_unused]] jobject obj) {
     Config{};
     Core::System& system{Core::System::GetInstance()};
@@ -605,7 +605,7 @@ void Java_io_github_lime3ds_NativeLibrary_reloadSettings([[maybe_unused]] JNIEnv
     system.ApplySettings();
 }
 
-jdoubleArray Java_io_github_lime3ds_NativeLibrary_getPerfStats(JNIEnv* env,
+jdoubleArray Java_io_github_lime3ds_android_NativeLibrary_getPerfStats(JNIEnv* env,
                                                                [[maybe_unused]] jobject obj) {
     auto& core = Core::System::GetInstance();
     jdoubleArray j_stats = env->NewDoubleArray(4);
@@ -623,7 +623,7 @@ jdoubleArray Java_io_github_lime3ds_NativeLibrary_getPerfStats(JNIEnv* env,
     return j_stats;
 }
 
-void Java_io_github_lime3ds_NativeLibrary_run__Ljava_lang_String_2(JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_run__Ljava_lang_String_2(JNIEnv* env,
                                                                    [[maybe_unused]] jobject obj,
                                                                    jstring j_path) {
     const std::string path = GetJString(env, j_path);
@@ -640,14 +640,14 @@ void Java_io_github_lime3ds_NativeLibrary_run__Ljava_lang_String_2(JNIEnv* env,
     }
 }
 
-void Java_io_github_lime3ds_NativeLibrary_reloadCameraDevices([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_reloadCameraDevices([[maybe_unused]] JNIEnv* env,
                                                               [[maybe_unused]] jobject obj) {
     if (g_ndk_factory) {
         g_ndk_factory->ReloadCameraDevices();
     }
 }
 
-jboolean Java_io_github_lime3ds_NativeLibrary_loadAmiibo(JNIEnv* env, [[maybe_unused]] jobject obj,
+jboolean Java_io_github_lime3ds_android_NativeLibrary_loadAmiibo(JNIEnv* env, [[maybe_unused]] jobject obj,
                                                          jstring j_file) {
     std::string filepath = GetJString(env, j_file);
     Core::System& system{Core::System::GetInstance()};
@@ -660,7 +660,7 @@ jboolean Java_io_github_lime3ds_NativeLibrary_loadAmiibo(JNIEnv* env, [[maybe_un
     return static_cast<jboolean>(nfc->LoadAmiibo(filepath));
 }
 
-void Java_io_github_lime3ds_NativeLibrary_removeAmiibo([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_removeAmiibo([[maybe_unused]] JNIEnv* env,
                                                        [[maybe_unused]] jobject obj) {
     Core::System& system{Core::System::GetInstance()};
     Service::SM::ServiceManager& sm = system.ServiceManager();
@@ -672,7 +672,7 @@ void Java_io_github_lime3ds_NativeLibrary_removeAmiibo([[maybe_unused]] JNIEnv*
     nfc->RemoveAmiibo();
 }
 
-JNIEXPORT jobject JNICALL Java_io_github_lime3ds_utils_CiaInstallWorker_installCIA(JNIEnv* env,
+JNIEXPORT jobject JNICALL Java_io_github_lime3ds_android_utils_CiaInstallWorker_installCIA(JNIEnv* env,
                                                                                    jobject jobj,
                                                                                    jstring jpath) {
     std::string path = GetJString(env, jpath);
@@ -685,7 +685,7 @@ JNIEXPORT jobject JNICALL Java_io_github_lime3ds_utils_CiaInstallWorker_installC
     return IDCache::GetJavaCiaInstallStatus(res);
 }
 
-jobjectArray Java_io_github_lime3ds_NativeLibrary_getSavestateInfo(JNIEnv* env,
+jobjectArray Java_io_github_lime3ds_android_NativeLibrary_getSavestateInfo(JNIEnv* env,
                                                                    [[maybe_unused]] jobject obj) {
     const jclass date_class = env->FindClass("java/util/Date");
     const auto date_constructor = env->GetMethodID(date_class, "<init>", "(J)V");
@@ -719,17 +719,17 @@ jobjectArray Java_io_github_lime3ds_NativeLibrary_getSavestateInfo(JNIEnv* env,
     return array;
 }
 
-void Java_io_github_lime3ds_NativeLibrary_saveState([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_saveState([[maybe_unused]] JNIEnv* env,
                                                     [[maybe_unused]] jobject obj, jint slot) {
     Core::System::GetInstance().SendSignal(Core::System::Signal::Save, slot);
 }
 
-void Java_io_github_lime3ds_NativeLibrary_loadState([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_loadState([[maybe_unused]] JNIEnv* env,
                                                     [[maybe_unused]] jobject obj, jint slot) {
     Core::System::GetInstance().SendSignal(Core::System::Signal::Load, slot);
 }
 
-void Java_io_github_lime3ds_NativeLibrary_logDeviceInfo([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_NativeLibrary_logDeviceInfo([[maybe_unused]] JNIEnv* env,
                                                         [[maybe_unused]] jobject obj) {
     LOG_INFO(Frontend, "Lime3DS Version: {} | {}-{}", Common::g_build_fullname,
              Common::g_scm_branch, Common::g_scm_desc);
diff --git a/src/android/app/src/main/jni/native_log.cpp b/src/android/app/src/main/jni/native_log.cpp
index 78e858a89..79e553e50 100644
--- a/src/android/app/src/main/jni/native_log.cpp
+++ b/src/android/app/src/main/jni/native_log.cpp
@@ -7,23 +7,23 @@
 
 extern "C" {
 
-void Java_io_github_lime3ds_utils_Log_debug(JNIEnv* env, jobject obj, jstring jmessage) {
+void Java_io_github_lime3ds_android_utils_Log_debug(JNIEnv* env, jobject obj, jstring jmessage) {
     LOG_DEBUG(Frontend, "{}", GetJString(env, jmessage));
 }
 
-void Java_io_github_lime3ds_utils_Log_warning(JNIEnv* env, jobject obj, jstring jmessage) {
+void Java_io_github_lime3ds_android_utils_Log_warning(JNIEnv* env, jobject obj, jstring jmessage) {
     LOG_WARNING(Frontend, "{}", GetJString(env, jmessage));
 }
 
-void Java_io_github_lime3ds_utils_Log_info(JNIEnv* env, jobject obj, jstring jmessage) {
+void Java_io_github_lime3ds_android_utils_Log_info(JNIEnv* env, jobject obj, jstring jmessage) {
     LOG_INFO(Frontend, "{}", GetJString(env, jmessage));
 }
 
-void Java_io_github_lime3ds_utils_Log_error(JNIEnv* env, jobject obj, jstring jmessage) {
+void Java_io_github_lime3ds_android_utils_Log_error(JNIEnv* env, jobject obj, jstring jmessage) {
     LOG_ERROR(Frontend, "{}", GetJString(env, jmessage));
 }
 
-void Java_io_github_lime3ds_utils_Log_critical(JNIEnv* env, jobject obj, jstring jmessage) {
+void Java_io_github_lime3ds_android_utils_Log_critical(JNIEnv* env, jobject obj, jstring jmessage) {
     LOG_CRITICAL(Frontend, "{}", GetJString(env, jmessage));
 }
 
diff --git a/src/android/app/src/main/jni/ndk_motion.cpp b/src/android/app/src/main/jni/ndk_motion.cpp
index e134fb0c0..a7fb81f6c 100644
--- a/src/android/app/src/main/jni/ndk_motion.cpp
+++ b/src/android/app/src/main/jni/ndk_motion.cpp
@@ -62,7 +62,7 @@ class NDKMotion final : public Input::MotionDevice {
     }
 
     void Construct() {
-        sensor_manager = ASensorManager_getInstanceForPackage("io.github.lime3ds");
+        sensor_manager = ASensorManager_getInstanceForPackage("io.github.lime3ds.android");
         looper = ALooper_prepare(ALOOPER_PREPARE_ALLOW_NON_CALLBACKS);
         if (!sensor_manager || !looper) {
             LOG_CRITICAL(Input, "Could not retrieve sensor manager");
diff --git a/src/android/app/src/main/jni/system_save_game.cpp b/src/android/app/src/main/jni/system_save_game.cpp
index bfc6b4d26..bc025db76 100644
--- a/src/android/app/src/main/jni/system_save_game.cpp
+++ b/src/android/app/src/main/jni/system_save_game.cpp
@@ -12,39 +12,39 @@ std::shared_ptr<Service::CFG::Module> cfg;
 
 extern "C" {
 
-void Java_io_github_lime3ds_utils_SystemSaveGame_save([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_utils_SystemSaveGame_save([[maybe_unused]] JNIEnv* env,
                                                       [[maybe_unused]] jobject obj) {
     cfg->UpdateConfigNANDSavegame();
 }
 
-void Java_io_github_lime3ds_utils_SystemSaveGame_load([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_utils_SystemSaveGame_load([[maybe_unused]] JNIEnv* env,
                                                       [[maybe_unused]] jobject obj) {
     cfg = Service::CFG::GetModule(Core::System::GetInstance());
 }
 
-jboolean Java_io_github_lime3ds_utils_SystemSaveGame_getIsSystemSetupNeeded(
+jboolean Java_io_github_lime3ds_android_utils_SystemSaveGame_getIsSystemSetupNeeded(
     [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) {
     return cfg->IsSystemSetupNeeded();
 }
 
-void Java_io_github_lime3ds_utils_SystemSaveGame_setSystemSetupNeeded([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_utils_SystemSaveGame_setSystemSetupNeeded([[maybe_unused]] JNIEnv* env,
                                                                       [[maybe_unused]] jobject obj,
                                                                       jboolean needed) {
     cfg->SetSystemSetupNeeded(needed);
 }
 
-jstring Java_io_github_lime3ds_utils_SystemSaveGame_getUsername([[maybe_unused]] JNIEnv* env,
+jstring Java_io_github_lime3ds_android_utils_SystemSaveGame_getUsername([[maybe_unused]] JNIEnv* env,
                                                                 [[maybe_unused]] jobject obj) {
     return ToJString(env, Common::UTF16ToUTF8(cfg->GetUsername()));
 }
 
-void Java_io_github_lime3ds_utils_SystemSaveGame_setUsername([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_utils_SystemSaveGame_setUsername([[maybe_unused]] JNIEnv* env,
                                                              [[maybe_unused]] jobject obj,
                                                              jstring username) {
     cfg->SetUsername(Common::UTF8ToUTF16(GetJString(env, username)));
 }
 
-jshortArray Java_io_github_lime3ds_utils_SystemSaveGame_getBirthday([[maybe_unused]] JNIEnv* env,
+jshortArray Java_io_github_lime3ds_android_utils_SystemSaveGame_getBirthday([[maybe_unused]] JNIEnv* env,
                                                                     [[maybe_unused]] jobject obj) {
     jshortArray jbirthdayArray = env->NewShortArray(2);
     auto birthday = cfg->GetBirthday();
@@ -54,62 +54,62 @@ jshortArray Java_io_github_lime3ds_utils_SystemSaveGame_getBirthday([[maybe_unus
     return jbirthdayArray;
 }
 
-void Java_io_github_lime3ds_utils_SystemSaveGame_setBirthday([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_utils_SystemSaveGame_setBirthday([[maybe_unused]] JNIEnv* env,
                                                              [[maybe_unused]] jobject obj,
                                                              jshort jmonth, jshort jday) {
     cfg->SetBirthday(static_cast<u8>(jmonth), static_cast<u8>(jday));
 }
 
-jint Java_io_github_lime3ds_utils_SystemSaveGame_getSystemLanguage([[maybe_unused]] JNIEnv* env,
+jint Java_io_github_lime3ds_android_utils_SystemSaveGame_getSystemLanguage([[maybe_unused]] JNIEnv* env,
                                                                    [[maybe_unused]] jobject obj) {
     return cfg->GetSystemLanguage();
 }
 
-void Java_io_github_lime3ds_utils_SystemSaveGame_setSystemLanguage([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_utils_SystemSaveGame_setSystemLanguage([[maybe_unused]] JNIEnv* env,
                                                                    [[maybe_unused]] jobject obj,
                                                                    jint jsystemLanguage) {
     cfg->SetSystemLanguage(static_cast<Service::CFG::SystemLanguage>(jsystemLanguage));
 }
 
-jint Java_io_github_lime3ds_utils_SystemSaveGame_getSoundOutputMode([[maybe_unused]] JNIEnv* env,
+jint Java_io_github_lime3ds_android_utils_SystemSaveGame_getSoundOutputMode([[maybe_unused]] JNIEnv* env,
                                                                     [[maybe_unused]] jobject obj) {
     return cfg->GetSoundOutputMode();
 }
 
-void Java_io_github_lime3ds_utils_SystemSaveGame_setSoundOutputMode([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_utils_SystemSaveGame_setSoundOutputMode([[maybe_unused]] JNIEnv* env,
                                                                     [[maybe_unused]] jobject obj,
                                                                     jint jmode) {
     cfg->SetSoundOutputMode(static_cast<Service::CFG::SoundOutputMode>(jmode));
 }
 
-jshort Java_io_github_lime3ds_utils_SystemSaveGame_getCountryCode([[maybe_unused]] JNIEnv* env,
+jshort Java_io_github_lime3ds_android_utils_SystemSaveGame_getCountryCode([[maybe_unused]] JNIEnv* env,
                                                                   [[maybe_unused]] jobject obj) {
     return cfg->GetCountryCode();
 }
 
-void Java_io_github_lime3ds_utils_SystemSaveGame_setCountryCode([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_utils_SystemSaveGame_setCountryCode([[maybe_unused]] JNIEnv* env,
                                                                 [[maybe_unused]] jobject obj,
                                                                 jshort jmode) {
     cfg->SetCountryCode(static_cast<u8>(jmode));
 }
 
-jint Java_io_github_lime3ds_utils_SystemSaveGame_getPlayCoins([[maybe_unused]] JNIEnv* env,
+jint Java_io_github_lime3ds_android_utils_SystemSaveGame_getPlayCoins([[maybe_unused]] JNIEnv* env,
                                                               [[maybe_unused]] jobject obj) {
     return Service::PTM::Module::GetPlayCoins();
 }
 
-void Java_io_github_lime3ds_utils_SystemSaveGame_setPlayCoins([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_utils_SystemSaveGame_setPlayCoins([[maybe_unused]] JNIEnv* env,
                                                               [[maybe_unused]] jobject obj,
                                                               jint jcoins) {
     Service::PTM::Module::SetPlayCoins(static_cast<u16>(jcoins));
 }
 
-jlong Java_io_github_lime3ds_utils_SystemSaveGame_getConsoleId([[maybe_unused]] JNIEnv* env,
+jlong Java_io_github_lime3ds_android_utils_SystemSaveGame_getConsoleId([[maybe_unused]] JNIEnv* env,
                                                                [[maybe_unused]] jobject obj) {
     return cfg->GetConsoleUniqueId();
 }
 
-void Java_io_github_lime3ds_utils_SystemSaveGame_regenerateConsoleId([[maybe_unused]] JNIEnv* env,
+void Java_io_github_lime3ds_android_utils_SystemSaveGame_regenerateConsoleId([[maybe_unused]] JNIEnv* env,
                                                                      [[maybe_unused]] jobject obj) {
     const auto [random_number, console_id] = cfg->GenerateConsoleUniqueId();
     cfg->SetConsoleUniqueId(random_number, console_id);
diff --git a/src/android/app/src/main/res/layout/fragment_cheats.xml b/src/android/app/src/main/res/layout/fragment_cheats.xml
index 79909cc33..3c3f72212 100644
--- a/src/android/app/src/main/res/layout/fragment_cheats.xml
+++ b/src/android/app/src/main/res/layout/fragment_cheats.xml
@@ -9,7 +9,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/cheat_list_container"
-        android:name="io.github.lime3ds.features.cheats.ui.CheatListFragment"
+        android:name="io.github.lime3ds.android.features.cheats.ui.CheatListFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
@@ -17,7 +17,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/cheat_details_container"
-        android:name="io.github.lime3ds.features.cheats.ui.CheatDetailsFragment"
+        android:name="io.github.lime3ds.android.features.cheats.ui.CheatDetailsFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
diff --git a/src/android/app/src/main/res/layout/fragment_emulation.xml b/src/android/app/src/main/res/layout/fragment_emulation.xml
index 7952982fd..f6b0b9cd8 100644
--- a/src/android/app/src/main/res/layout/fragment_emulation.xml
+++ b/src/android/app/src/main/res/layout/fragment_emulation.xml
@@ -22,7 +22,7 @@
             android:focusableInTouchMode="false" />
 
         <!-- This is the onscreen input overlay -->
-        <io.github.lime3ds.overlay.InputOverlay
+        <io.github.lime3ds.android.overlay.InputOverlay
             android:id="@+id/surface_input_overlay"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/src/android/app/src/main/res/menu/menu_emulation.xml b/src/android/app/src/main/res/menu/menu_emulation.xml
index c0572c82c..a0dec63be 100644
--- a/src/android/app/src/main/res/menu/menu_emulation.xml
+++ b/src/android/app/src/main/res/menu/menu_emulation.xml
@@ -1,7 +1,7 @@
 <menu 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"
-    tools:context="io.github.lime3ds.activities.EmulationActivity">
+    tools:context="io.github.lime3ds.android.activities.EmulationActivity">
 
     <item
         android:id="@+id/menu_emulation_save_state"
diff --git a/src/android/app/src/main/res/navigation/cheats_navigation.xml b/src/android/app/src/main/res/navigation/cheats_navigation.xml
index f317861fc..ddef4149e 100644
--- a/src/android/app/src/main/res/navigation/cheats_navigation.xml
+++ b/src/android/app/src/main/res/navigation/cheats_navigation.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/cheatsFragment"
-        android:name="io.github.lime3ds.features.cheats.ui.CheatsFragment"
+        android:name="io.github.lime3ds.android.features.cheats.ui.CheatsFragment"
         android:label="fragment_cheats"
         tools:layout="@layout/fragment_cheats">
         <argument
diff --git a/src/android/app/src/main/res/navigation/emulation_navigation.xml b/src/android/app/src/main/res/navigation/emulation_navigation.xml
index a5f9e1a68..95598961b 100644
--- a/src/android/app/src/main/res/navigation/emulation_navigation.xml
+++ b/src/android/app/src/main/res/navigation/emulation_navigation.xml
@@ -7,19 +7,19 @@
 
     <fragment
         android:id="@+id/emulationFragment"
-        android:name="io.github.lime3ds.fragments.EmulationFragment"
+        android:name="io.github.lime3ds.android.fragments.EmulationFragment"
         android:label="fragment_emulation"
         tools:layout="@layout/fragment_emulation" >
         <argument
             android:name="game"
-            app:argType="io.github.lime3ds.model.Game"
+            app:argType="io.github.lime3ds.android.model.Game"
             app:nullable="true"
             android:defaultValue="@null" />
     </fragment>
 
     <activity
         android:id="@+id/cheatsActivity"
-        android:name="io.github.lime3ds.features.cheats.ui.CheatsActivity"
+        android:name="io.github.lime3ds.android.features.cheats.ui.CheatsActivity"
         android:label="CheatsActivity">
         <argument
             android:name="titleId"
diff --git a/src/android/app/src/main/res/navigation/home_navigation.xml b/src/android/app/src/main/res/navigation/home_navigation.xml
index 0f59411d5..d5e01613f 100644
--- a/src/android/app/src/main/res/navigation/home_navigation.xml
+++ b/src/android/app/src/main/res/navigation/home_navigation.xml
@@ -6,12 +6,12 @@
 
     <fragment
         android:id="@+id/gamesFragment"
-        android:name="io.github.lime3ds.fragments.GamesFragment"
+        android:name="io.github.lime3ds.android.fragments.GamesFragment"
         android:label="PlatformGamesFragment" />
 
     <fragment
         android:id="@+id/homeSettingsFragment"
-        android:name="io.github.lime3ds.fragments.HomeSettingsFragment"
+        android:name="io.github.lime3ds.android.fragments.HomeSettingsFragment"
         android:label="HomeSettingsFragment" >
         <action
             android:id="@+id/action_homeSettingsFragment_to_aboutFragment"
@@ -26,7 +26,7 @@
 
     <fragment
         android:id="@+id/firstTimeSetupFragment"
-        android:name="io.github.lime3ds.fragments.SetupFragment"
+        android:name="io.github.lime3ds.android.fragments.SetupFragment"
         android:label="FirstTimeSetupFragment">
         <action
             android:id="@+id/action_firstTimeSetupFragment_to_gamesFragment"
@@ -37,12 +37,12 @@
 
     <fragment
         android:id="@+id/searchFragment"
-        android:name="io.github.lime3ds.fragments.SearchFragment"
+        android:name="io.github.lime3ds.android.fragments.SearchFragment"
         android:label="SearchFragment" />
 
     <fragment
         android:id="@+id/aboutFragment"
-        android:name="io.github.lime3ds.fragments.AboutFragment"
+        android:name="io.github.lime3ds.android.fragments.AboutFragment"
         android:label="AboutFragment" >
         <action
             android:id="@+id/action_aboutFragment_to_licensesFragment"
@@ -51,16 +51,16 @@
 
     <fragment
         android:id="@+id/licensesFragment"
-        android:name="io.github.lime3ds.fragments.LicensesFragment"
+        android:name="io.github.lime3ds.android.fragments.LicensesFragment"
         android:label="LicensesFragment" />
 
     <activity
         android:id="@+id/emulationActivity"
-        android:name="io.github.lime3ds.activities.EmulationActivity"
+        android:name="io.github.lime3ds.android.activities.EmulationActivity"
         android:label="EmulationActivity">
         <argument
             android:name="game"
-            app:argType="io.github.lime3ds.model.Game"
+            app:argType="io.github.lime3ds.android.model.Game"
             app:nullable="true"
             android:defaultValue="@null" />
     </activity>
@@ -72,12 +72,12 @@
 
     <fragment
         android:id="@+id/systemFilesFragment"
-        android:name="io.github.lime3ds.fragments.SystemFilesFragment"
+        android:name="io.github.lime3ds.android.fragments.SystemFilesFragment"
         android:label="SystemFilesFragment" />
 
     <fragment
         android:id="@+id/cheatsFragment"
-        android:name="io.github.lime3ds.features.cheats.ui.CheatsFragment"
+        android:name="io.github.lime3ds.android.features.cheats.ui.CheatsFragment"
         android:label="CheatsFragment" >
         <argument
             android:name="titleId"
@@ -91,7 +91,7 @@
 
     <fragment
         android:id="@+id/driverManagerFragment"
-        android:name="io.github.lime3ds.fragments.DriverManagerFragment"
+        android:name="io.github.lime3ds.android.fragments.DriverManagerFragment"
         android:label="DriverManagerFragment" />
 
 </navigation>
diff --git a/src/lime_qt/CMakeLists.txt b/src/lime_qt/CMakeLists.txt
index e791e32bd..db2712696 100644
--- a/src/lime_qt/CMakeLists.txt
+++ b/src/lime_qt/CMakeLists.txt
@@ -264,7 +264,7 @@ if (APPLE)
         MACOSX_BUNDLE TRUE
         MACOSX_BUNDLE_INFO_PLIST "${DIST_DIR}/Info.plist.in"
         MACOSX_BUNDLE_BUNDLE_NAME "Lime3DS"
-        MACOSX_BUNDLE_GUI_IDENTIFIER "io.github.lime3ds.Lime3DS"
+        MACOSX_BUNDLE_GUI_IDENTIFIER "io.github.lime3ds.android.Lime3DS"
         MACOSX_BUNDLE_BUNDLE_VERSION "${BUILD_VERSION}"
         MACOSX_BUNDLE_SHORT_VERSION_STRING "${BUILD_FULLNAME}"
         MACOSX_BUNDLE_LONG_VERSION_STRING "${BUILD_FULLNAME}"