diff --git a/app-k9mail/fastlane/metadata/android/ar/short_description.txt b/app-metadata/com.fsck.k9/ar/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/ar/short_description.txt
rename to app-metadata/com.fsck.k9/ar/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/de/short_description.txt b/app-metadata/com.fsck.k9/de/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/de/short_description.txt
rename to app-metadata/com.fsck.k9/de/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/29004.txt b/app-metadata/com.fsck.k9/en-US/changelogs/29004.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/29004.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/29004.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/29005.txt b/app-metadata/com.fsck.k9/en-US/changelogs/29005.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/29005.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/29005.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/29006.txt b/app-metadata/com.fsck.k9/en-US/changelogs/29006.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/29006.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/29006.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/29007.txt b/app-metadata/com.fsck.k9/en-US/changelogs/29007.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/29007.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/29007.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/29008.txt b/app-metadata/com.fsck.k9/en-US/changelogs/29008.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/29008.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/29008.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/29009.txt b/app-metadata/com.fsck.k9/en-US/changelogs/29009.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/29009.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/29009.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/29010.txt b/app-metadata/com.fsck.k9/en-US/changelogs/29010.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/29010.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/29010.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/29011.txt b/app-metadata/com.fsck.k9/en-US/changelogs/29011.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/29011.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/29011.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/29012.txt b/app-metadata/com.fsck.k9/en-US/changelogs/29012.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/29012.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/29012.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/29013.txt b/app-metadata/com.fsck.k9/en-US/changelogs/29013.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/29013.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/29013.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/29014.txt b/app-metadata/com.fsck.k9/en-US/changelogs/29014.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/29014.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/29014.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/29015.txt b/app-metadata/com.fsck.k9/en-US/changelogs/29015.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/29015.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/29015.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/29016.txt b/app-metadata/com.fsck.k9/en-US/changelogs/29016.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/29016.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/29016.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/30000.txt b/app-metadata/com.fsck.k9/en-US/changelogs/30000.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/30000.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/30000.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/31000.txt b/app-metadata/com.fsck.k9/en-US/changelogs/31000.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/31000.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/31000.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/31001.txt b/app-metadata/com.fsck.k9/en-US/changelogs/31001.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/31001.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/31001.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/32000.txt b/app-metadata/com.fsck.k9/en-US/changelogs/32000.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/32000.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/32000.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/32001.txt b/app-metadata/com.fsck.k9/en-US/changelogs/32001.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/32001.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/32001.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/32002.txt b/app-metadata/com.fsck.k9/en-US/changelogs/32002.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/32002.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/32002.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/33000.txt b/app-metadata/com.fsck.k9/en-US/changelogs/33000.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/33000.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/33000.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/33001.txt b/app-metadata/com.fsck.k9/en-US/changelogs/33001.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/33001.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/33001.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/33002.txt b/app-metadata/com.fsck.k9/en-US/changelogs/33002.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/33002.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/33002.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/33003.txt b/app-metadata/com.fsck.k9/en-US/changelogs/33003.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/33003.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/33003.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/33004.txt b/app-metadata/com.fsck.k9/en-US/changelogs/33004.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/33004.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/33004.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/33005.txt b/app-metadata/com.fsck.k9/en-US/changelogs/33005.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/33005.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/33005.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/33006.txt b/app-metadata/com.fsck.k9/en-US/changelogs/33006.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/33006.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/33006.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/33007.txt b/app-metadata/com.fsck.k9/en-US/changelogs/33007.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/33007.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/33007.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/33008.txt b/app-metadata/com.fsck.k9/en-US/changelogs/33008.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/33008.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/33008.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/33009.txt b/app-metadata/com.fsck.k9/en-US/changelogs/33009.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/33009.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/33009.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/33010.txt b/app-metadata/com.fsck.k9/en-US/changelogs/33010.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/33010.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/33010.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/33011.txt b/app-metadata/com.fsck.k9/en-US/changelogs/33011.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/33011.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/33011.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/33012.txt b/app-metadata/com.fsck.k9/en-US/changelogs/33012.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/33012.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/33012.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/34000.txt b/app-metadata/com.fsck.k9/en-US/changelogs/34000.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/34000.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/34000.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/35000.txt b/app-metadata/com.fsck.k9/en-US/changelogs/35000.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/35000.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/35000.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/35001.txt b/app-metadata/com.fsck.k9/en-US/changelogs/35001.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/35001.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/35001.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/35002.txt b/app-metadata/com.fsck.k9/en-US/changelogs/35002.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/35002.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/35002.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/35003.txt b/app-metadata/com.fsck.k9/en-US/changelogs/35003.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/35003.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/35003.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/35004.txt b/app-metadata/com.fsck.k9/en-US/changelogs/35004.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/35004.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/35004.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/35005.txt b/app-metadata/com.fsck.k9/en-US/changelogs/35005.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/35005.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/35005.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/35006.txt b/app-metadata/com.fsck.k9/en-US/changelogs/35006.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/35006.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/35006.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/35007.txt b/app-metadata/com.fsck.k9/en-US/changelogs/35007.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/35007.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/35007.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/35008.txt b/app-metadata/com.fsck.k9/en-US/changelogs/35008.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/35008.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/35008.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/35009.txt b/app-metadata/com.fsck.k9/en-US/changelogs/35009.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/35009.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/35009.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/35010.txt b/app-metadata/com.fsck.k9/en-US/changelogs/35010.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/35010.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/35010.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/35011.txt b/app-metadata/com.fsck.k9/en-US/changelogs/35011.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/35011.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/35011.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/36000.txt b/app-metadata/com.fsck.k9/en-US/changelogs/36000.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/36000.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/36000.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/36001.txt b/app-metadata/com.fsck.k9/en-US/changelogs/36001.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/36001.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/36001.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/36002.txt b/app-metadata/com.fsck.k9/en-US/changelogs/36002.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/36002.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/36002.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/36003.txt b/app-metadata/com.fsck.k9/en-US/changelogs/36003.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/36003.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/36003.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37000.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37000.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37000.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37000.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37001.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37001.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37001.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37001.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37002.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37002.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37002.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37002.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37003.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37003.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37003.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37003.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37004.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37004.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37004.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37004.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37005.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37005.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37005.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37005.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37006.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37006.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37006.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37006.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37007.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37007.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37007.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37007.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37008.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37008.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37008.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37008.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37009.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37009.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37009.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37009.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37010.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37010.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37010.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37010.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37011.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37011.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37011.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37011.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37012.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37012.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37012.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37012.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37013.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37013.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37013.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37013.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37014.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37014.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37014.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37014.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37015.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37015.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37015.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37015.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37016.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37016.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37016.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37016.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37017.txt b/app-metadata/com.fsck.k9/en-US/changelogs/37017.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/37017.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/37017.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/38000.txt b/app-metadata/com.fsck.k9/en-US/changelogs/38000.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/38000.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/38000.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/38001.txt b/app-metadata/com.fsck.k9/en-US/changelogs/38001.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/changelogs/38001.txt
rename to app-metadata/com.fsck.k9/en-US/changelogs/38001.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/full_description.txt b/app-metadata/com.fsck.k9/en-US/full_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/full_description.txt
rename to app-metadata/com.fsck.k9/en-US/full_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/images/icon.png b/app-metadata/com.fsck.k9/en-US/images/icon.png
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/images/icon.png
rename to app-metadata/com.fsck.k9/en-US/images/icon.png
diff --git a/app-k9mail/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/app-metadata/com.fsck.k9/en-US/images/phoneScreenshots/1.png
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
rename to app-metadata/com.fsck.k9/en-US/images/phoneScreenshots/1.png
diff --git a/app-k9mail/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/app-metadata/com.fsck.k9/en-US/images/phoneScreenshots/2.png
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
rename to app-metadata/com.fsck.k9/en-US/images/phoneScreenshots/2.png
diff --git a/app-k9mail/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/app-metadata/com.fsck.k9/en-US/images/phoneScreenshots/3.png
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
rename to app-metadata/com.fsck.k9/en-US/images/phoneScreenshots/3.png
diff --git a/app-k9mail/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/app-metadata/com.fsck.k9/en-US/images/phoneScreenshots/4.png
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
rename to app-metadata/com.fsck.k9/en-US/images/phoneScreenshots/4.png
diff --git a/app-k9mail/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png b/app-metadata/com.fsck.k9/en-US/images/phoneScreenshots/5.png
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
rename to app-metadata/com.fsck.k9/en-US/images/phoneScreenshots/5.png
diff --git a/app-k9mail/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png b/app-metadata/com.fsck.k9/en-US/images/sevenInchScreenshots/1.png
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png
rename to app-metadata/com.fsck.k9/en-US/images/sevenInchScreenshots/1.png
diff --git a/app-k9mail/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.png b/app-metadata/com.fsck.k9/en-US/images/tenInchScreenshots/1.png
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.png
rename to app-metadata/com.fsck.k9/en-US/images/tenInchScreenshots/1.png
diff --git a/app-k9mail/fastlane/metadata/android/en-US/short_description.txt b/app-metadata/com.fsck.k9/en-US/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/short_description.txt
rename to app-metadata/com.fsck.k9/en-US/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/en-US/title.txt b/app-metadata/com.fsck.k9/en-US/title.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/en-US/title.txt
rename to app-metadata/com.fsck.k9/en-US/title.txt
diff --git a/app-k9mail/fastlane/metadata/android/eo/short_description.txt b/app-metadata/com.fsck.k9/eo/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/eo/short_description.txt
rename to app-metadata/com.fsck.k9/eo/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/es/short_description.txt b/app-metadata/com.fsck.k9/es/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/es/short_description.txt
rename to app-metadata/com.fsck.k9/es/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/fr/short_description.txt b/app-metadata/com.fsck.k9/fr/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/fr/short_description.txt
rename to app-metadata/com.fsck.k9/fr/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/he/short_description.txt b/app-metadata/com.fsck.k9/he/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/he/short_description.txt
rename to app-metadata/com.fsck.k9/he/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/it/short_description.txt b/app-metadata/com.fsck.k9/it/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/it/short_description.txt
rename to app-metadata/com.fsck.k9/it/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/ja/short_description.txt b/app-metadata/com.fsck.k9/ja/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/ja/short_description.txt
rename to app-metadata/com.fsck.k9/ja/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/nb/short_description.txt b/app-metadata/com.fsck.k9/nb/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/nb/short_description.txt
rename to app-metadata/com.fsck.k9/nb/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/pl/short_description.txt b/app-metadata/com.fsck.k9/pl/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/pl/short_description.txt
rename to app-metadata/com.fsck.k9/pl/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/pt-BR/short_description.txt b/app-metadata/com.fsck.k9/pt-BR/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/pt-BR/short_description.txt
rename to app-metadata/com.fsck.k9/pt-BR/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/pt-PT/short_description.txt b/app-metadata/com.fsck.k9/pt-PT/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/pt-PT/short_description.txt
rename to app-metadata/com.fsck.k9/pt-PT/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/pt/short_description.txt b/app-metadata/com.fsck.k9/pt/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/pt/short_description.txt
rename to app-metadata/com.fsck.k9/pt/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/ro/short_description.txt b/app-metadata/com.fsck.k9/ro/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/ro/short_description.txt
rename to app-metadata/com.fsck.k9/ro/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/ru/short_description.txt b/app-metadata/com.fsck.k9/ru/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/ru/short_description.txt
rename to app-metadata/com.fsck.k9/ru/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/sq/short_description.txt b/app-metadata/com.fsck.k9/sq/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/sq/short_description.txt
rename to app-metadata/com.fsck.k9/sq/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/tr/short_description.txt b/app-metadata/com.fsck.k9/tr/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/tr/short_description.txt
rename to app-metadata/com.fsck.k9/tr/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/uk/short_description.txt b/app-metadata/com.fsck.k9/uk/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/uk/short_description.txt
rename to app-metadata/com.fsck.k9/uk/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/zh-CN/short_description.txt b/app-metadata/com.fsck.k9/zh-CN/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/zh-CN/short_description.txt
rename to app-metadata/com.fsck.k9/zh-CN/short_description.txt
diff --git a/app-k9mail/fastlane/metadata/android/zh-TW/short_description.txt b/app-metadata/com.fsck.k9/zh-TW/short_description.txt
similarity index 100%
rename from app-k9mail/fastlane/metadata/android/zh-TW/short_description.txt
rename to app-metadata/com.fsck.k9/zh-TW/short_description.txt