diff --git a/android/app/build.gradle b/android/app/build.gradle
index ad9df34..a800098 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -84,3 +84,19 @@ flutter {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
+
+// Change version codes of split APKs to be together
+// By default they are increments of 1000, e.g. when the versionCode is 19, then 1019 is is ARMv7a, 2019 is ARM64 v8a, 3019 is x86 and 4019 is x64
+// We change it to 190 for a non split apk, 191 for ARMv7a, 192 for AARM64 v8a, 193 for x86 and 194 for x64
+ext.abiCodes = ["armeabi-v7a": 1, "arm64-v8a": 2, "x86": 3, "x86_64": 4]
+import com.android.build.OutputFile
+android.applicationVariants.all { variant ->
+    variant.outputs.each { output ->
+        def abiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
+        if (abiVersionCode == null) {
+            // Probably a non-split APK
+            abiVersionCode = 0
+        }
+        output.versionCodeOverride = variant.versionCode * 10 + abiVersionCode
+    }
+}
diff --git a/metadata/en-US/changelogs/4019.txt b/metadata/en-US/changelogs/194.txt
similarity index 100%
rename from metadata/en-US/changelogs/4019.txt
rename to metadata/en-US/changelogs/194.txt
diff --git a/metadata/en-US/icon.png b/metadata/en-US/images/icon.png
similarity index 100%
rename from metadata/en-US/icon.png
rename to metadata/en-US/images/icon.png
diff --git a/metadata/en-US/phoneScreenshots/1-music-playback.png b/metadata/en-US/images/phoneScreenshots/1-music-playback.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/1-music-playback.png
rename to metadata/en-US/images/phoneScreenshots/1-music-playback.png
diff --git a/metadata/en-US/phoneScreenshots/2-home-screen.png b/metadata/en-US/images/phoneScreenshots/2-home-screen.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/2-home-screen.png
rename to metadata/en-US/images/phoneScreenshots/2-home-screen.png
diff --git a/metadata/en-US/phoneScreenshots/3-search.png b/metadata/en-US/images/phoneScreenshots/3-search.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/3-search.png
rename to metadata/en-US/images/phoneScreenshots/3-search.png
diff --git a/metadata/en-US/phoneScreenshots/4-library.png b/metadata/en-US/images/phoneScreenshots/4-library.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/4-library.png
rename to metadata/en-US/images/phoneScreenshots/4-library.png
diff --git a/metadata/en-US/phoneScreenshots/5-lyrics.png b/metadata/en-US/images/phoneScreenshots/5-lyrics.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/5-lyrics.png
rename to metadata/en-US/images/phoneScreenshots/5-lyrics.png
diff --git a/metadata/en-US/phoneScreenshots/6-song-management.png b/metadata/en-US/images/phoneScreenshots/6-song-management.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/6-song-management.png
rename to metadata/en-US/images/phoneScreenshots/6-song-management.png
diff --git a/metadata/en-US/phoneScreenshots/7-mobile-experience.png b/metadata/en-US/images/phoneScreenshots/7-mobile-experience.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/7-mobile-experience.png
rename to metadata/en-US/images/phoneScreenshots/7-mobile-experience.png