diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 50dab0db1c7..107dc502fcc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ exclude: |
     .*thirdparty/.*|
     .*-(dll|dylib|so)_wrap\.[ch]|
     platform/android/java/editor/src/main/java/com/android/.*|
-    platform/android/java/lib/src/com/google/.*
+    platform/android/java/lib/src/main/java/com/google/.*
   )$
 
 repos:
@@ -148,9 +148,9 @@ repos:
           (?x)^(
             core/math/bvh_.*\.inc|
             platform/(?!android|ios|linuxbsd|macos|web|windows)\w+/.*|
-            platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView\.java|
-            platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper\.java|
-            platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix\.java
+            platform/android/java/lib/src/main/java/org/godotengine/godot/gl/GLSurfaceView\.java|
+            platform/android/java/lib/src/main/java/org/godotengine/godot/gl/EGLLogWrapper\.java|
+            platform/android/java/lib/src/main/java/org/godotengine/godot/utils/ProcessPhoenix\.java
           )$
 
       - id: header-guards
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index c77aa15c6c0..41f10df1f1e 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -123,17 +123,17 @@ Copyright: 2020, Manuel Prandini
 License: Expat
 
 Files: platform/android/java/editor/src/main/java/com/android/*
- platform/android/java/lib/aidl/com/android/*
- platform/android/java/lib/res/layout/status_bar_ongoing_event_progress_bar.xml
- platform/android/java/lib/src/com/google/android/*
- platform/android/java/lib/src/org/godotengine/godot/input/InputManagerCompat.java
- platform/android/java/lib/src/org/godotengine/godot/input/InputManagerV16.java
+ platform/android/java/lib/src/main/aidl/com/android/*
+ platform/android/java/lib/src/main/res/layout/status_bar_ongoing_event_progress_bar.xml
+ platform/android/java/lib/src/main/java/com/google/android/*
+ platform/android/java/lib/src/main/java/org/godotengine/godot/input/InputManagerCompat.java
+ platform/android/java/lib/src/main/java/org/godotengine/godot/input/InputManagerV16.java
 Comment: The Android Open Source Project
 Copyright: 2008-2016, The Android Open Source Project
  2002, Google, Inc.
 License: Apache-2.0
 
-Files: platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.java
+Files: platform/android/java/lib/src/main/java/org/godotengine/godot/utils/ProcessPhoenix.java
 Comment: ProcessPhoenix
 Copyright: 2015, Jake Wharton
 License: Apache-2.0
diff --git a/core/error/error_list.h b/core/error/error_list.h
index cdc31ecd586..002e80cb723 100644
--- a/core/error/error_list.h
+++ b/core/error/error_list.h
@@ -40,7 +40,7 @@
  * - Are added to the Error enum in core/error/error_list.h
  * - Have a description added to error_names in core/error/error_list.cpp
  * - Are bound with BIND_CORE_ENUM_CONSTANT() in core/core_constants.cpp
- * - Have a matching Android version in platform/android/java/lib/src/org/godotengine/godot/error/Error.kt
+ * - Have a matching Android version in platform/android/java/lib/src/main/java/org/godotengine/godot/error/Error.kt
  */
 
 enum Error {
diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp
index 12770c5b2e6..b22d84f3fc7 100644
--- a/platform/android/export/export_plugin.cpp
+++ b/platform/android/export/export_plugin.cpp
@@ -220,7 +220,7 @@ static const char *MISMATCHED_VERSIONS_MESSAGE = "Android build version mismatch
 
 static const char *GDEXTENSION_LIBS_PATH = "libs/gdextensionlibs.json";
 
-// This template string must be in sync with the content of 'platform/android/java/lib/res/mipmap-anydpi-v26/icon.xml'.
+// This template string must be in sync with the content of 'platform/android/java/lib/src/main/java/res/mipmap-anydpi-v26/icon.xml'.
 static const String ICON_XML_TEMPLATE =
 		"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
 		"<adaptive-icon xmlns:android=\"http://schemas.android.com/apk/res/android\">\n"
@@ -277,7 +277,7 @@ static const LauncherIcon LAUNCHER_ADAPTIVE_ICON_MONOCHROMES[ICON_DENSITIES_COUN
 static const int EXPORT_FORMAT_APK = 0;
 static const int EXPORT_FORMAT_AAB = 1;
 
-static const char *APK_ASSETS_DIRECTORY = "assets";
+static const char *APK_ASSETS_DIRECTORY = "src/main/assets";
 static const char *AAB_ASSETS_DIRECTORY = "assetPackInstallTime/src/main/assets";
 
 static const int DEFAULT_MIN_SDK_VERSION = 24; // Should match the value in 'platform/android/java/app/config.gradle#minSdk'
diff --git a/platform/android/export/gradle_export_util.h b/platform/android/export/gradle_export_util.h
index 8ba70102c19..ea5aabfb92f 100644
--- a/platform/android/export/gradle_export_util.h
+++ b/platform/android/export/gradle_export_util.h
@@ -59,7 +59,7 @@ static const int APP_CATEGORY_VIDEO = 8;
 static const int APP_CATEGORY_UNDEFINED = 9;
 
 // Supported XR modes.
-// This should match the entries in 'platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java'
+// This should match the entries in 'platform/android/java/lib/src/main/java/org/godotengine/godot/xr/XRMode.java'
 static const int XR_MODE_REGULAR = 0;
 static const int XR_MODE_OPENXR = 1;
 
diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle
index b0155879e2d..5d90a495254 100644
--- a/platform/android/java/app/build.gradle
+++ b/platform/android/java/app/build.gradle
@@ -221,16 +221,10 @@ android {
     }
 
     sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            res.srcDirs = ['res']
-            aidl.srcDirs = ['aidl']
-            assets.srcDirs = ['assets']
-        }
-        debug.jniLibs.srcDirs = ['libs/debug', 'libs/debug/vulkan_validation_layers']
-        dev.jniLibs.srcDirs = ['libs/dev']
-        release.jniLibs.srcDirs = ['libs/release']
+        main.res.srcDirs += ['res']
+        debug.jniLibs.srcDirs += ['libs/debug', 'libs/debug/vulkan_validation_layers']
+        dev.jniLibs.srcDirs += ['libs/dev']
+        release.jniLibs.srcDirs += ['libs/release']
     }
 
     applicationVariants.all { variant ->
diff --git a/platform/android/java/app/AndroidManifest.xml b/platform/android/java/app/src/main/AndroidManifest.xml
similarity index 100%
rename from platform/android/java/app/AndroidManifest.xml
rename to platform/android/java/app/src/main/AndroidManifest.xml
diff --git a/platform/android/java/app/assets/.gitignore b/platform/android/java/app/src/main/assets/.gitignore
similarity index 100%
rename from platform/android/java/app/assets/.gitignore
rename to platform/android/java/app/src/main/assets/.gitignore
diff --git a/platform/android/java/app/src/com/godot/game/GodotApp.java b/platform/android/java/app/src/main/java/com/godot/game/GodotApp.java
similarity index 100%
rename from platform/android/java/app/src/com/godot/game/GodotApp.java
rename to platform/android/java/app/src/main/java/com/godot/game/GodotApp.java
diff --git a/platform/android/java/lib/build.gradle b/platform/android/java/lib/build.gradle
index 472a9296086..950cfccaece 100644
--- a/platform/android/java/lib/build.gradle
+++ b/platform/android/java/lib/build.gradle
@@ -77,23 +77,14 @@ android {
     }
 
     sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            test.java.srcDirs = ['srcTest/java']
-            res.srcDirs = ['res']
-            aidl.srcDirs = ['aidl']
-            assets.srcDirs = ['assets']
-        }
-
-        debug.jniLibs.srcDirs = ['libs/debug']
-        dev.jniLibs.srcDirs = ['libs/dev']
-        release.jniLibs.srcDirs = ['libs/release']
+        debug.jniLibs.srcDirs += ['libs/debug']
+        dev.jniLibs.srcDirs += ['libs/dev']
+        release.jniLibs.srcDirs += ['libs/release']
 
         // Editor jni library
-        editorRelease.jniLibs.srcDirs = ['libs/tools/release']
-        editorDebug.jniLibs.srcDirs = ['libs/tools/debug']
-        editorDev.jniLibs.srcDirs = ['libs/tools/dev']
+        editorRelease.jniLibs.srcDirs += ['libs/tools/release']
+        editorDebug.jniLibs.srcDirs += ['libs/tools/debug']
+        editorDev.jniLibs.srcDirs += ['libs/tools/dev']
     }
 
     libraryVariants.all { variant ->
diff --git a/platform/android/java/lib/AndroidManifest.xml b/platform/android/java/lib/src/main/AndroidManifest.xml
similarity index 100%
rename from platform/android/java/lib/AndroidManifest.xml
rename to platform/android/java/lib/src/main/AndroidManifest.xml
diff --git a/platform/android/java/lib/aidl/com/android/vending/licensing/ILicenseResultListener.aidl b/platform/android/java/lib/src/main/aidl/com/android/vending/licensing/ILicenseResultListener.aidl
similarity index 100%
rename from platform/android/java/lib/aidl/com/android/vending/licensing/ILicenseResultListener.aidl
rename to platform/android/java/lib/src/main/aidl/com/android/vending/licensing/ILicenseResultListener.aidl
diff --git a/platform/android/java/lib/aidl/com/android/vending/licensing/ILicensingService.aidl b/platform/android/java/lib/src/main/aidl/com/android/vending/licensing/ILicensingService.aidl
similarity index 100%
rename from platform/android/java/lib/aidl/com/android/vending/licensing/ILicensingService.aidl
rename to platform/android/java/lib/src/main/aidl/com/android/vending/licensing/ILicensingService.aidl
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Constants.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/Constants.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Constants.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/Constants.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/DownloadProgressInfo.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/DownloadProgressInfo.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/DownloadProgressInfo.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/DownloadProgressInfo.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/DownloaderClientMarshaller.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/DownloaderClientMarshaller.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/DownloaderClientMarshaller.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/DownloaderClientMarshaller.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/DownloaderServiceMarshaller.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/DownloaderServiceMarshaller.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/DownloaderServiceMarshaller.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/DownloaderServiceMarshaller.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/Helpers.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/Helpers.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/IDownloaderClient.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/IDownloaderClient.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/IDownloaderClient.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/IDownloaderClient.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/IDownloaderService.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/IDownloaderService.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/IDownloaderService.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/IDownloaderService.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/IStub.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/IStub.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/IStub.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/IStub.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/SystemFacade.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/SystemFacade.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/SystemFacade.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/SystemFacade.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/CustomIntentService.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/impl/CustomIntentService.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/CustomIntentService.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/impl/CustomIntentService.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadInfo.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/impl/DownloadInfo.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadInfo.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/impl/DownloadInfo.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadThread.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/impl/DownloadThread.java
similarity index 99%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadThread.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/impl/DownloadThread.java
index c114b8a64a5..d11d1585d45 100644
--- a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadThread.java
+++ b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/impl/DownloadThread.java
@@ -110,7 +110,7 @@ public class DownloadThread {
      * headers, or destination filename.
      */
     private class StopRequest extends Throwable {
-    	
+
         private static final long serialVersionUID = 6338592678988347973L;
         public int mFinalStatus;
 
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloaderService.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/impl/DownloaderService.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloaderService.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/impl/DownloaderService.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadsDB.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/impl/DownloadsDB.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadsDB.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/impl/DownloadsDB.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/HttpDateTime.java b/platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/impl/HttpDateTime.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/HttpDateTime.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/expansion/downloader/impl/HttpDateTime.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/AESObfuscator.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/AESObfuscator.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/AESObfuscator.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/AESObfuscator.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/APKExpansionPolicy.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/APKExpansionPolicy.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/APKExpansionPolicy.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/APKExpansionPolicy.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/DeviceLimiter.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/DeviceLimiter.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/DeviceLimiter.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/DeviceLimiter.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/LicenseChecker.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/LicenseChecker.java
similarity index 99%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/LicenseChecker.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/LicenseChecker.java
index 15017b34258..193fd41258f 100644
--- a/platform/android/java/lib/src/com/google/android/vending/licensing/LicenseChecker.java
+++ b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/LicenseChecker.java
@@ -133,7 +133,7 @@ public class LicenseChecker implements ServiceConnection {
      * <p>
      * source string: "com.android.vending.licensing.ILicensingService"
      * <p>
-     * 
+     *
      * @param callback
      */
     public synchronized void checkAccess(LicenseCheckerCallback callback) {
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/LicenseCheckerCallback.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/LicenseCheckerCallback.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/LicenseCheckerCallback.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/LicenseCheckerCallback.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/LicenseValidator.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/LicenseValidator.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/LicenseValidator.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/LicenseValidator.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/NullDeviceLimiter.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/NullDeviceLimiter.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/NullDeviceLimiter.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/NullDeviceLimiter.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/Obfuscator.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/Obfuscator.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/Obfuscator.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/Obfuscator.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/Policy.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/Policy.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/Policy.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/Policy.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/PreferenceObfuscator.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/PreferenceObfuscator.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/PreferenceObfuscator.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/PreferenceObfuscator.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/ResponseData.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/ResponseData.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/ResponseData.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/ResponseData.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/ServerManagedPolicy.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/ServerManagedPolicy.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/ServerManagedPolicy.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/ServerManagedPolicy.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/StrictPolicy.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/StrictPolicy.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/StrictPolicy.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/StrictPolicy.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/ValidationException.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/ValidationException.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/ValidationException.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/ValidationException.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/util/Base64.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/util/Base64.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64DecoderException.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/util/Base64DecoderException.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64DecoderException.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/util/Base64DecoderException.java
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/util/URIQueryDecoder.java b/platform/android/java/lib/src/main/java/com/google/android/vending/licensing/util/URIQueryDecoder.java
similarity index 100%
rename from platform/android/java/lib/src/com/google/android/vending/licensing/util/URIQueryDecoder.java
rename to platform/android/java/lib/src/main/java/com/google/android/vending/licensing/util/URIQueryDecoder.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/Dictionary.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/Dictionary.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/Dictionary.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/Dictionary.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/FullScreenGodotApp.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/FullScreenGodotApp.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/Godot.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/Godot.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/Godot.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotActivity.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/GodotActivity.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotDownloaderAlarmReceiver.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/GodotDownloaderAlarmReceiver.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotDownloaderService.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/GodotDownloaderService.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotFragment.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/GodotFragment.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotGLRenderView.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotGLRenderView.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/GodotGLRenderView.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/GodotGLRenderView.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotHost.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotHost.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/GodotHost.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/GodotHost.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotIO.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotIO.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/GodotIO.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/GodotIO.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotLib.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/GodotLib.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/GodotLib.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotRenderView.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotRenderView.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/GodotRenderView.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/GodotRenderView.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotVulkanRenderView.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotVulkanRenderView.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/GodotVulkanRenderView.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/GodotVulkanRenderView.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/editor/utils/EditorUtils.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/editor/utils/EditorUtils.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/editor/utils/EditorUtils.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/editor/utils/EditorUtils.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/editor/utils/GameMenuUtils.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/editor/utils/GameMenuUtils.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/editor/utils/GameMenuUtils.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/editor/utils/GameMenuUtils.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/error/Error.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/error/Error.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/error/Error.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/error/Error.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/gl/EGLLogWrapper.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/gl/EGLLogWrapper.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/gl/GLSurfaceView.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/gl/GLSurfaceView.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/gl/GodotRenderer.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/gl/GodotRenderer.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotEditText.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotEditText.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotGestureHandler.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotGestureHandler.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotInputHandler.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotInputHandler.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotTextInputWrapper.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotTextInputWrapper.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/input/GodotTextInputWrapper.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotTextInputWrapper.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/InputEventRunnable.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/input/InputEventRunnable.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/input/InputEventRunnable.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/input/InputEventRunnable.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/Joystick.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/input/Joystick.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/input/Joystick.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/input/Joystick.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/FilePicker.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/io/FilePicker.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/io/FilePicker.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/io/FilePicker.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/io/StorageScope.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/io/StorageScope.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/directory/AssetsDirectoryAccess.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/io/directory/AssetsDirectoryAccess.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/io/directory/AssetsDirectoryAccess.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/io/directory/AssetsDirectoryAccess.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/directory/DirectoryAccessHandler.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/io/directory/DirectoryAccessHandler.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/io/directory/DirectoryAccessHandler.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/io/directory/DirectoryAccessHandler.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/directory/FilesystemDirectoryAccess.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/io/directory/FilesystemDirectoryAccess.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/io/directory/FilesystemDirectoryAccess.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/io/directory/FilesystemDirectoryAccess.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/AssetData.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/AssetData.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/io/file/AssetData.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/AssetData.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/DataAccess.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/DataAccess.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessFlags.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/FileAccessFlags.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessFlags.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/FileAccessFlags.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/FileAccessHandler.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/FileAccessHandler.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileData.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/FileData.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/io/file/FileData.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/FileData.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/MediaStoreData.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/MediaStoreData.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/io/file/MediaStoreData.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/MediaStoreData.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/AndroidRuntimePlugin.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/plugin/AndroidRuntimePlugin.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/plugin/AndroidRuntimePlugin.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/plugin/AndroidRuntimePlugin.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPlugin.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/plugin/GodotPlugin.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPlugin.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/plugin/GodotPlugin.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/plugin/GodotPluginRegistry.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/plugin/GodotPluginRegistry.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/plugin/SignalInfo.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/plugin/SignalInfo.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/UsedByGodot.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/plugin/UsedByGodot.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/plugin/UsedByGodot.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/plugin/UsedByGodot.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/service/GodotService.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/service/GodotService.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/service/GodotService.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/service/GodotService.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/service/RemoteGodotFragment.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/service/RemoteGodotFragment.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/service/RemoteGodotFragment.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/service/RemoteGodotFragment.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/tts/GodotTTS.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/tts/GodotTTS.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/tts/GodotTTS.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/tts/GodotTTS.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/tts/GodotUtterance.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/tts/GodotUtterance.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/tts/GodotUtterance.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/tts/GodotUtterance.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/BenchmarkUtils.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/utils/BenchmarkUtils.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/utils/BenchmarkUtils.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/utils/BenchmarkUtils.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/CommandLineFileParser.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/utils/CommandLineFileParser.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/utils/CommandLineFileParser.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/utils/CommandLineFileParser.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/Crypt.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/utils/Crypt.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/utils/Crypt.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/utils/Crypt.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/DeviceUtils.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/utils/DeviceUtils.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/utils/DeviceUtils.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/utils/DeviceUtils.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/DialogUtils.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/utils/DialogUtils.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/utils/DialogUtils.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/utils/DialogUtils.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/GLUtils.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/utils/GLUtils.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/utils/GLUtils.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/utils/GLUtils.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/GodotNetUtils.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/utils/GodotNetUtils.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/utils/GodotNetUtils.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/utils/GodotNetUtils.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/utils/PermissionsUtil.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/utils/PermissionsUtil.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/utils/ProcessPhoenix.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/utils/ProcessPhoenix.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/variant/Callable.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/variant/Callable.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/variant/Callable.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/variant/Callable.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/vulkan/VkRenderer.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/vulkan/VkRenderer.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkSurfaceView.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/vulkan/VkSurfaceView.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/vulkan/VkSurfaceView.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/vulkan/VkSurfaceView.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkThread.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/vulkan/VkThread.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/vulkan/VkThread.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/vulkan/VkThread.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/HybridAppUtils.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/xr/HybridAppUtils.kt
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/xr/HybridAppUtils.kt
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/xr/HybridAppUtils.kt
diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/xr/XRMode.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/xr/XRMode.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrConfigChooser.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/xr/ovr/OvrConfigChooser.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrConfigChooser.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/xr/ovr/OvrConfigChooser.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrContextFactory.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/xr/ovr/OvrContextFactory.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrContextFactory.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/xr/ovr/OvrContextFactory.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrWindowSurfaceFactory.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/xr/ovr/OvrWindowSurfaceFactory.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrWindowSurfaceFactory.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/xr/ovr/OvrWindowSurfaceFactory.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularConfigChooser.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/xr/regular/RegularConfigChooser.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularConfigChooser.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/xr/regular/RegularConfigChooser.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularContextFactory.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/xr/regular/RegularContextFactory.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularContextFactory.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/xr/regular/RegularContextFactory.java
diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularFallbackConfigChooser.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/xr/regular/RegularFallbackConfigChooser.java
similarity index 100%
rename from platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularFallbackConfigChooser.java
rename to platform/android/java/lib/src/main/java/org/godotengine/godot/xr/regular/RegularFallbackConfigChooser.java
diff --git a/platform/android/java/lib/res/layout/downloading_expansion.xml b/platform/android/java/lib/src/main/res/layout/downloading_expansion.xml
similarity index 100%
rename from platform/android/java/lib/res/layout/downloading_expansion.xml
rename to platform/android/java/lib/src/main/res/layout/downloading_expansion.xml
diff --git a/platform/android/java/lib/res/layout/godot_app_layout.xml b/platform/android/java/lib/src/main/res/layout/godot_app_layout.xml
similarity index 100%
rename from platform/android/java/lib/res/layout/godot_app_layout.xml
rename to platform/android/java/lib/src/main/res/layout/godot_app_layout.xml
diff --git a/platform/android/java/lib/res/layout/remote_godot_fragment_layout.xml b/platform/android/java/lib/src/main/res/layout/remote_godot_fragment_layout.xml
similarity index 100%
rename from platform/android/java/lib/res/layout/remote_godot_fragment_layout.xml
rename to platform/android/java/lib/src/main/res/layout/remote_godot_fragment_layout.xml
diff --git a/platform/android/java/lib/res/layout/snackbar.xml b/platform/android/java/lib/src/main/res/layout/snackbar.xml
similarity index 100%
rename from platform/android/java/lib/res/layout/snackbar.xml
rename to platform/android/java/lib/src/main/res/layout/snackbar.xml
diff --git a/platform/android/java/lib/res/layout/status_bar_ongoing_event_progress_bar.xml b/platform/android/java/lib/src/main/res/layout/status_bar_ongoing_event_progress_bar.xml
similarity index 100%
rename from platform/android/java/lib/res/layout/status_bar_ongoing_event_progress_bar.xml
rename to platform/android/java/lib/src/main/res/layout/status_bar_ongoing_event_progress_bar.xml
diff --git a/platform/android/java/lib/res/mipmap-anydpi-v26/icon.xml b/platform/android/java/lib/src/main/res/mipmap-anydpi-v26/icon.xml
similarity index 100%
rename from platform/android/java/lib/res/mipmap-anydpi-v26/icon.xml
rename to platform/android/java/lib/src/main/res/mipmap-anydpi-v26/icon.xml
diff --git a/platform/android/java/lib/res/mipmap-anydpi-v26/themed_icon.xml b/platform/android/java/lib/src/main/res/mipmap-anydpi-v26/themed_icon.xml
similarity index 100%
rename from platform/android/java/lib/res/mipmap-anydpi-v26/themed_icon.xml
rename to platform/android/java/lib/src/main/res/mipmap-anydpi-v26/themed_icon.xml
diff --git a/platform/android/java/lib/res/mipmap-hdpi/icon.webp b/platform/android/java/lib/src/main/res/mipmap-hdpi/icon.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-hdpi/icon.webp
rename to platform/android/java/lib/src/main/res/mipmap-hdpi/icon.webp
diff --git a/platform/android/java/lib/res/mipmap-hdpi/icon_background.webp b/platform/android/java/lib/src/main/res/mipmap-hdpi/icon_background.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-hdpi/icon_background.webp
rename to platform/android/java/lib/src/main/res/mipmap-hdpi/icon_background.webp
diff --git a/platform/android/java/lib/res/mipmap-hdpi/icon_foreground.webp b/platform/android/java/lib/src/main/res/mipmap-hdpi/icon_foreground.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-hdpi/icon_foreground.webp
rename to platform/android/java/lib/src/main/res/mipmap-hdpi/icon_foreground.webp
diff --git a/platform/android/java/lib/res/mipmap-hdpi/icon_monochrome.webp b/platform/android/java/lib/src/main/res/mipmap-hdpi/icon_monochrome.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-hdpi/icon_monochrome.webp
rename to platform/android/java/lib/src/main/res/mipmap-hdpi/icon_monochrome.webp
diff --git a/platform/android/java/lib/res/mipmap-mdpi/icon.webp b/platform/android/java/lib/src/main/res/mipmap-mdpi/icon.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-mdpi/icon.webp
rename to platform/android/java/lib/src/main/res/mipmap-mdpi/icon.webp
diff --git a/platform/android/java/lib/res/mipmap-mdpi/icon_background.webp b/platform/android/java/lib/src/main/res/mipmap-mdpi/icon_background.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-mdpi/icon_background.webp
rename to platform/android/java/lib/src/main/res/mipmap-mdpi/icon_background.webp
diff --git a/platform/android/java/lib/res/mipmap-mdpi/icon_foreground.webp b/platform/android/java/lib/src/main/res/mipmap-mdpi/icon_foreground.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-mdpi/icon_foreground.webp
rename to platform/android/java/lib/src/main/res/mipmap-mdpi/icon_foreground.webp
diff --git a/platform/android/java/lib/res/mipmap-mdpi/icon_monochrome.webp b/platform/android/java/lib/src/main/res/mipmap-mdpi/icon_monochrome.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-mdpi/icon_monochrome.webp
rename to platform/android/java/lib/src/main/res/mipmap-mdpi/icon_monochrome.webp
diff --git a/platform/android/java/lib/res/mipmap-xhdpi/icon.webp b/platform/android/java/lib/src/main/res/mipmap-xhdpi/icon.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-xhdpi/icon.webp
rename to platform/android/java/lib/src/main/res/mipmap-xhdpi/icon.webp
diff --git a/platform/android/java/lib/res/mipmap-xhdpi/icon_background.webp b/platform/android/java/lib/src/main/res/mipmap-xhdpi/icon_background.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-xhdpi/icon_background.webp
rename to platform/android/java/lib/src/main/res/mipmap-xhdpi/icon_background.webp
diff --git a/platform/android/java/lib/res/mipmap-xhdpi/icon_foreground.webp b/platform/android/java/lib/src/main/res/mipmap-xhdpi/icon_foreground.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-xhdpi/icon_foreground.webp
rename to platform/android/java/lib/src/main/res/mipmap-xhdpi/icon_foreground.webp
diff --git a/platform/android/java/lib/res/mipmap-xhdpi/icon_monochrome.webp b/platform/android/java/lib/src/main/res/mipmap-xhdpi/icon_monochrome.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-xhdpi/icon_monochrome.webp
rename to platform/android/java/lib/src/main/res/mipmap-xhdpi/icon_monochrome.webp
diff --git a/platform/android/java/lib/res/mipmap-xxhdpi/icon.webp b/platform/android/java/lib/src/main/res/mipmap-xxhdpi/icon.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-xxhdpi/icon.webp
rename to platform/android/java/lib/src/main/res/mipmap-xxhdpi/icon.webp
diff --git a/platform/android/java/lib/res/mipmap-xxhdpi/icon_background.webp b/platform/android/java/lib/src/main/res/mipmap-xxhdpi/icon_background.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-xxhdpi/icon_background.webp
rename to platform/android/java/lib/src/main/res/mipmap-xxhdpi/icon_background.webp
diff --git a/platform/android/java/lib/res/mipmap-xxhdpi/icon_foreground.webp b/platform/android/java/lib/src/main/res/mipmap-xxhdpi/icon_foreground.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-xxhdpi/icon_foreground.webp
rename to platform/android/java/lib/src/main/res/mipmap-xxhdpi/icon_foreground.webp
diff --git a/platform/android/java/lib/res/mipmap-xxhdpi/icon_monochrome.webp b/platform/android/java/lib/src/main/res/mipmap-xxhdpi/icon_monochrome.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-xxhdpi/icon_monochrome.webp
rename to platform/android/java/lib/src/main/res/mipmap-xxhdpi/icon_monochrome.webp
diff --git a/platform/android/java/lib/res/mipmap-xxxhdpi/icon.webp b/platform/android/java/lib/src/main/res/mipmap-xxxhdpi/icon.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-xxxhdpi/icon.webp
rename to platform/android/java/lib/src/main/res/mipmap-xxxhdpi/icon.webp
diff --git a/platform/android/java/lib/res/mipmap-xxxhdpi/icon_background.webp b/platform/android/java/lib/src/main/res/mipmap-xxxhdpi/icon_background.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-xxxhdpi/icon_background.webp
rename to platform/android/java/lib/src/main/res/mipmap-xxxhdpi/icon_background.webp
diff --git a/platform/android/java/lib/res/mipmap-xxxhdpi/icon_foreground.webp b/platform/android/java/lib/src/main/res/mipmap-xxxhdpi/icon_foreground.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-xxxhdpi/icon_foreground.webp
rename to platform/android/java/lib/src/main/res/mipmap-xxxhdpi/icon_foreground.webp
diff --git a/platform/android/java/lib/res/mipmap-xxxhdpi/icon_monochrome.webp b/platform/android/java/lib/src/main/res/mipmap-xxxhdpi/icon_monochrome.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap-xxxhdpi/icon_monochrome.webp
rename to platform/android/java/lib/src/main/res/mipmap-xxxhdpi/icon_monochrome.webp
diff --git a/platform/android/java/lib/res/mipmap/icon.webp b/platform/android/java/lib/src/main/res/mipmap/icon.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap/icon.webp
rename to platform/android/java/lib/src/main/res/mipmap/icon.webp
diff --git a/platform/android/java/lib/res/mipmap/icon_background.webp b/platform/android/java/lib/src/main/res/mipmap/icon_background.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap/icon_background.webp
rename to platform/android/java/lib/src/main/res/mipmap/icon_background.webp
diff --git a/platform/android/java/lib/res/mipmap/icon_foreground.webp b/platform/android/java/lib/src/main/res/mipmap/icon_foreground.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap/icon_foreground.webp
rename to platform/android/java/lib/src/main/res/mipmap/icon_foreground.webp
diff --git a/platform/android/java/lib/res/mipmap/icon_monochrome.webp b/platform/android/java/lib/src/main/res/mipmap/icon_monochrome.webp
similarity index 100%
rename from platform/android/java/lib/res/mipmap/icon_monochrome.webp
rename to platform/android/java/lib/src/main/res/mipmap/icon_monochrome.webp
diff --git a/platform/android/java/lib/res/values-fa/strings.xml b/platform/android/java/lib/src/main/res/values-fa/strings.xml
similarity index 100%
rename from platform/android/java/lib/res/values-fa/strings.xml
rename to platform/android/java/lib/src/main/res/values-fa/strings.xml
diff --git a/platform/android/java/lib/res/values-ko/strings.xml b/platform/android/java/lib/src/main/res/values-ko/strings.xml
similarity index 100%
rename from platform/android/java/lib/res/values-ko/strings.xml
rename to platform/android/java/lib/src/main/res/values-ko/strings.xml
diff --git a/platform/android/java/lib/res/values/dimens.xml b/platform/android/java/lib/src/main/res/values/dimens.xml
similarity index 100%
rename from platform/android/java/lib/res/values/dimens.xml
rename to platform/android/java/lib/src/main/res/values/dimens.xml
diff --git a/platform/android/java/lib/res/values/strings.xml b/platform/android/java/lib/src/main/res/values/strings.xml
similarity index 100%
rename from platform/android/java/lib/res/values/strings.xml
rename to platform/android/java/lib/src/main/res/values/strings.xml
diff --git a/platform/android/java/lib/res/values/styles.xml b/platform/android/java/lib/src/main/res/values/styles.xml
similarity index 100%
rename from platform/android/java/lib/res/values/styles.xml
rename to platform/android/java/lib/src/main/res/values/styles.xml
diff --git a/platform/android/java/lib/res/xml/godot_provider_paths.xml b/platform/android/java/lib/src/main/res/xml/godot_provider_paths.xml
similarity index 100%
rename from platform/android/java/lib/res/xml/godot_provider_paths.xml
rename to platform/android/java/lib/src/main/res/xml/godot_provider_paths.xml
diff --git a/platform/android/java/lib/srcTest/java/org/godotengine/godot/utils/CommandLineFileParserTest.kt b/platform/android/java/lib/src/test/java/org/godotengine/godot/utils/CommandLineFileParserTest.kt
similarity index 97%
rename from platform/android/java/lib/srcTest/java/org/godotengine/godot/utils/CommandLineFileParserTest.kt
rename to platform/android/java/lib/src/test/java/org/godotengine/godot/utils/CommandLineFileParserTest.kt
index 8b0466848a7..119578e1740 100644
--- a/platform/android/java/lib/srcTest/java/org/godotengine/godot/utils/CommandLineFileParserTest.kt
+++ b/platform/android/java/lib/src/test/java/org/godotengine/godot/utils/CommandLineFileParserTest.kt
@@ -56,8 +56,6 @@ class CommandLineFileParserTest(
 	private val expectedResult: List<String>,
 ) {
 
-	private val commandLineFileParser = CommandLineFileParser()
-
 	companion object {
 		@JvmStatic
 		@Parameterized.Parameters
@@ -96,7 +94,7 @@ class CommandLineFileParserTest(
 		val inputStream = inputStreamArg
 
 		// when
-		val result = commandLineFileParser.parseCommandLine(inputStream)
+		val result = CommandLineFileParser.parseCommandLine(inputStream)
 
 		// then
 		assert(result == expectedResult) { "Expected: $expectedResult Actual: $result" }
diff --git a/pyproject.toml b/pyproject.toml
index 0eb22ed4f63..ff6f1c3bb3f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -60,7 +60,7 @@ skip = [
 	"core/string/locales.h",
 	"DONORS.md",
 	"editor/project_converter_3_to_4.cpp",
-	"platform/android/java/lib/src/com/*",
+	"platform/android/java/lib/src/main/java/com/*",
 	"platform/web/package-lock.json",
 ]
 ignore-words-list = [