diff --git a/android/.gitignore b/app/android/.gitignore
similarity index 100%
rename from android/.gitignore
rename to app/android/.gitignore
diff --git a/android/TODO.txt b/app/android/TODO.txt
similarity index 100%
rename from android/TODO.txt
rename to app/android/TODO.txt
diff --git a/android/app/.gitignore b/app/android/app/.gitignore
similarity index 100%
rename from android/app/.gitignore
rename to app/android/app/.gitignore
diff --git a/android/app/build.gradle b/app/android/app/build.gradle
similarity index 97%
rename from android/app/build.gradle
rename to app/android/app/build.gradle
index 02c57ceba2..471c0eb228 100644
--- a/android/app/build.gradle
+++ b/app/android/app/build.gradle
@@ -27,7 +27,7 @@ android {
 		versionCode 1
 		versionName "${appVer}"
 		setProperty("archivesBaseName", "${outputName}")
-		setProperty("buildDir", "${projectDir}/../../build/build_android_client")
+		setProperty("buildDir", "${projectDir}/../../../build/build_android_client")
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		targetSdkVersion 32
diff --git a/android/app/proguard-rules.pro b/app/android/app/proguard-rules.pro
similarity index 100%
rename from android/app/proguard-rules.pro
rename to app/android/app/proguard-rules.pro
diff --git a/android/app/src/debug/AndroidManifest.xml b/app/android/app/src/debug/AndroidManifest.xml
similarity index 100%
rename from android/app/src/debug/AndroidManifest.xml
rename to app/android/app/src/debug/AndroidManifest.xml
diff --git a/android/app/src/debug/java/org/arianne/stendhal/client/DebugLog.java b/app/android/app/src/debug/java/org/arianne/stendhal/client/DebugLog.java
similarity index 100%
rename from android/app/src/debug/java/org/arianne/stendhal/client/DebugLog.java
rename to app/android/app/src/debug/java/org/arianne/stendhal/client/DebugLog.java
diff --git a/android/app/src/debug/res/values/strings.xml b/app/android/app/src/debug/res/values/strings.xml
similarity index 100%
rename from android/app/src/debug/res/values/strings.xml
rename to app/android/app/src/debug/res/values/strings.xml
diff --git a/android/app/src/main/AndroidManifest.xml b/app/android/app/src/main/AndroidManifest.xml
similarity index 100%
rename from android/app/src/main/AndroidManifest.xml
rename to app/android/app/src/main/AndroidManifest.xml
diff --git a/android/app/src/main/ic_launcher-playstore.png b/app/android/app/src/main/ic_launcher-playstore.png
similarity index 100%
rename from android/app/src/main/ic_launcher-playstore.png
rename to app/android/app/src/main/ic_launcher-playstore.png
diff --git a/android/app/src/main/java/org/arianne/stendhal/client/ClientView.java b/app/android/app/src/main/java/org/arianne/stendhal/client/ClientView.java
similarity index 100%
rename from android/app/src/main/java/org/arianne/stendhal/client/ClientView.java
rename to app/android/app/src/main/java/org/arianne/stendhal/client/ClientView.java
diff --git a/android/app/src/main/java/org/arianne/stendhal/client/DownloadHandler.java b/app/android/app/src/main/java/org/arianne/stendhal/client/DownloadHandler.java
similarity index 100%
rename from android/app/src/main/java/org/arianne/stendhal/client/DownloadHandler.java
rename to app/android/app/src/main/java/org/arianne/stendhal/client/DownloadHandler.java
diff --git a/android/app/src/main/java/org/arianne/stendhal/client/MainActivity.java b/app/android/app/src/main/java/org/arianne/stendhal/client/MainActivity.java
similarity index 100%
rename from android/app/src/main/java/org/arianne/stendhal/client/MainActivity.java
rename to app/android/app/src/main/java/org/arianne/stendhal/client/MainActivity.java
diff --git a/android/app/src/main/java/org/arianne/stendhal/client/Menu.java b/app/android/app/src/main/java/org/arianne/stendhal/client/Menu.java
similarity index 100%
rename from android/app/src/main/java/org/arianne/stendhal/client/Menu.java
rename to app/android/app/src/main/java/org/arianne/stendhal/client/Menu.java
diff --git a/android/app/src/main/java/org/arianne/stendhal/client/Notifier.java b/app/android/app/src/main/java/org/arianne/stendhal/client/Notifier.java
similarity index 100%
rename from android/app/src/main/java/org/arianne/stendhal/client/Notifier.java
rename to app/android/app/src/main/java/org/arianne/stendhal/client/Notifier.java
diff --git a/android/app/src/main/java/org/arianne/stendhal/client/PageId.java b/app/android/app/src/main/java/org/arianne/stendhal/client/PageId.java
similarity index 100%
rename from android/app/src/main/java/org/arianne/stendhal/client/PageId.java
rename to app/android/app/src/main/java/org/arianne/stendhal/client/PageId.java
diff --git a/android/app/src/main/java/org/arianne/stendhal/client/PreferencesActivity.java b/app/android/app/src/main/java/org/arianne/stendhal/client/PreferencesActivity.java
similarity index 100%
rename from android/app/src/main/java/org/arianne/stendhal/client/PreferencesActivity.java
rename to app/android/app/src/main/java/org/arianne/stendhal/client/PreferencesActivity.java
diff --git a/android/app/src/main/java/org/arianne/stendhal/client/js/JSInterface.java b/app/android/app/src/main/java/org/arianne/stendhal/client/js/JSInterface.java
similarity index 100%
rename from android/app/src/main/java/org/arianne/stendhal/client/js/JSInterface.java
rename to app/android/app/src/main/java/org/arianne/stendhal/client/js/JSInterface.java
diff --git a/android/app/src/main/java/org/arianne/stendhal/client/sound/MusicPlayer.java b/app/android/app/src/main/java/org/arianne/stendhal/client/sound/MusicPlayer.java
similarity index 100%
rename from android/app/src/main/java/org/arianne/stendhal/client/sound/MusicPlayer.java
rename to app/android/app/src/main/java/org/arianne/stendhal/client/sound/MusicPlayer.java
diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/android/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_launcher_foreground.xml
rename to app/android/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/android/app/src/main/res/drawable/splash.jpg b/app/android/app/src/main/res/drawable/splash.jpg
similarity index 100%
rename from android/app/src/main/res/drawable/splash.jpg
rename to app/android/app/src/main/res/drawable/splash.jpg
diff --git a/android/app/src/main/res/layout/activity_main.xml b/app/android/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from android/app/src/main/res/layout/activity_main.xml
rename to app/android/app/src/main/res/layout/activity_main.xml
diff --git a/android/app/src/main/res/layout/activity_preferences.xml b/app/android/app/src/main/res/layout/activity_preferences.xml
similarity index 100%
rename from android/app/src/main/res/layout/activity_preferences.xml
rename to app/android/app/src/main/res/layout/activity_preferences.xml
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from android/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/raw/title_01.ogg b/app/android/app/src/main/res/raw/title_01.ogg
similarity index 100%
rename from android/app/src/main/res/raw/title_01.ogg
rename to app/android/app/src/main/res/raw/title_01.ogg
diff --git a/android/app/src/main/res/raw/title_02.ogg b/app/android/app/src/main/res/raw/title_02.ogg
similarity index 100%
rename from android/app/src/main/res/raw/title_02.ogg
rename to app/android/app/src/main/res/raw/title_02.ogg
diff --git a/android/app/src/main/res/raw/title_03.ogg b/app/android/app/src/main/res/raw/title_03.ogg
similarity index 100%
rename from android/app/src/main/res/raw/title_03.ogg
rename to app/android/app/src/main/res/raw/title_03.ogg
diff --git a/android/app/src/main/res/raw/title_04.ogg b/app/android/app/src/main/res/raw/title_04.ogg
similarity index 100%
rename from android/app/src/main/res/raw/title_04.ogg
rename to app/android/app/src/main/res/raw/title_04.ogg
diff --git a/android/app/src/main/res/raw/title_05.ogg b/app/android/app/src/main/res/raw/title_05.ogg
similarity index 100%
rename from android/app/src/main/res/raw/title_05.ogg
rename to app/android/app/src/main/res/raw/title_05.ogg
diff --git a/android/app/src/main/res/values-night/themes.xml b/app/android/app/src/main/res/values-night/themes.xml
similarity index 100%
rename from android/app/src/main/res/values-night/themes.xml
rename to app/android/app/src/main/res/values-night/themes.xml
diff --git a/android/app/src/main/res/values/array.xml b/app/android/app/src/main/res/values/array.xml
similarity index 100%
rename from android/app/src/main/res/values/array.xml
rename to app/android/app/src/main/res/values/array.xml
diff --git a/android/app/src/main/res/values/colors.xml b/app/android/app/src/main/res/values/colors.xml
similarity index 100%
rename from android/app/src/main/res/values/colors.xml
rename to app/android/app/src/main/res/values/colors.xml
diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/app/android/app/src/main/res/values/ic_launcher_background.xml
similarity index 100%
rename from android/app/src/main/res/values/ic_launcher_background.xml
rename to app/android/app/src/main/res/values/ic_launcher_background.xml
diff --git a/android/app/src/main/res/values/strings.xml b/app/android/app/src/main/res/values/strings.xml
similarity index 100%
rename from android/app/src/main/res/values/strings.xml
rename to app/android/app/src/main/res/values/strings.xml
diff --git a/android/app/src/main/res/values/themes.xml b/app/android/app/src/main/res/values/themes.xml
similarity index 100%
rename from android/app/src/main/res/values/themes.xml
rename to app/android/app/src/main/res/values/themes.xml
diff --git a/android/app/src/main/res/xml/preferences.xml b/app/android/app/src/main/res/xml/preferences.xml
similarity index 100%
rename from android/app/src/main/res/xml/preferences.xml
rename to app/android/app/src/main/res/xml/preferences.xml
diff --git a/android/app/src/shared/java/org/arianne/stendhal/client/DebugLog.java b/app/android/app/src/shared/java/org/arianne/stendhal/client/DebugLog.java
similarity index 100%
rename from android/app/src/shared/java/org/arianne/stendhal/client/DebugLog.java
rename to app/android/app/src/shared/java/org/arianne/stendhal/client/DebugLog.java
diff --git a/android/build.gradle b/app/android/build.gradle
similarity index 100%
rename from android/build.gradle
rename to app/android/build.gradle
diff --git a/android/gradle.properties b/app/android/gradle.properties
similarity index 100%
rename from android/gradle.properties
rename to app/android/gradle.properties
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/app/android/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from android/gradle/wrapper/gradle-wrapper.jar
rename to app/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from android/gradle/wrapper/gradle-wrapper.properties
rename to app/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/gradlew b/app/android/gradlew
similarity index 100%
rename from android/gradlew
rename to app/android/gradlew
diff --git a/android/gradlew.bat b/app/android/gradlew.bat
similarity index 100%
rename from android/gradlew.bat
rename to app/android/gradlew.bat
diff --git a/android/launcher_icon.xcf b/app/android/launcher_icon.xcf
similarity index 100%
rename from android/launcher_icon.xcf
rename to app/android/launcher_icon.xcf
diff --git a/android/settings.gradle b/app/android/settings.gradle
similarity index 100%
rename from android/settings.gradle
rename to app/android/settings.gradle
diff --git a/buildtools/ant_modules/dist.xml b/buildtools/ant_modules/dist.xml
index 4ffe91d06b..62856d6c6c 100644
--- a/buildtools/ant_modules/dist.xml
+++ b/buildtools/ant_modules/dist.xml
@@ -851,11 +851,11 @@
     <condition property="gradlew.exec" value="cmd">
       <os family="windows"/>
     </condition>
-    <condition property="gradlew.script" value="/c &quot;${user.dir}/android/gradlew.bat&quot;">
+    <condition property="gradlew.script" value="/c &quot;${user.dir}/app/android/gradlew.bat&quot;">
       <os family="windows"/>
     </condition>
     <property name="gradlew.exec" value="sh"/>
-    <property name="gradlew.script" value="&quot;${user.dir}/android/gradlew&quot;"/>
+    <property name="gradlew.script" value="&quot;${user.dir}/app/android/gradlew&quot;"/>
 
     <echo
       if:set="exclude.webview"
@@ -889,7 +889,7 @@
     </condition>
 
     <exec unless:set="exclude.webview" failonerror="true"
-        executable="${gradlew.exec}" dir="android/">
+        executable="${gradlew.exec}" dir="app/android/">
       <arg line="${gradlew.script}"/>
       <arg if:set="gradle.params" line="${gradle.params}"/>
       <arg if:set="android.build_wout_rev" value="${android.build}"/>