diff --git a/fastlane/android/metadata/en-US/changelogs/175.txt b/fastlane/metadata/android/en-US/changelogs/175.txt
similarity index 100%
rename from fastlane/android/metadata/en-US/changelogs/175.txt
rename to fastlane/metadata/android/en-US/changelogs/175.txt
diff --git a/fastlane/android/metadata/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
similarity index 100%
rename from fastlane/android/metadata/en-US/full_description.txt
rename to fastlane/metadata/android/en-US/full_description.txt
diff --git a/fastlane/android/metadata/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png
similarity index 100%
rename from fastlane/android/metadata/en-US/images/featureGraphic.png
rename to fastlane/metadata/android/en-US/images/featureGraphic.png
diff --git a/fastlane/android/metadata/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
similarity index 100%
rename from fastlane/android/metadata/en-US/images/icon.png
rename to fastlane/metadata/android/en-US/images/icon.png
diff --git a/fastlane/android/metadata/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1-pc.png
similarity index 100%
rename from fastlane/android/metadata/en-US/images/phoneScreenshots/1.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/1-pc.png
diff --git a/fastlane/android/metadata/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2-settings.png
similarity index 100%
rename from fastlane/android/metadata/en-US/images/phoneScreenshots/2.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/2-settings.png
diff --git a/fastlane/android/metadata/en-US/images/sevenInchScreenshots/1.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1-pc.png
similarity index 100%
rename from fastlane/android/metadata/en-US/images/sevenInchScreenshots/1.png
rename to fastlane/metadata/android/en-US/images/sevenInchScreenshots/1-pc.png
diff --git a/fastlane/android/metadata/en-US/images/sevenInchScreenshots/2.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2-settings.png
similarity index 100%
rename from fastlane/android/metadata/en-US/images/sevenInchScreenshots/2.png
rename to fastlane/metadata/android/en-US/images/sevenInchScreenshots/2-settings.png
diff --git a/fastlane/android/metadata/en-US/images/tenInchScreenshots/1.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/1-pc.png
similarity index 100%
rename from fastlane/android/metadata/en-US/images/tenInchScreenshots/1.png
rename to fastlane/metadata/android/en-US/images/tenInchScreenshots/1-pc.png
diff --git a/fastlane/android/metadata/en-US/images/tenInchScreenshots/2.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2-settings.png
similarity index 100%
rename from fastlane/android/metadata/en-US/images/tenInchScreenshots/2.png
rename to fastlane/metadata/android/en-US/images/tenInchScreenshots/2-settings.png
diff --git a/fastlane/android/metadata/en-US/images/tvBanner.png b/fastlane/metadata/android/en-US/images/tvBanner.png
similarity index 100%
rename from fastlane/android/metadata/en-US/images/tvBanner.png
rename to fastlane/metadata/android/en-US/images/tvBanner.png
diff --git a/fastlane/android/metadata/en-US/images/tvScreenshots/1.png b/fastlane/metadata/android/en-US/images/tvScreenshots/1-pc.png
similarity index 100%
rename from fastlane/android/metadata/en-US/images/tvScreenshots/1.png
rename to fastlane/metadata/android/en-US/images/tvScreenshots/1-pc.png
diff --git a/fastlane/android/metadata/en-US/images/tvScreenshots/2.png b/fastlane/metadata/android/en-US/images/tvScreenshots/2-settings.png
similarity index 100%
rename from fastlane/android/metadata/en-US/images/tvScreenshots/2.png
rename to fastlane/metadata/android/en-US/images/tvScreenshots/2-settings.png
diff --git a/fastlane/android/metadata/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
similarity index 100%
rename from fastlane/android/metadata/en-US/short_description.txt
rename to fastlane/metadata/android/en-US/short_description.txt
diff --git a/fastlane/android/metadata/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt
similarity index 100%
rename from fastlane/android/metadata/en-US/title.txt
rename to fastlane/metadata/android/en-US/title.txt