diff --git a/configure.sh b/configure.sh
index 691e6908b5..97b68dcded 100755
--- a/configure.sh
+++ b/configure.sh
@@ -14,9 +14,9 @@ BASE_PATH=$(cd "$(dirname "$0")"; pwd)
 
 DEFAULT_PRIVATE_HEADER="$BASE_PATH/private_default.h"
 PRIVATE_HEADER="private.h"
-PRIVATE_PROPERTIES="android/secure.properties"
-PRIVATE_NETWORK_CONFIG="android/res/xml/network_security_config.xml"
-PRIVATE_GOOGLE_SERVICES="android/google-services.json"
+PRIVATE_PROPERTIES="android/app/secure.properties"
+PRIVATE_NETWORK_CONFIG="android/app/src/main/res/xml/network_security_config.xml"
+PRIVATE_GOOGLE_SERVICES="android/app/google-services.json"
 
 SAVED_PRIVATE_REPO_FILE="$BASE_PATH/.private_repository_url"
 SAVED_PRIVATE_BRANCH_FILE="$BASE_PATH/.private_repository_branch"
diff --git a/tools/python/check_store_metadata.py b/tools/python/check_store_metadata.py
index 9f2428e0ac..b45bf3c61f 100755
--- a/tools/python/check_store_metadata.py
+++ b/tools/python/check_store_metadata.py
@@ -164,7 +164,7 @@ def check_exact(path, expected):
 
 def check_android():
     ok = True
-    flavor = 'android/src/fdroid/play/'
+    flavor = 'android/app/src/main/fdroid/play/'
     ok = check_url(flavor + 'contact-website.txt') and ok
     ok = check_email(flavor + 'contact-email.txt') and ok
     ok = check_exact(flavor + 'default-language.txt', 'en-US') and ok
diff --git a/tools/python/clean_strings_txt.py b/tools/python/clean_strings_txt.py
index 0d49a82322..54b09aba13 100755
--- a/tools/python/clean_strings_txt.py
+++ b/tools/python/clean_strings_txt.py
@@ -73,13 +73,13 @@ def grep_ios():
 
 def grep_android():
     logging.info("Grepping android...")
-    grep = "grep -r -I 'R.string.' {0}/android/src".format(OMIM_ROOT)
+    grep = "grep -r -I 'R.string.' {0}/android/app/src/main".format(OMIM_ROOT)
     ret = android_grep_wrapper(grep, ANDROID_JAVA_RE)
-    grep = "grep -r -I 'R.plurals.' {0}/android/src".format(OMIM_ROOT)
+    grep = "grep -r -I 'R.plurals.' {0}/android/app/src/main".format(OMIM_ROOT)
     ret.update(android_grep_wrapper(grep, ANDROID_JAVA_PLURAL_RE))
-    grep = "grep -r -I '@string/' {0}/android/res".format(OMIM_ROOT)
+    grep = "grep -r -I '@string/' {0}/android/app/src/main/res".format(OMIM_ROOT)
     ret.update(android_grep_wrapper(grep, ANDROID_XML_RE))
-    grep = "grep -r -I '@string/' {0}/android/AndroidManifest.xml".format(
+    grep = "grep -r -I '@string/' {0}/android/app/src/main/AndroidManifest.xml".format(
         OMIM_ROOT)
     ret.update(android_grep_wrapper(grep, ANDROID_XML_RE))
     ret = parenthesize(ret)
diff --git a/tools/unix/clone_en_release_notes.sh b/tools/unix/clone_en_release_notes.sh
index 0bdb562beb..710a8e7740 100755
--- a/tools/unix/clone_en_release_notes.sh
+++ b/tools/unix/clone_en_release_notes.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-ANDROID_LISTINGS=android/src/fdroid/play/listings
+ANDROID_LISTINGS=android/app/src/main/fdroid/play/listings
 ANDROID_NOTES=$ANDROID_LISTINGS/en-US/release-notes.txt
 IOS_METADATA=iphone/metadata
 IOS_NOTES=$IOS_METADATA/en-US/release_notes.txt
diff --git a/tools/unix/generate_localizations.sh b/tools/unix/generate_localizations.sh
index 05494f0bcb..709fa97aa2 100755
--- a/tools/unix/generate_localizations.sh
+++ b/tools/unix/generate_localizations.sh
@@ -59,7 +59,7 @@ MERGED_FILE="$(mktemp)"
 cat "$STRINGS_PATH"/{strings,types_strings}.txt> "$MERGED_FILE"
 
 # TODO: Add validate-strings-file call to check for duplicates (and avoid Android build errors) when tags are properly set.
-"$TWINE" generate-all-localization-files --include translated --format android --untagged --tags android "$MERGED_FILE" "$OMIM_PATH/android/res/"
+"$TWINE" generate-all-localization-files --include translated --format android --untagged --tags android "$MERGED_FILE" "$OMIM_PATH/android/app/main/res/"
 "$TWINE" generate-all-localization-files --format apple --untagged --tags ios "$MERGED_FILE" "$OMIM_PATH/iphone/Maps/LocalizedStrings/"
 "$TWINE" generate-all-localization-files --format apple-plural --untagged --tags ios "$MERGED_FILE" "$OMIM_PATH/iphone/Maps/LocalizedStrings/"
 "$TWINE" generate-all-localization-files --format apple --file-name InfoPlist.strings "$OMIM_PATH/iphone/plist.txt" "$OMIM_PATH/iphone/Maps/LocalizedStrings/"
@@ -82,7 +82,7 @@ if [ "$SUPPORTED_LOCALIZATIONS" != "$(grep supportedLocalizations "$GRADLE_PROPE
 fi
 
 # Generate locales_config.xml to allow users change app's language on Android 13+
-LOCALES_CONFIG="$OMIM_PATH/android/res/xml/locales_config.xml"
+LOCALES_CONFIG="$OMIM_PATH/android/app/main/res/xml/locales_config.xml"
 SUPPORTED_LOCALIZATIONS=${SUPPORTED_LOCALIZATIONS/supportedLocalizations=/en,}
 SUPPORTED_LOCALIZATIONS=${SUPPORTED_LOCALIZATIONS/,en,/,}
 SUPPORTED_LOCALIZATIONS=${SUPPORTED_LOCALIZATIONS//_/-}
diff --git a/tools/upload_to_dropbox.sh b/tools/upload_to_dropbox.sh
index b38b09e3cd..19973d7e69 100755
--- a/tools/upload_to_dropbox.sh
+++ b/tools/upload_to_dropbox.sh
@@ -15,9 +15,9 @@ FOLDER=$2
 KEY=$3
 TARGET="${4-testing}"
 
-rm -f $FOLDER/omim/android/build/outputs/apk/android-symbols.zip
+rm -f $FOLDER/omim/android/app/build/outputs/apk/android-symbols.zip
 
-zip -r $FOLDER/omim/android/build/outputs/apk/android-symbols.zip $FOLDER/omim/android/obj 
+zip -r $FOLDER/omim/android/app/build/outputs/apk/android-symbols.zip $FOLDER/omim/android/obj
 
 # Upload the files to DropBox:
 # Later this ugly bit will be replaced by a new and shiny python script
@@ -27,7 +27,7 @@ do
     curl -H "Authorization: Bearer $KEY" "https://api.dropbox.com/1/fileops/delete" -X POST --data "root=auto&path=$s"
 done
 
-cd $FOLDER/omim/android/build/outputs/apk/
+cd $FOLDER/omim/android/app/build/outputs/apk/
 
 # 2) Upload the new ones now
 for s in $(ls | grep "android" | grep -v "unaligned");