diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d7c3506fa0..30f2a1c525 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,34 +1,38 @@
---
name: Bug report
-about: Create a report to help us improve Element
+about: Create a report to help us improve SchildiChat
title: ''
labels: ''
assignees: ''
---
-#### Describe the bug
+**Describe the bug**
A clear and concise description of what the bug is.
-#### To Reproduce
+**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
-#### Expected behavior
+**Expected behavior**
A clear and concise description of what you expected to happen.
-#### Screenshots
+**Screenshots**
If applicable, add screenshots to help explain your problem.
-#### Smartphone (please complete the following information):
+**Smartphone (please complete the following information):**
- Device: [e.g. Samsung S6]
- OS: [e.g. Android 6.0]
-#### Additional context
+**Additional context**
- App version and store [e.g. 1.0.0 - F-Droid]
- Homeserver: [e.g. matrix.org]
+**Upstream relevance**
+ - Does this issue exist in Element Android?
+ - If this issue exists in Element Android, please also link the corresponding bug report (create a new one if it doesn't exist yet)
+
Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index da96d461c5..73c93186d7 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,14 +7,14 @@ assignees: ''
---
-#### Is your feature request related to a problem? Please describe.
+**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-#### Describe the solution you'd like.
+**Describe the solution you'd like**
A clear and concise description of what you want to happen.
-#### Describe alternatives you've considered.
+**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
-#### Additional context
+**Additional context**
Add any other context or screenshots about the feature request here.
diff --git a/README.md b/README.md
index e89fb15010..348e1c2ec7 100644
--- a/README.md
+++ b/README.md
@@ -1,34 +1,24 @@
-[![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
-[![Weblate](https://translate.element.io/widgets/element-android/-/svg-badge.svg)](https://translate.element.io/engage/element-android/?utm_source=widget)
-[![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
-[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=alert_status)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
-[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
-[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=bugs)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+# SchildiChat for Android
-# Element Android
+SchildiChat for Android is a Matrix Client based on [Element Android](https://github.com/vector-im/element-android).
-Element Android is an Android Matrix Client provided by [Element](https://element.io/).
+Compared to Element, SchildiChat features following most important changes:
-It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-android) with a new user experience.
+- A unified chat list for both direct and group chats
+- Optional message bubbles
+- Further small usability improvements
-[](https://play.google.com/store/apps/details?id=im.vector.app)
-[](https://f-droid.org/app/im.vector.app)
+A more thorough list of changes compared to Element can be found [here](FEATURES.md).
-Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
+
-# New Android SDK
+The version in the official F-Droid repositories comes without the proprietary libraries for push notifications.
+This might lead to increased battery drain and a higher delay for delivering messages.
+If you are looking for a version with push notification support, you can get it from [my F-Droid repository](https://s2.spiritcroc.de/fdroid/repo/).
+The latest version should also be available for direct download [here](https://s2.spiritcroc.de/fdroid/SchildiChat.apk).
-Element is based on a new Android SDK fully written in Kotlin (like Element). In order to make the early development as fast as possible, Element and the new SDK currently share the same git repository.
+Join the discussion on matrix
-At each Element release, the SDK module is copied to a dedicated repository: https://github.com/matrix-org/matrix-android-sdk2. That way, third party apps can add a regular gradle dependency to use it. So more details on how to do that here: https://github.com/matrix-org/matrix-android-sdk2.
+## Screenshots
-# Roadmap
-
-The version 1.0.0 of Element still misses some features which was previously included in Riot-Android.
-The team will work to add them on a regular basis.
-
-## Contributing
-
-Please refer to [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) if you want to contribute on Matrix Android projects!
-
-Come chat with the community in the dedicated Matrix [room](https://matrix.to/#/#element-android:matrix.org).
+
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/de-DE/full_description.txt
rename to fastlane/metadata/android/de-DE/full_description.txt
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png
rename to fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png
rename to fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png
rename to fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png
rename to fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/short_description.txt b/fastlane/metadata/android/de-DE/short_description.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/de-DE/short_description.txt
rename to fastlane/metadata/android/de-DE/short_description.txt
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/title.txt b/fastlane/metadata/android/de-DE/title.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/de-DE/title.txt
rename to fastlane/metadata/android/de-DE/title.txt
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/video.txt b/fastlane/metadata/android/de-DE/video.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/de-DE/video.txt
rename to fastlane/metadata/android/de-DE/video.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100250.txt b/fastlane/metadata/android/en-US/changelogs/40100250.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100250.txt
rename to fastlane/metadata/android/en-US/changelogs/40100250.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100270.txt b/fastlane/metadata/android/en-US/changelogs/40100270.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100270.txt
rename to fastlane/metadata/android/en-US/changelogs/40100270.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100290.txt b/fastlane/metadata/android/en-US/changelogs/40100290.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100290.txt
rename to fastlane/metadata/android/en-US/changelogs/40100290.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100300.txt b/fastlane/metadata/android/en-US/changelogs/40100300.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100300.txt
rename to fastlane/metadata/android/en-US/changelogs/40100300.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100310.txt b/fastlane/metadata/android/en-US/changelogs/40100310.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100310.txt
rename to fastlane/metadata/android/en-US/changelogs/40100310.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100330.txt b/fastlane/metadata/android/en-US/changelogs/40100330.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100330.txt
rename to fastlane/metadata/android/en-US/changelogs/40100330.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100340.txt b/fastlane/metadata/android/en-US/changelogs/40100340.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100340.txt
rename to fastlane/metadata/android/en-US/changelogs/40100340.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100350.txt b/fastlane/metadata/android/en-US/changelogs/40100350.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100350.txt
rename to fastlane/metadata/android/en-US/changelogs/40100350.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100360.txt b/fastlane/metadata/android/en-US/changelogs/40100360.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100360.txt
rename to fastlane/metadata/android/en-US/changelogs/40100360.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100370.txt b/fastlane/metadata/android/en-US/changelogs/40100370.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100370.txt
rename to fastlane/metadata/android/en-US/changelogs/40100370.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100390.txt b/fastlane/metadata/android/en-US/changelogs/40100390.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100390.txt
rename to fastlane/metadata/android/en-US/changelogs/40100390.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100410.txt b/fastlane/metadata/android/en-US/changelogs/40100410.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100410.txt
rename to fastlane/metadata/android/en-US/changelogs/40100410.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100420.txt b/fastlane/metadata/android/en-US/changelogs/40100420.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100420.txt
rename to fastlane/metadata/android/en-US/changelogs/40100420.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100430.txt b/fastlane/metadata/android/en-US/changelogs/40100430.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100430.txt
rename to fastlane/metadata/android/en-US/changelogs/40100430.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100440.txt b/fastlane/metadata/android/en-US/changelogs/40100440.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100440.txt
rename to fastlane/metadata/android/en-US/changelogs/40100440.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100450.txt b/fastlane/metadata/android/en-US/changelogs/40100450.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100450.txt
rename to fastlane/metadata/android/en-US/changelogs/40100450.txt
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 853885944c..6323b26f4d 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -1,39 +1,13 @@
-Element is both a secure messenger and a productivity team collaboration app that is ideal for group chats while remote working. This chat app uses end-to-end encryption to provide powerful video conferencing, file sharing and voice calls.
+SchildiChat is a client for the matrix protocol, based on the Element app.
+Compared to other clients, it provides a more classic instant messenger feel, while still providing the full functionality of the reference client.
-Element’s features include:
-- Advanced online communication tools
-- Fully encrypted messages to allow safer corporate communication, even for remote workers
-- Decentralized chat based on the Matrix open source framework
-- File sharing securely with encrypted data while managing projects
-- Video chats with Voice over IP and screen sharing
-- Easy integration with your favourite online collaboration tools, project management tools, VoIP services and other team messaging apps
+The matrix protocol is a decentralized approach to modern messaging, allowing for end-to-end encryption, shared message history across multiple devices, and more.
-Element is completely different from other messaging and collaboration apps. It operates on Matrix, an open network for secure messaging and decentralized communication. It allows self-hosting to give users maximum ownership and control of their data and messages.
+Compared to the Element app, SchildiChat features following changes:
+- A unified chat list for both direct and group chats
+- Optional message bubbles
+- Follows the system setting for dark/light mode
+- Further small usability improvements
-Privacy and encrypted messaging
-Element protects you from unwanted ads, data mining and walled gardens. It also secures all your data, one-to-one video and voice communication through end-to-end encryption and cross-signed device verification.
-
-Element gives you control over your privacy while allowing you to communicate securely with anyone on the Matrix network, or other business collaboration tools by integrating with apps such as Slack.
-
-Element can be self-hosted
-To allow more control of your sensitive data and conversations, Element can be self-hosted or you can choose any Matrix-based host - the standard for open source, decentralized communication. Element gives you privacy, security compliance and integration flexibility.
-
-Own your data
-You decide where to keep your data and messages. Without the risk of data mining or access from third parties.
-
-Element puts you in control in different ways:
-1. Get a free account on the matrix.org public server hosted by the Matrix developers, or choose from thousands of public servers hosted by volunteers
-2. Self-host your account by running a server on your own IT infrastructure
-3. Sign up for an account on a custom server by simply subscribing to the Element Matrix Services hosting platform
-
-Open messaging and collaboration
-You can chat with anyone on the Matrix network, whether they’re using Element, another Matrix app or even if they are using a different messaging app.
-
-Super secure
-Real end-to-end encryption (only those in the conversation can decrypt messages), and cross-signed device verification.
-
-Complete communication and integration
-Messaging, voice and video calls, file sharing, screen sharing and a whole bunch of integrations, bots and widgets. Build rooms, communities, stay in touch and get things done.
-
-Pick up where you left off
-Stay in touch wherever you are with fully synchronised message history across all your devices and on the web at https://app.element.io
\ No newline at end of file
+SchildiChat is open source: https://github.com/SchildiChat/SchildiChat-android
+More information about the Matrix protocol: https://matrix.org/
diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png
index 97f45aafd3..a20ece3fd5 100644
Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
index e449d60ca9..d0680e0eef 100644
Binary files a/fastlane/metadata/android/en-US/images/icon.png and b/fastlane/metadata/android/en-US/images/icon.png differ
diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png
diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png
diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png
diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
index 5a98f6f772..e4815121e8 100644
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-Group messenger - encrypted messaging, group chat and video calls
\ No newline at end of file
+Secure messenger for Matrix with a traditional instant messaging experience
diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt
index 12fa89b99b..e5e6b4db47 100644
--- a/fastlane/metadata/android/en-US/title.txt
+++ b/fastlane/metadata/android/en-US/title.txt
@@ -1 +1 @@
-Element - Secure Messenger
\ No newline at end of file
+SchildiChat
diff --git a/tmp_sc_fastlane/metadata/android/en-US/video.txt b/fastlane/metadata/android/en-US/video.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/video.txt
rename to fastlane/metadata/android/en-US/video.txt
diff --git a/tmp_sc_fastlane/metadata/android/ru-RU/changelogs/40100250.txt b/fastlane/metadata/android/ru-RU/changelogs/40100250.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/ru-RU/changelogs/40100250.txt
rename to fastlane/metadata/android/ru-RU/changelogs/40100250.txt
diff --git a/tmp_sc_fastlane/metadata/android/ru-RU/full_description.txt b/fastlane/metadata/android/ru-RU/full_description.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/ru-RU/full_description.txt
rename to fastlane/metadata/android/ru-RU/full_description.txt
diff --git a/tmp_sc_fastlane/metadata/android/ru-RU/short_description.txt b/fastlane/metadata/android/ru-RU/short_description.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/ru-RU/short_description.txt
rename to fastlane/metadata/android/ru-RU/short_description.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/ru-RU/title.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/title.txt
rename to fastlane/metadata/android/ru-RU/title.txt
diff --git a/tmp_sc_README.md b/tmp_sc_README.md
deleted file mode 100644
index 348e1c2ec7..0000000000
--- a/tmp_sc_README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# SchildiChat for Android
-
-SchildiChat for Android is a Matrix Client based on [Element Android](https://github.com/vector-im/element-android).
-
-Compared to Element, SchildiChat features following most important changes:
-
-- A unified chat list for both direct and group chats
-- Optional message bubbles
-- Further small usability improvements
-
-A more thorough list of changes compared to Element can be found [here](FEATURES.md).
-
-
-
-The version in the official F-Droid repositories comes without the proprietary libraries for push notifications.
-This might lead to increased battery drain and a higher delay for delivering messages.
-If you are looking for a version with push notification support, you can get it from [my F-Droid repository](https://s2.spiritcroc.de/fdroid/repo/).
-The latest version should also be available for direct download [here](https://s2.spiritcroc.de/fdroid/SchildiChat.apk).
-
-Join the discussion on matrix
-
-## Screenshots
-
-
diff --git a/tmp_sc_fastlane/metadata/android/en-US/full_description.txt b/tmp_sc_fastlane/metadata/android/en-US/full_description.txt
deleted file mode 100644
index 6323b26f4d..0000000000
--- a/tmp_sc_fastlane/metadata/android/en-US/full_description.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-SchildiChat is a client for the matrix protocol, based on the Element app.
-Compared to other clients, it provides a more classic instant messenger feel, while still providing the full functionality of the reference client.
-
-The matrix protocol is a decentralized approach to modern messaging, allowing for end-to-end encryption, shared message history across multiple devices, and more.
-
-Compared to the Element app, SchildiChat features following changes:
-- A unified chat list for both direct and group chats
-- Optional message bubbles
-- Follows the system setting for dark/light mode
-- Further small usability improvements
-
-SchildiChat is open source: https://github.com/SchildiChat/SchildiChat-android
-More information about the Matrix protocol: https://matrix.org/
diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/featureGraphic.png b/tmp_sc_fastlane/metadata/android/en-US/images/featureGraphic.png
deleted file mode 100644
index a20ece3fd5..0000000000
Binary files a/tmp_sc_fastlane/metadata/android/en-US/images/featureGraphic.png and /dev/null differ
diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/icon.png b/tmp_sc_fastlane/metadata/android/en-US/images/icon.png
deleted file mode 100644
index d0680e0eef..0000000000
Binary files a/tmp_sc_fastlane/metadata/android/en-US/images/icon.png and /dev/null differ
diff --git a/tmp_sc_fastlane/metadata/android/en-US/short_description.txt b/tmp_sc_fastlane/metadata/android/en-US/short_description.txt
deleted file mode 100644
index e4815121e8..0000000000
--- a/tmp_sc_fastlane/metadata/android/en-US/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Secure messenger for Matrix with a traditional instant messaging experience
diff --git a/tmp_sc_fastlane/metadata/android/ru-RU/title.txt b/tmp_sc_fastlane/metadata/android/ru-RU/title.txt
deleted file mode 100644
index e5e6b4db47..0000000000
--- a/tmp_sc_fastlane/metadata/android/ru-RU/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-SchildiChat
diff --git a/tmp_sc_.github/ISSUE_TEMPLATE/bug_report.md b/upstream_.github/ISSUE_TEMPLATE/bug_report.md
similarity index 56%
rename from tmp_sc_.github/ISSUE_TEMPLATE/bug_report.md
rename to upstream_.github/ISSUE_TEMPLATE/bug_report.md
index 30f2a1c525..d7c3506fa0 100644
--- a/tmp_sc_.github/ISSUE_TEMPLATE/bug_report.md
+++ b/upstream_.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,38 +1,34 @@
---
name: Bug report
-about: Create a report to help us improve SchildiChat
+about: Create a report to help us improve Element
title: ''
labels: ''
assignees: ''
---
-**Describe the bug**
+#### Describe the bug
A clear and concise description of what the bug is.
-**To Reproduce**
+#### To Reproduce
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
-**Expected behavior**
+#### Expected behavior
A clear and concise description of what you expected to happen.
-**Screenshots**
+#### Screenshots
If applicable, add screenshots to help explain your problem.
-**Smartphone (please complete the following information):**
+#### Smartphone (please complete the following information):
- Device: [e.g. Samsung S6]
- OS: [e.g. Android 6.0]
-**Additional context**
+#### Additional context
- App version and store [e.g. 1.0.0 - F-Droid]
- Homeserver: [e.g. matrix.org]
-**Upstream relevance**
- - Does this issue exist in Element Android?
- - If this issue exists in Element Android, please also link the corresponding bug report (create a new one if it doesn't exist yet)
-
Add any other context about the problem here.
diff --git a/tmp_sc_.github/ISSUE_TEMPLATE/feature_request.md b/upstream_.github/ISSUE_TEMPLATE/feature_request.md
similarity index 71%
rename from tmp_sc_.github/ISSUE_TEMPLATE/feature_request.md
rename to upstream_.github/ISSUE_TEMPLATE/feature_request.md
index 73c93186d7..da96d461c5 100644
--- a/tmp_sc_.github/ISSUE_TEMPLATE/feature_request.md
+++ b/upstream_.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,14 +7,14 @@ assignees: ''
---
-**Is your feature request related to a problem? Please describe.**
+#### Is your feature request related to a problem? Please describe.
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-**Describe the solution you'd like**
+#### Describe the solution you'd like.
A clear and concise description of what you want to happen.
-**Describe alternatives you've considered**
+#### Describe alternatives you've considered.
A clear and concise description of any alternative solutions or features you've considered.
-**Additional context**
+#### Additional context
Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/matrix-sdk.md b/upstream_.github/ISSUE_TEMPLATE/matrix-sdk.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/matrix-sdk.md
rename to upstream_.github/ISSUE_TEMPLATE/matrix-sdk.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/upstream_.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE.md
rename to upstream_.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/dependabot.yml b/upstream_.github/dependabot.yml
similarity index 100%
rename from .github/dependabot.yml
rename to upstream_.github/dependabot.yml
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/upstream_.github/workflows/gradle-wrapper-validation.yml
similarity index 100%
rename from .github/workflows/gradle-wrapper-validation.yml
rename to upstream_.github/workflows/gradle-wrapper-validation.yml
diff --git a/.github/workflows/update-gradle-wrapper.yml b/upstream_.github/workflows/update-gradle-wrapper.yml
similarity index 100%
rename from .github/workflows/update-gradle-wrapper.yml
rename to upstream_.github/workflows/update-gradle-wrapper.yml
diff --git a/upstream_README.md b/upstream_README.md
new file mode 100644
index 0000000000..e89fb15010
--- /dev/null
+++ b/upstream_README.md
@@ -0,0 +1,34 @@
+[![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
+[![Weblate](https://translate.element.io/widgets/element-android/-/svg-badge.svg)](https://translate.element.io/engage/element-android/?utm_source=widget)
+[![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
+[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=alert_status)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=bugs)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+
+# Element Android
+
+Element Android is an Android Matrix Client provided by [Element](https://element.io/).
+
+It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-android) with a new user experience.
+
+[](https://play.google.com/store/apps/details?id=im.vector.app)
+[](https://f-droid.org/app/im.vector.app)
+
+Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
+
+# New Android SDK
+
+Element is based on a new Android SDK fully written in Kotlin (like Element). In order to make the early development as fast as possible, Element and the new SDK currently share the same git repository.
+
+At each Element release, the SDK module is copied to a dedicated repository: https://github.com/matrix-org/matrix-android-sdk2. That way, third party apps can add a regular gradle dependency to use it. So more details on how to do that here: https://github.com/matrix-org/matrix-android-sdk2.
+
+# Roadmap
+
+The version 1.0.0 of Element still misses some features which was previously included in Riot-Android.
+The team will work to add them on a regular basis.
+
+## Contributing
+
+Please refer to [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) if you want to contribute on Matrix Android projects!
+
+Come chat with the community in the dedicated Matrix [room](https://matrix.to/#/#element-android:matrix.org).
diff --git a/fastlane/fastlane/metadata/android/de/full_description.txt b/upstream_fastlane/fastlane/metadata/android/de/full_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/de/full_description.txt
rename to upstream_fastlane/fastlane/metadata/android/de/full_description.txt
diff --git a/fastlane/fastlane/metadata/android/de/short_description.txt b/upstream_fastlane/fastlane/metadata/android/de/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/de/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/de/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/de/title.txt b/upstream_fastlane/fastlane/metadata/android/de/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/de/title.txt
rename to upstream_fastlane/fastlane/metadata/android/de/title.txt
diff --git a/fastlane/fastlane/metadata/android/en-US/full_description.txt b/upstream_fastlane/fastlane/metadata/android/en-US/full_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/en-US/full_description.txt
rename to upstream_fastlane/fastlane/metadata/android/en-US/full_description.txt
diff --git a/fastlane/fastlane/metadata/android/en-US/short_description.txt b/upstream_fastlane/fastlane/metadata/android/en-US/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/en-US/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/en-US/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/en-US/title.txt b/upstream_fastlane/fastlane/metadata/android/en-US/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/en-US/title.txt
rename to upstream_fastlane/fastlane/metadata/android/en-US/title.txt
diff --git a/fastlane/fastlane/metadata/android/es/full_description.txt b/upstream_fastlane/fastlane/metadata/android/es/full_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/es/full_description.txt
rename to upstream_fastlane/fastlane/metadata/android/es/full_description.txt
diff --git a/fastlane/fastlane/metadata/android/es/short_description.txt b/upstream_fastlane/fastlane/metadata/android/es/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/es/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/es/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/es/title.txt b/upstream_fastlane/fastlane/metadata/android/es/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/es/title.txt
rename to upstream_fastlane/fastlane/metadata/android/es/title.txt
diff --git a/fastlane/fastlane/metadata/android/et/short_description.txt b/upstream_fastlane/fastlane/metadata/android/et/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/et/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/et/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/et/title.txt b/upstream_fastlane/fastlane/metadata/android/et/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/et/title.txt
rename to upstream_fastlane/fastlane/metadata/android/et/title.txt
diff --git a/fastlane/fastlane/metadata/android/fi/short_description.txt b/upstream_fastlane/fastlane/metadata/android/fi/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/fi/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/fi/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/fi/title.txt b/upstream_fastlane/fastlane/metadata/android/fi/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/fi/title.txt
rename to upstream_fastlane/fastlane/metadata/android/fi/title.txt
diff --git a/fastlane/fastlane/metadata/android/fr/title.txt b/upstream_fastlane/fastlane/metadata/android/fr/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/fr/title.txt
rename to upstream_fastlane/fastlane/metadata/android/fr/title.txt
diff --git a/fastlane/fastlane/metadata/android/hu/full_description.txt b/upstream_fastlane/fastlane/metadata/android/hu/full_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/hu/full_description.txt
rename to upstream_fastlane/fastlane/metadata/android/hu/full_description.txt
diff --git a/fastlane/fastlane/metadata/android/hu/short_description.txt b/upstream_fastlane/fastlane/metadata/android/hu/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/hu/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/hu/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/hu/title.txt b/upstream_fastlane/fastlane/metadata/android/hu/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/hu/title.txt
rename to upstream_fastlane/fastlane/metadata/android/hu/title.txt
diff --git a/fastlane/fastlane/metadata/android/it/full_description.txt b/upstream_fastlane/fastlane/metadata/android/it/full_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/it/full_description.txt
rename to upstream_fastlane/fastlane/metadata/android/it/full_description.txt
diff --git a/fastlane/fastlane/metadata/android/it/short_description.txt b/upstream_fastlane/fastlane/metadata/android/it/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/it/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/it/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/it/title.txt b/upstream_fastlane/fastlane/metadata/android/it/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/it/title.txt
rename to upstream_fastlane/fastlane/metadata/android/it/title.txt
diff --git a/fastlane/fastlane/metadata/android/kab/full_description.txt b/upstream_fastlane/fastlane/metadata/android/kab/full_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/kab/full_description.txt
rename to upstream_fastlane/fastlane/metadata/android/kab/full_description.txt
diff --git a/fastlane/fastlane/metadata/android/kab/short_description.txt b/upstream_fastlane/fastlane/metadata/android/kab/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/kab/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/kab/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/kab/title.txt b/upstream_fastlane/fastlane/metadata/android/kab/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/kab/title.txt
rename to upstream_fastlane/fastlane/metadata/android/kab/title.txt
diff --git a/fastlane/fastlane/metadata/android/pt_BR/full_description.txt b/upstream_fastlane/fastlane/metadata/android/pt_BR/full_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/pt_BR/full_description.txt
rename to upstream_fastlane/fastlane/metadata/android/pt_BR/full_description.txt
diff --git a/fastlane/fastlane/metadata/android/pt_BR/short_description.txt b/upstream_fastlane/fastlane/metadata/android/pt_BR/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/pt_BR/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/pt_BR/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/pt_BR/title.txt b/upstream_fastlane/fastlane/metadata/android/pt_BR/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/pt_BR/title.txt
rename to upstream_fastlane/fastlane/metadata/android/pt_BR/title.txt
diff --git a/fastlane/fastlane/metadata/android/ru/full_description.txt b/upstream_fastlane/fastlane/metadata/android/ru/full_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/ru/full_description.txt
rename to upstream_fastlane/fastlane/metadata/android/ru/full_description.txt
diff --git a/fastlane/fastlane/metadata/android/ru/short_description.txt b/upstream_fastlane/fastlane/metadata/android/ru/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/ru/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/ru/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/ru/title.txt b/upstream_fastlane/fastlane/metadata/android/ru/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/ru/title.txt
rename to upstream_fastlane/fastlane/metadata/android/ru/title.txt
diff --git a/fastlane/fastlane/metadata/android/sk/full_description.txt b/upstream_fastlane/fastlane/metadata/android/sk/full_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/sk/full_description.txt
rename to upstream_fastlane/fastlane/metadata/android/sk/full_description.txt
diff --git a/fastlane/fastlane/metadata/android/sk/short_description.txt b/upstream_fastlane/fastlane/metadata/android/sk/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/sk/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/sk/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/sk/title.txt b/upstream_fastlane/fastlane/metadata/android/sk/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/sk/title.txt
rename to upstream_fastlane/fastlane/metadata/android/sk/title.txt
diff --git a/fastlane/fastlane/metadata/android/sv/full_description.txt b/upstream_fastlane/fastlane/metadata/android/sv/full_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/sv/full_description.txt
rename to upstream_fastlane/fastlane/metadata/android/sv/full_description.txt
diff --git a/fastlane/fastlane/metadata/android/sv/short_description.txt b/upstream_fastlane/fastlane/metadata/android/sv/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/sv/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/sv/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/sv/title.txt b/upstream_fastlane/fastlane/metadata/android/sv/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/sv/title.txt
rename to upstream_fastlane/fastlane/metadata/android/sv/title.txt
diff --git a/fastlane/fastlane/metadata/android/th/short_description.txt b/upstream_fastlane/fastlane/metadata/android/th/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/th/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/th/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/th/title.txt b/upstream_fastlane/fastlane/metadata/android/th/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/th/title.txt
rename to upstream_fastlane/fastlane/metadata/android/th/title.txt
diff --git a/fastlane/fastlane/metadata/android/tr/short_description.txt b/upstream_fastlane/fastlane/metadata/android/tr/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/tr/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/tr/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/tr/title.txt b/upstream_fastlane/fastlane/metadata/android/tr/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/tr/title.txt
rename to upstream_fastlane/fastlane/metadata/android/tr/title.txt
diff --git a/fastlane/fastlane/metadata/android/uk/full_description.txt b/upstream_fastlane/fastlane/metadata/android/uk/full_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/uk/full_description.txt
rename to upstream_fastlane/fastlane/metadata/android/uk/full_description.txt
diff --git a/fastlane/fastlane/metadata/android/uk/short_description.txt b/upstream_fastlane/fastlane/metadata/android/uk/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/uk/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/uk/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/uk/title.txt b/upstream_fastlane/fastlane/metadata/android/uk/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/uk/title.txt
rename to upstream_fastlane/fastlane/metadata/android/uk/title.txt
diff --git a/fastlane/fastlane/metadata/android/zh_Hans/full_description.txt b/upstream_fastlane/fastlane/metadata/android/zh_Hans/full_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/zh_Hans/full_description.txt
rename to upstream_fastlane/fastlane/metadata/android/zh_Hans/full_description.txt
diff --git a/fastlane/fastlane/metadata/android/zh_Hans/short_description.txt b/upstream_fastlane/fastlane/metadata/android/zh_Hans/short_description.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/zh_Hans/short_description.txt
rename to upstream_fastlane/fastlane/metadata/android/zh_Hans/short_description.txt
diff --git a/fastlane/fastlane/metadata/android/zh_Hans/title.txt b/upstream_fastlane/fastlane/metadata/android/zh_Hans/title.txt
similarity index 100%
rename from fastlane/fastlane/metadata/android/zh_Hans/title.txt
rename to upstream_fastlane/fastlane/metadata/android/zh_Hans/title.txt
diff --git a/fastlane/metadata/android/ar/changelogs/40100100.txt b/upstream_fastlane/metadata/android/ar/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/ar/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/ar/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/ar/changelogs/40100110.txt b/upstream_fastlane/metadata/android/ar/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/ar/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/ar/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/ar/changelogs/40100120.txt b/upstream_fastlane/metadata/android/ar/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/ar/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/ar/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/ar/changelogs/40100130.txt b/upstream_fastlane/metadata/android/ar/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/ar/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/ar/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/ar/changelogs/40100140.txt b/upstream_fastlane/metadata/android/ar/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/ar/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/ar/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/ar/changelogs/40100150.txt b/upstream_fastlane/metadata/android/ar/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/ar/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/ar/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/ar/changelogs/40100160.txt b/upstream_fastlane/metadata/android/ar/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/ar/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/ar/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/ar/changelogs/40100170.txt b/upstream_fastlane/metadata/android/ar/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/ar/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/ar/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/ar/changelogs/40101010.txt b/upstream_fastlane/metadata/android/ar/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/ar/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/ar/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/ar/full_description.txt b/upstream_fastlane/metadata/android/ar/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/ar/full_description.txt
rename to upstream_fastlane/metadata/android/ar/full_description.txt
diff --git a/fastlane/metadata/android/ar/short_description.txt b/upstream_fastlane/metadata/android/ar/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/ar/short_description.txt
rename to upstream_fastlane/metadata/android/ar/short_description.txt
diff --git a/fastlane/metadata/android/ar/title.txt b/upstream_fastlane/metadata/android/ar/title.txt
similarity index 100%
rename from fastlane/metadata/android/ar/title.txt
rename to upstream_fastlane/metadata/android/ar/title.txt
diff --git a/fastlane/metadata/android/bg/full_description.txt b/upstream_fastlane/metadata/android/bg/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/bg/full_description.txt
rename to upstream_fastlane/metadata/android/bg/full_description.txt
diff --git a/fastlane/metadata/android/bg/short_description.txt b/upstream_fastlane/metadata/android/bg/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/bg/short_description.txt
rename to upstream_fastlane/metadata/android/bg/short_description.txt
diff --git a/fastlane/metadata/android/bg/title.txt b/upstream_fastlane/metadata/android/bg/title.txt
similarity index 100%
rename from fastlane/metadata/android/bg/title.txt
rename to upstream_fastlane/metadata/android/bg/title.txt
diff --git a/fastlane/metadata/android/ca/changelogs/40100100.txt b/upstream_fastlane/metadata/android/ca/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/ca/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/ca/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/ca/changelogs/40100110.txt b/upstream_fastlane/metadata/android/ca/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/ca/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/ca/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/ca/changelogs/40100120.txt b/upstream_fastlane/metadata/android/ca/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/ca/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/ca/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/ca/changelogs/40100130.txt b/upstream_fastlane/metadata/android/ca/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/ca/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/ca/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/ca/changelogs/40100140.txt b/upstream_fastlane/metadata/android/ca/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/ca/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/ca/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/ca/changelogs/40100150.txt b/upstream_fastlane/metadata/android/ca/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/ca/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/ca/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/ca/changelogs/40100160.txt b/upstream_fastlane/metadata/android/ca/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/ca/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/ca/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/ca/changelogs/40100170.txt b/upstream_fastlane/metadata/android/ca/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/ca/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/ca/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/ca/changelogs/40101000.txt b/upstream_fastlane/metadata/android/ca/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/ca/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/ca/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/ca/changelogs/40101010.txt b/upstream_fastlane/metadata/android/ca/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/ca/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/ca/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/ca/changelogs/40101020.txt b/upstream_fastlane/metadata/android/ca/changelogs/40101020.txt
similarity index 100%
rename from fastlane/metadata/android/ca/changelogs/40101020.txt
rename to upstream_fastlane/metadata/android/ca/changelogs/40101020.txt
diff --git a/fastlane/metadata/android/ca/changelogs/40101030.txt b/upstream_fastlane/metadata/android/ca/changelogs/40101030.txt
similarity index 100%
rename from fastlane/metadata/android/ca/changelogs/40101030.txt
rename to upstream_fastlane/metadata/android/ca/changelogs/40101030.txt
diff --git a/fastlane/metadata/android/ca/full_description.txt b/upstream_fastlane/metadata/android/ca/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/ca/full_description.txt
rename to upstream_fastlane/metadata/android/ca/full_description.txt
diff --git a/fastlane/metadata/android/ca/short_description.txt b/upstream_fastlane/metadata/android/ca/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/ca/short_description.txt
rename to upstream_fastlane/metadata/android/ca/short_description.txt
diff --git a/fastlane/metadata/android/ca/title.txt b/upstream_fastlane/metadata/android/ca/title.txt
similarity index 100%
rename from fastlane/metadata/android/ca/title.txt
rename to upstream_fastlane/metadata/android/ca/title.txt
diff --git a/fastlane/metadata/android/cs/changelogs/40100100.txt b/upstream_fastlane/metadata/android/cs/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/cs/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/cs/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/cs/changelogs/40100110.txt b/upstream_fastlane/metadata/android/cs/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/cs/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/cs/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/cs/changelogs/40100120.txt b/upstream_fastlane/metadata/android/cs/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/cs/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/cs/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/cs/changelogs/40100130.txt b/upstream_fastlane/metadata/android/cs/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/cs/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/cs/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/cs/changelogs/40100140.txt b/upstream_fastlane/metadata/android/cs/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/cs/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/cs/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/cs/changelogs/40100150.txt b/upstream_fastlane/metadata/android/cs/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/cs/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/cs/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/cs/changelogs/40100160.txt b/upstream_fastlane/metadata/android/cs/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/cs/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/cs/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/cs/changelogs/40100170.txt b/upstream_fastlane/metadata/android/cs/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/cs/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/cs/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/cs/changelogs/40101000.txt b/upstream_fastlane/metadata/android/cs/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/cs/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/cs/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/cs/changelogs/40101010.txt b/upstream_fastlane/metadata/android/cs/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/cs/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/cs/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/cs/changelogs/40101020.txt b/upstream_fastlane/metadata/android/cs/changelogs/40101020.txt
similarity index 100%
rename from fastlane/metadata/android/cs/changelogs/40101020.txt
rename to upstream_fastlane/metadata/android/cs/changelogs/40101020.txt
diff --git a/fastlane/metadata/android/cs/changelogs/40101030.txt b/upstream_fastlane/metadata/android/cs/changelogs/40101030.txt
similarity index 100%
rename from fastlane/metadata/android/cs/changelogs/40101030.txt
rename to upstream_fastlane/metadata/android/cs/changelogs/40101030.txt
diff --git a/fastlane/metadata/android/cs/changelogs/40101040.txt b/upstream_fastlane/metadata/android/cs/changelogs/40101040.txt
similarity index 100%
rename from fastlane/metadata/android/cs/changelogs/40101040.txt
rename to upstream_fastlane/metadata/android/cs/changelogs/40101040.txt
diff --git a/fastlane/metadata/android/cs/changelogs/40101050.txt b/upstream_fastlane/metadata/android/cs/changelogs/40101050.txt
similarity index 100%
rename from fastlane/metadata/android/cs/changelogs/40101050.txt
rename to upstream_fastlane/metadata/android/cs/changelogs/40101050.txt
diff --git a/fastlane/metadata/android/cs/changelogs/40101060.txt b/upstream_fastlane/metadata/android/cs/changelogs/40101060.txt
similarity index 100%
rename from fastlane/metadata/android/cs/changelogs/40101060.txt
rename to upstream_fastlane/metadata/android/cs/changelogs/40101060.txt
diff --git a/fastlane/metadata/android/cs/full_description.txt b/upstream_fastlane/metadata/android/cs/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/cs/full_description.txt
rename to upstream_fastlane/metadata/android/cs/full_description.txt
diff --git a/fastlane/metadata/android/cs/short_description.txt b/upstream_fastlane/metadata/android/cs/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/cs/short_description.txt
rename to upstream_fastlane/metadata/android/cs/short_description.txt
diff --git a/fastlane/metadata/android/cs/title.txt b/upstream_fastlane/metadata/android/cs/title.txt
similarity index 100%
rename from fastlane/metadata/android/cs/title.txt
rename to upstream_fastlane/metadata/android/cs/title.txt
diff --git a/fastlane/metadata/android/de/changelogs/40100100.txt b/upstream_fastlane/metadata/android/de/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/de/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/de/changelogs/40100110.txt b/upstream_fastlane/metadata/android/de/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/de/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/de/changelogs/40100120.txt b/upstream_fastlane/metadata/android/de/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/de/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/de/changelogs/40100130.txt b/upstream_fastlane/metadata/android/de/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/de/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/de/changelogs/40100140.txt b/upstream_fastlane/metadata/android/de/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/de/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/de/changelogs/40100150.txt b/upstream_fastlane/metadata/android/de/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/de/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/de/changelogs/40100160.txt b/upstream_fastlane/metadata/android/de/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/de/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/de/changelogs/40100170.txt b/upstream_fastlane/metadata/android/de/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/de/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/de/changelogs/40101000.txt b/upstream_fastlane/metadata/android/de/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/de/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/de/changelogs/40101010.txt b/upstream_fastlane/metadata/android/de/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/de/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/de/changelogs/40101020.txt b/upstream_fastlane/metadata/android/de/changelogs/40101020.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/40101020.txt
rename to upstream_fastlane/metadata/android/de/changelogs/40101020.txt
diff --git a/fastlane/metadata/android/de/changelogs/40101030.txt b/upstream_fastlane/metadata/android/de/changelogs/40101030.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/40101030.txt
rename to upstream_fastlane/metadata/android/de/changelogs/40101030.txt
diff --git a/fastlane/metadata/android/de/changelogs/40101040.txt b/upstream_fastlane/metadata/android/de/changelogs/40101040.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/40101040.txt
rename to upstream_fastlane/metadata/android/de/changelogs/40101040.txt
diff --git a/fastlane/metadata/android/de/changelogs/40101050.txt b/upstream_fastlane/metadata/android/de/changelogs/40101050.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/40101050.txt
rename to upstream_fastlane/metadata/android/de/changelogs/40101050.txt
diff --git a/fastlane/metadata/android/de/changelogs/40101060.txt b/upstream_fastlane/metadata/android/de/changelogs/40101060.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/40101060.txt
rename to upstream_fastlane/metadata/android/de/changelogs/40101060.txt
diff --git a/fastlane/metadata/android/de/full_description.txt b/upstream_fastlane/metadata/android/de/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/de/full_description.txt
rename to upstream_fastlane/metadata/android/de/full_description.txt
diff --git a/fastlane/metadata/android/de/short_description.txt b/upstream_fastlane/metadata/android/de/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/de/short_description.txt
rename to upstream_fastlane/metadata/android/de/short_description.txt
diff --git a/fastlane/metadata/android/de/title.txt b/upstream_fastlane/metadata/android/de/title.txt
similarity index 100%
rename from fastlane/metadata/android/de/title.txt
rename to upstream_fastlane/metadata/android/de/title.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100100.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100110.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100120.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100130.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100140.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100150.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100160.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100170.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101000.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101010.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101020.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101020.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101020.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101020.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101030.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101030.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101030.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101030.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101040.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101040.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101040.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101040.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101050.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101050.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101050.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101050.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101060.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101060.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101060.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101060.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101070.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101070.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101070.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101070.txt
diff --git a/upstream_fastlane/metadata/android/en-US/full_description.txt b/upstream_fastlane/metadata/android/en-US/full_description.txt
new file mode 100644
index 0000000000..853885944c
--- /dev/null
+++ b/upstream_fastlane/metadata/android/en-US/full_description.txt
@@ -0,0 +1,39 @@
+Element is both a secure messenger and a productivity team collaboration app that is ideal for group chats while remote working. This chat app uses end-to-end encryption to provide powerful video conferencing, file sharing and voice calls.
+
+Element’s features include:
+- Advanced online communication tools
+- Fully encrypted messages to allow safer corporate communication, even for remote workers
+- Decentralized chat based on the Matrix open source framework
+- File sharing securely with encrypted data while managing projects
+- Video chats with Voice over IP and screen sharing
+- Easy integration with your favourite online collaboration tools, project management tools, VoIP services and other team messaging apps
+
+Element is completely different from other messaging and collaboration apps. It operates on Matrix, an open network for secure messaging and decentralized communication. It allows self-hosting to give users maximum ownership and control of their data and messages.
+
+Privacy and encrypted messaging
+Element protects you from unwanted ads, data mining and walled gardens. It also secures all your data, one-to-one video and voice communication through end-to-end encryption and cross-signed device verification.
+
+Element gives you control over your privacy while allowing you to communicate securely with anyone on the Matrix network, or other business collaboration tools by integrating with apps such as Slack.
+
+Element can be self-hosted
+To allow more control of your sensitive data and conversations, Element can be self-hosted or you can choose any Matrix-based host - the standard for open source, decentralized communication. Element gives you privacy, security compliance and integration flexibility.
+
+Own your data
+You decide where to keep your data and messages. Without the risk of data mining or access from third parties.
+
+Element puts you in control in different ways:
+1. Get a free account on the matrix.org public server hosted by the Matrix developers, or choose from thousands of public servers hosted by volunteers
+2. Self-host your account by running a server on your own IT infrastructure
+3. Sign up for an account on a custom server by simply subscribing to the Element Matrix Services hosting platform
+
+Open messaging and collaboration
+You can chat with anyone on the Matrix network, whether they’re using Element, another Matrix app or even if they are using a different messaging app.
+
+Super secure
+Real end-to-end encryption (only those in the conversation can decrypt messages), and cross-signed device verification.
+
+Complete communication and integration
+Messaging, voice and video calls, file sharing, screen sharing and a whole bunch of integrations, bots and widgets. Build rooms, communities, stay in touch and get things done.
+
+Pick up where you left off
+Stay in touch wherever you are with fully synchronised message history across all your devices and on the web at https://app.element.io
\ No newline at end of file
diff --git a/upstream_fastlane/metadata/android/en-US/images/featureGraphic.png b/upstream_fastlane/metadata/android/en-US/images/featureGraphic.png
new file mode 100644
index 0000000000..97f45aafd3
Binary files /dev/null and b/upstream_fastlane/metadata/android/en-US/images/featureGraphic.png differ
diff --git a/upstream_fastlane/metadata/android/en-US/images/icon.png b/upstream_fastlane/metadata/android/en-US/images/icon.png
new file mode 100644
index 0000000000..e449d60ca9
Binary files /dev/null and b/upstream_fastlane/metadata/android/en-US/images/icon.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
rename to upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
rename to upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
rename to upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
rename to upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png b/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
rename to upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png b/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
rename to upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png b/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/7.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/7.png
rename to upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/7.png
diff --git a/upstream_fastlane/metadata/android/en-US/short_description.txt b/upstream_fastlane/metadata/android/en-US/short_description.txt
new file mode 100644
index 0000000000..5a98f6f772
--- /dev/null
+++ b/upstream_fastlane/metadata/android/en-US/short_description.txt
@@ -0,0 +1 @@
+Group messenger - encrypted messaging, group chat and video calls
\ No newline at end of file
diff --git a/upstream_fastlane/metadata/android/en-US/title.txt b/upstream_fastlane/metadata/android/en-US/title.txt
new file mode 100644
index 0000000000..12fa89b99b
--- /dev/null
+++ b/upstream_fastlane/metadata/android/en-US/title.txt
@@ -0,0 +1 @@
+Element - Secure Messenger
\ No newline at end of file
diff --git a/fastlane/metadata/android/eo/full_description.txt b/upstream_fastlane/metadata/android/eo/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/eo/full_description.txt
rename to upstream_fastlane/metadata/android/eo/full_description.txt
diff --git a/fastlane/metadata/android/eo/short_description.txt b/upstream_fastlane/metadata/android/eo/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/eo/short_description.txt
rename to upstream_fastlane/metadata/android/eo/short_description.txt
diff --git a/fastlane/metadata/android/eo/title.txt b/upstream_fastlane/metadata/android/eo/title.txt
similarity index 100%
rename from fastlane/metadata/android/eo/title.txt
rename to upstream_fastlane/metadata/android/eo/title.txt
diff --git a/fastlane/metadata/android/es/changelogs/40100100.txt b/upstream_fastlane/metadata/android/es/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/es/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/es/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/es/full_description.txt b/upstream_fastlane/metadata/android/es/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/es/full_description.txt
rename to upstream_fastlane/metadata/android/es/full_description.txt
diff --git a/fastlane/metadata/android/es/short_description.txt b/upstream_fastlane/metadata/android/es/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/es/short_description.txt
rename to upstream_fastlane/metadata/android/es/short_description.txt
diff --git a/fastlane/metadata/android/es/title.txt b/upstream_fastlane/metadata/android/es/title.txt
similarity index 100%
rename from fastlane/metadata/android/es/title.txt
rename to upstream_fastlane/metadata/android/es/title.txt
diff --git a/fastlane/metadata/android/et/changelogs/40100100.txt b/upstream_fastlane/metadata/android/et/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/et/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/et/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/et/changelogs/40100110.txt b/upstream_fastlane/metadata/android/et/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/et/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/et/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/et/changelogs/40100120.txt b/upstream_fastlane/metadata/android/et/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/et/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/et/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/et/changelogs/40100130.txt b/upstream_fastlane/metadata/android/et/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/et/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/et/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/et/changelogs/40100140.txt b/upstream_fastlane/metadata/android/et/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/et/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/et/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/et/changelogs/40100150.txt b/upstream_fastlane/metadata/android/et/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/et/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/et/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/et/changelogs/40100160.txt b/upstream_fastlane/metadata/android/et/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/et/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/et/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/et/changelogs/40100170.txt b/upstream_fastlane/metadata/android/et/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/et/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/et/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/et/changelogs/40101000.txt b/upstream_fastlane/metadata/android/et/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/et/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/et/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/et/changelogs/40101010.txt b/upstream_fastlane/metadata/android/et/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/et/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/et/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/et/changelogs/40101020.txt b/upstream_fastlane/metadata/android/et/changelogs/40101020.txt
similarity index 100%
rename from fastlane/metadata/android/et/changelogs/40101020.txt
rename to upstream_fastlane/metadata/android/et/changelogs/40101020.txt
diff --git a/fastlane/metadata/android/et/changelogs/40101030.txt b/upstream_fastlane/metadata/android/et/changelogs/40101030.txt
similarity index 100%
rename from fastlane/metadata/android/et/changelogs/40101030.txt
rename to upstream_fastlane/metadata/android/et/changelogs/40101030.txt
diff --git a/fastlane/metadata/android/et/changelogs/40101040.txt b/upstream_fastlane/metadata/android/et/changelogs/40101040.txt
similarity index 100%
rename from fastlane/metadata/android/et/changelogs/40101040.txt
rename to upstream_fastlane/metadata/android/et/changelogs/40101040.txt
diff --git a/fastlane/metadata/android/et/changelogs/40101050.txt b/upstream_fastlane/metadata/android/et/changelogs/40101050.txt
similarity index 100%
rename from fastlane/metadata/android/et/changelogs/40101050.txt
rename to upstream_fastlane/metadata/android/et/changelogs/40101050.txt
diff --git a/fastlane/metadata/android/et/changelogs/40101060.txt b/upstream_fastlane/metadata/android/et/changelogs/40101060.txt
similarity index 100%
rename from fastlane/metadata/android/et/changelogs/40101060.txt
rename to upstream_fastlane/metadata/android/et/changelogs/40101060.txt
diff --git a/fastlane/metadata/android/et/full_description.txt b/upstream_fastlane/metadata/android/et/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/et/full_description.txt
rename to upstream_fastlane/metadata/android/et/full_description.txt
diff --git a/fastlane/metadata/android/et/short_description.txt b/upstream_fastlane/metadata/android/et/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/et/short_description.txt
rename to upstream_fastlane/metadata/android/et/short_description.txt
diff --git a/fastlane/metadata/android/et/title.txt b/upstream_fastlane/metadata/android/et/title.txt
similarity index 100%
rename from fastlane/metadata/android/et/title.txt
rename to upstream_fastlane/metadata/android/et/title.txt
diff --git a/fastlane/metadata/android/fa/changelogs/40100100.txt b/upstream_fastlane/metadata/android/fa/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/fa/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/fa/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/fa/changelogs/40100110.txt b/upstream_fastlane/metadata/android/fa/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/fa/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/fa/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/fa/changelogs/40100120.txt b/upstream_fastlane/metadata/android/fa/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/fa/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/fa/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/fa/changelogs/40100130.txt b/upstream_fastlane/metadata/android/fa/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/fa/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/fa/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/fa/changelogs/40100140.txt b/upstream_fastlane/metadata/android/fa/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/fa/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/fa/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/fa/changelogs/40100150.txt b/upstream_fastlane/metadata/android/fa/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/fa/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/fa/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/fa/changelogs/40100160.txt b/upstream_fastlane/metadata/android/fa/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/fa/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/fa/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/fa/changelogs/40100170.txt b/upstream_fastlane/metadata/android/fa/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/fa/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/fa/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/fa/changelogs/40101000.txt b/upstream_fastlane/metadata/android/fa/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/fa/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/fa/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/fa/changelogs/40101010.txt b/upstream_fastlane/metadata/android/fa/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/fa/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/fa/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/fa/full_description.txt b/upstream_fastlane/metadata/android/fa/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/fa/full_description.txt
rename to upstream_fastlane/metadata/android/fa/full_description.txt
diff --git a/fastlane/metadata/android/fa/short_description.txt b/upstream_fastlane/metadata/android/fa/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/fa/short_description.txt
rename to upstream_fastlane/metadata/android/fa/short_description.txt
diff --git a/fastlane/metadata/android/fa/title.txt b/upstream_fastlane/metadata/android/fa/title.txt
similarity index 100%
rename from fastlane/metadata/android/fa/title.txt
rename to upstream_fastlane/metadata/android/fa/title.txt
diff --git a/fastlane/metadata/android/fi/changelogs/40100100.txt b/upstream_fastlane/metadata/android/fi/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/fi/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/fi/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/fi/changelogs/40100110.txt b/upstream_fastlane/metadata/android/fi/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/fi/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/fi/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/fi/changelogs/40100120.txt b/upstream_fastlane/metadata/android/fi/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/fi/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/fi/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/fi/changelogs/40100130.txt b/upstream_fastlane/metadata/android/fi/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/fi/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/fi/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/fi/changelogs/40100140.txt b/upstream_fastlane/metadata/android/fi/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/fi/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/fi/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/fi/changelogs/40100150.txt b/upstream_fastlane/metadata/android/fi/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/fi/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/fi/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/fi/changelogs/40100160.txt b/upstream_fastlane/metadata/android/fi/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/fi/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/fi/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/fi/changelogs/40100170.txt b/upstream_fastlane/metadata/android/fi/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/fi/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/fi/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/fi/changelogs/40101000.txt b/upstream_fastlane/metadata/android/fi/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/fi/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/fi/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/fi/changelogs/40101010.txt b/upstream_fastlane/metadata/android/fi/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/fi/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/fi/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/fi/full_description.txt b/upstream_fastlane/metadata/android/fi/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/fi/full_description.txt
rename to upstream_fastlane/metadata/android/fi/full_description.txt
diff --git a/fastlane/metadata/android/fi/short_description.txt b/upstream_fastlane/metadata/android/fi/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/fi/short_description.txt
rename to upstream_fastlane/metadata/android/fi/short_description.txt
diff --git a/fastlane/metadata/android/fi/title.txt b/upstream_fastlane/metadata/android/fi/title.txt
similarity index 100%
rename from fastlane/metadata/android/fi/title.txt
rename to upstream_fastlane/metadata/android/fi/title.txt
diff --git a/fastlane/metadata/android/fr/changelogs/40100100.txt b/upstream_fastlane/metadata/android/fr/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/fr/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/fr/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/fr/changelogs/40100110.txt b/upstream_fastlane/metadata/android/fr/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/fr/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/fr/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/fr/changelogs/40100120.txt b/upstream_fastlane/metadata/android/fr/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/fr/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/fr/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/fr/changelogs/40100130.txt b/upstream_fastlane/metadata/android/fr/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/fr/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/fr/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/fr/changelogs/40100140.txt b/upstream_fastlane/metadata/android/fr/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/fr/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/fr/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/fr/changelogs/40100150.txt b/upstream_fastlane/metadata/android/fr/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/fr/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/fr/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/fr/changelogs/40100160.txt b/upstream_fastlane/metadata/android/fr/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/fr/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/fr/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/fr/changelogs/40100170.txt b/upstream_fastlane/metadata/android/fr/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/fr/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/fr/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/fr/changelogs/40101000.txt b/upstream_fastlane/metadata/android/fr/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/fr/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/fr/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/fr/changelogs/40101010.txt b/upstream_fastlane/metadata/android/fr/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/fr/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/fr/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/fr/changelogs/40101020.txt b/upstream_fastlane/metadata/android/fr/changelogs/40101020.txt
similarity index 100%
rename from fastlane/metadata/android/fr/changelogs/40101020.txt
rename to upstream_fastlane/metadata/android/fr/changelogs/40101020.txt
diff --git a/fastlane/metadata/android/fr/changelogs/40101030.txt b/upstream_fastlane/metadata/android/fr/changelogs/40101030.txt
similarity index 100%
rename from fastlane/metadata/android/fr/changelogs/40101030.txt
rename to upstream_fastlane/metadata/android/fr/changelogs/40101030.txt
diff --git a/fastlane/metadata/android/fr/changelogs/40101040.txt b/upstream_fastlane/metadata/android/fr/changelogs/40101040.txt
similarity index 100%
rename from fastlane/metadata/android/fr/changelogs/40101040.txt
rename to upstream_fastlane/metadata/android/fr/changelogs/40101040.txt
diff --git a/fastlane/metadata/android/fr/changelogs/40101050.txt b/upstream_fastlane/metadata/android/fr/changelogs/40101050.txt
similarity index 100%
rename from fastlane/metadata/android/fr/changelogs/40101050.txt
rename to upstream_fastlane/metadata/android/fr/changelogs/40101050.txt
diff --git a/fastlane/metadata/android/fr/changelogs/40101060.txt b/upstream_fastlane/metadata/android/fr/changelogs/40101060.txt
similarity index 100%
rename from fastlane/metadata/android/fr/changelogs/40101060.txt
rename to upstream_fastlane/metadata/android/fr/changelogs/40101060.txt
diff --git a/fastlane/metadata/android/fr/full_description.txt b/upstream_fastlane/metadata/android/fr/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/fr/full_description.txt
rename to upstream_fastlane/metadata/android/fr/full_description.txt
diff --git a/fastlane/metadata/android/fr/short_description.txt b/upstream_fastlane/metadata/android/fr/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/fr/short_description.txt
rename to upstream_fastlane/metadata/android/fr/short_description.txt
diff --git a/fastlane/metadata/android/fr/title.txt b/upstream_fastlane/metadata/android/fr/title.txt
similarity index 100%
rename from fastlane/metadata/android/fr/title.txt
rename to upstream_fastlane/metadata/android/fr/title.txt
diff --git a/fastlane/metadata/android/fy/changelogs/40100100.txt b/upstream_fastlane/metadata/android/fy/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/fy/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/fy/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/fy/changelogs/40100110.txt b/upstream_fastlane/metadata/android/fy/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/fy/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/fy/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/fy/changelogs/40100120.txt b/upstream_fastlane/metadata/android/fy/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/fy/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/fy/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/fy/changelogs/40100130.txt b/upstream_fastlane/metadata/android/fy/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/fy/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/fy/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/fy/changelogs/40100140.txt b/upstream_fastlane/metadata/android/fy/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/fy/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/fy/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/fy/changelogs/40100150.txt b/upstream_fastlane/metadata/android/fy/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/fy/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/fy/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/fy/changelogs/40100160.txt b/upstream_fastlane/metadata/android/fy/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/fy/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/fy/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/fy/changelogs/40100170.txt b/upstream_fastlane/metadata/android/fy/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/fy/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/fy/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/fy/changelogs/40101000.txt b/upstream_fastlane/metadata/android/fy/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/fy/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/fy/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/fy/changelogs/40101010.txt b/upstream_fastlane/metadata/android/fy/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/fy/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/fy/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/fy/changelogs/40101020.txt b/upstream_fastlane/metadata/android/fy/changelogs/40101020.txt
similarity index 100%
rename from fastlane/metadata/android/fy/changelogs/40101020.txt
rename to upstream_fastlane/metadata/android/fy/changelogs/40101020.txt
diff --git a/fastlane/metadata/android/fy/changelogs/40101030.txt b/upstream_fastlane/metadata/android/fy/changelogs/40101030.txt
similarity index 100%
rename from fastlane/metadata/android/fy/changelogs/40101030.txt
rename to upstream_fastlane/metadata/android/fy/changelogs/40101030.txt
diff --git a/fastlane/metadata/android/fy/changelogs/40101040.txt b/upstream_fastlane/metadata/android/fy/changelogs/40101040.txt
similarity index 100%
rename from fastlane/metadata/android/fy/changelogs/40101040.txt
rename to upstream_fastlane/metadata/android/fy/changelogs/40101040.txt
diff --git a/fastlane/metadata/android/fy/changelogs/40101050.txt b/upstream_fastlane/metadata/android/fy/changelogs/40101050.txt
similarity index 100%
rename from fastlane/metadata/android/fy/changelogs/40101050.txt
rename to upstream_fastlane/metadata/android/fy/changelogs/40101050.txt
diff --git a/fastlane/metadata/android/fy/changelogs/40101060.txt b/upstream_fastlane/metadata/android/fy/changelogs/40101060.txt
similarity index 100%
rename from fastlane/metadata/android/fy/changelogs/40101060.txt
rename to upstream_fastlane/metadata/android/fy/changelogs/40101060.txt
diff --git a/fastlane/metadata/android/fy/short_description.txt b/upstream_fastlane/metadata/android/fy/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/fy/short_description.txt
rename to upstream_fastlane/metadata/android/fy/short_description.txt
diff --git a/fastlane/metadata/android/fy/title.txt b/upstream_fastlane/metadata/android/fy/title.txt
similarity index 100%
rename from fastlane/metadata/android/fy/title.txt
rename to upstream_fastlane/metadata/android/fy/title.txt
diff --git a/fastlane/metadata/android/ga/title.txt b/upstream_fastlane/metadata/android/ga/title.txt
similarity index 100%
rename from fastlane/metadata/android/ga/title.txt
rename to upstream_fastlane/metadata/android/ga/title.txt
diff --git a/fastlane/metadata/android/he/changelogs/40100100.txt b/upstream_fastlane/metadata/android/he/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/he/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/he/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/he/changelogs/40100110.txt b/upstream_fastlane/metadata/android/he/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/he/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/he/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/he/changelogs/40100120.txt b/upstream_fastlane/metadata/android/he/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/he/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/he/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/he/changelogs/40100130.txt b/upstream_fastlane/metadata/android/he/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/he/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/he/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/he/full_description.txt b/upstream_fastlane/metadata/android/he/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/he/full_description.txt
rename to upstream_fastlane/metadata/android/he/full_description.txt
diff --git a/fastlane/metadata/android/he/short_description.txt b/upstream_fastlane/metadata/android/he/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/he/short_description.txt
rename to upstream_fastlane/metadata/android/he/short_description.txt
diff --git a/fastlane/metadata/android/he/title.txt b/upstream_fastlane/metadata/android/he/title.txt
similarity index 100%
rename from fastlane/metadata/android/he/title.txt
rename to upstream_fastlane/metadata/android/he/title.txt
diff --git a/fastlane/metadata/android/hu/changelogs/40100100.txt b/upstream_fastlane/metadata/android/hu/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/hu/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/hu/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/hu/changelogs/40100110.txt b/upstream_fastlane/metadata/android/hu/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/hu/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/hu/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/hu/changelogs/40100120.txt b/upstream_fastlane/metadata/android/hu/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/hu/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/hu/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/hu/changelogs/40100130.txt b/upstream_fastlane/metadata/android/hu/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/hu/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/hu/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/hu/full_description.txt b/upstream_fastlane/metadata/android/hu/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/hu/full_description.txt
rename to upstream_fastlane/metadata/android/hu/full_description.txt
diff --git a/fastlane/metadata/android/hu/short_description.txt b/upstream_fastlane/metadata/android/hu/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/hu/short_description.txt
rename to upstream_fastlane/metadata/android/hu/short_description.txt
diff --git a/fastlane/metadata/android/hu/title.txt b/upstream_fastlane/metadata/android/hu/title.txt
similarity index 100%
rename from fastlane/metadata/android/hu/title.txt
rename to upstream_fastlane/metadata/android/hu/title.txt
diff --git a/fastlane/metadata/android/it/changelogs/40100100.txt b/upstream_fastlane/metadata/android/it/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/it/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/it/changelogs/40100110.txt b/upstream_fastlane/metadata/android/it/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/it/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/it/changelogs/40100120.txt b/upstream_fastlane/metadata/android/it/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/it/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/it/changelogs/40100130.txt b/upstream_fastlane/metadata/android/it/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/it/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/it/changelogs/40100140.txt b/upstream_fastlane/metadata/android/it/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/it/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/it/changelogs/40100150.txt b/upstream_fastlane/metadata/android/it/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/it/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/it/changelogs/40100160.txt b/upstream_fastlane/metadata/android/it/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/it/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/it/changelogs/40100170.txt b/upstream_fastlane/metadata/android/it/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/it/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/it/changelogs/40101000.txt b/upstream_fastlane/metadata/android/it/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/it/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/it/changelogs/40101010.txt b/upstream_fastlane/metadata/android/it/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/it/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/it/changelogs/40101020.txt b/upstream_fastlane/metadata/android/it/changelogs/40101020.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/40101020.txt
rename to upstream_fastlane/metadata/android/it/changelogs/40101020.txt
diff --git a/fastlane/metadata/android/it/changelogs/40101030.txt b/upstream_fastlane/metadata/android/it/changelogs/40101030.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/40101030.txt
rename to upstream_fastlane/metadata/android/it/changelogs/40101030.txt
diff --git a/fastlane/metadata/android/it/changelogs/40101040.txt b/upstream_fastlane/metadata/android/it/changelogs/40101040.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/40101040.txt
rename to upstream_fastlane/metadata/android/it/changelogs/40101040.txt
diff --git a/fastlane/metadata/android/it/changelogs/40101050.txt b/upstream_fastlane/metadata/android/it/changelogs/40101050.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/40101050.txt
rename to upstream_fastlane/metadata/android/it/changelogs/40101050.txt
diff --git a/fastlane/metadata/android/it/changelogs/40101060.txt b/upstream_fastlane/metadata/android/it/changelogs/40101060.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/40101060.txt
rename to upstream_fastlane/metadata/android/it/changelogs/40101060.txt
diff --git a/fastlane/metadata/android/it/full_description.txt b/upstream_fastlane/metadata/android/it/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/it/full_description.txt
rename to upstream_fastlane/metadata/android/it/full_description.txt
diff --git a/fastlane/metadata/android/it/short_description.txt b/upstream_fastlane/metadata/android/it/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/it/short_description.txt
rename to upstream_fastlane/metadata/android/it/short_description.txt
diff --git a/fastlane/metadata/android/it/title.txt b/upstream_fastlane/metadata/android/it/title.txt
similarity index 100%
rename from fastlane/metadata/android/it/title.txt
rename to upstream_fastlane/metadata/android/it/title.txt
diff --git a/fastlane/metadata/android/ja/changelogs/40100100.txt b/upstream_fastlane/metadata/android/ja/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/ja/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/ja/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/ja/changelogs/40100110.txt b/upstream_fastlane/metadata/android/ja/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/ja/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/ja/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/ja/changelogs/40100120.txt b/upstream_fastlane/metadata/android/ja/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/ja/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/ja/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/ja/changelogs/40100130.txt b/upstream_fastlane/metadata/android/ja/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/ja/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/ja/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/ja/changelogs/40100140.txt b/upstream_fastlane/metadata/android/ja/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/ja/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/ja/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/ja/changelogs/40100150.txt b/upstream_fastlane/metadata/android/ja/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/ja/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/ja/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/ja/changelogs/40100160.txt b/upstream_fastlane/metadata/android/ja/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/ja/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/ja/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/ja/changelogs/40100170.txt b/upstream_fastlane/metadata/android/ja/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/ja/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/ja/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/ja/changelogs/40101000.txt b/upstream_fastlane/metadata/android/ja/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/ja/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/ja/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/ja/changelogs/40101010.txt b/upstream_fastlane/metadata/android/ja/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/ja/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/ja/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/ja/changelogs/40101020.txt b/upstream_fastlane/metadata/android/ja/changelogs/40101020.txt
similarity index 100%
rename from fastlane/metadata/android/ja/changelogs/40101020.txt
rename to upstream_fastlane/metadata/android/ja/changelogs/40101020.txt
diff --git a/fastlane/metadata/android/ja/changelogs/40101030.txt b/upstream_fastlane/metadata/android/ja/changelogs/40101030.txt
similarity index 100%
rename from fastlane/metadata/android/ja/changelogs/40101030.txt
rename to upstream_fastlane/metadata/android/ja/changelogs/40101030.txt
diff --git a/fastlane/metadata/android/ja/full_description.txt b/upstream_fastlane/metadata/android/ja/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/ja/full_description.txt
rename to upstream_fastlane/metadata/android/ja/full_description.txt
diff --git a/fastlane/metadata/android/ja/short_description.txt b/upstream_fastlane/metadata/android/ja/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/ja/short_description.txt
rename to upstream_fastlane/metadata/android/ja/short_description.txt
diff --git a/fastlane/metadata/android/ja/title.txt b/upstream_fastlane/metadata/android/ja/title.txt
similarity index 100%
rename from fastlane/metadata/android/ja/title.txt
rename to upstream_fastlane/metadata/android/ja/title.txt
diff --git a/fastlane/metadata/android/kab/full_description.txt b/upstream_fastlane/metadata/android/kab/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/kab/full_description.txt
rename to upstream_fastlane/metadata/android/kab/full_description.txt
diff --git a/fastlane/metadata/android/kab/short_description.txt b/upstream_fastlane/metadata/android/kab/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/kab/short_description.txt
rename to upstream_fastlane/metadata/android/kab/short_description.txt
diff --git a/fastlane/metadata/android/kab/title.txt b/upstream_fastlane/metadata/android/kab/title.txt
similarity index 100%
rename from fastlane/metadata/android/kab/title.txt
rename to upstream_fastlane/metadata/android/kab/title.txt
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40100100.txt b/upstream_fastlane/metadata/android/nb-NO/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/nb-NO/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/nb-NO/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40100110.txt b/upstream_fastlane/metadata/android/nb-NO/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/nb-NO/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/nb-NO/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40100120.txt b/upstream_fastlane/metadata/android/nb-NO/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/nb-NO/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/nb-NO/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40100130.txt b/upstream_fastlane/metadata/android/nb-NO/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/nb-NO/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/nb-NO/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40100140.txt b/upstream_fastlane/metadata/android/nb-NO/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/nb-NO/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/nb-NO/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40100150.txt b/upstream_fastlane/metadata/android/nb-NO/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/nb-NO/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/nb-NO/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40100160.txt b/upstream_fastlane/metadata/android/nb-NO/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/nb-NO/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/nb-NO/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40100170.txt b/upstream_fastlane/metadata/android/nb-NO/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/nb-NO/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/nb-NO/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40101000.txt b/upstream_fastlane/metadata/android/nb-NO/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/nb-NO/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/nb-NO/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40101010.txt b/upstream_fastlane/metadata/android/nb-NO/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/nb-NO/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/nb-NO/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40101020.txt b/upstream_fastlane/metadata/android/nb-NO/changelogs/40101020.txt
similarity index 100%
rename from fastlane/metadata/android/nb-NO/changelogs/40101020.txt
rename to upstream_fastlane/metadata/android/nb-NO/changelogs/40101020.txt
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40101030.txt b/upstream_fastlane/metadata/android/nb-NO/changelogs/40101030.txt
similarity index 100%
rename from fastlane/metadata/android/nb-NO/changelogs/40101030.txt
rename to upstream_fastlane/metadata/android/nb-NO/changelogs/40101030.txt
diff --git a/fastlane/metadata/android/nb-NO/full_description.txt b/upstream_fastlane/metadata/android/nb-NO/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/nb-NO/full_description.txt
rename to upstream_fastlane/metadata/android/nb-NO/full_description.txt
diff --git a/fastlane/metadata/android/nb-NO/short_description.txt b/upstream_fastlane/metadata/android/nb-NO/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/nb-NO/short_description.txt
rename to upstream_fastlane/metadata/android/nb-NO/short_description.txt
diff --git a/fastlane/metadata/android/nb-NO/title.txt b/upstream_fastlane/metadata/android/nb-NO/title.txt
similarity index 100%
rename from fastlane/metadata/android/nb-NO/title.txt
rename to upstream_fastlane/metadata/android/nb-NO/title.txt
diff --git a/fastlane/metadata/android/nb/changelogs/40100170.txt b/upstream_fastlane/metadata/android/nb/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/nb/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/nb/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/nb/changelogs/40101010.txt b/upstream_fastlane/metadata/android/nb/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/nb/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/nb/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/nb/short_description.txt b/upstream_fastlane/metadata/android/nb/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/nb/short_description.txt
rename to upstream_fastlane/metadata/android/nb/short_description.txt
diff --git a/fastlane/metadata/android/nb/title.txt b/upstream_fastlane/metadata/android/nb/title.txt
similarity index 100%
rename from fastlane/metadata/android/nb/title.txt
rename to upstream_fastlane/metadata/android/nb/title.txt
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40100100.txt b/upstream_fastlane/metadata/android/pt-BR/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/pt-BR/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/pt-BR/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40100110.txt b/upstream_fastlane/metadata/android/pt-BR/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/pt-BR/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/pt-BR/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40100120.txt b/upstream_fastlane/metadata/android/pt-BR/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/pt-BR/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/pt-BR/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40100130.txt b/upstream_fastlane/metadata/android/pt-BR/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/pt-BR/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/pt-BR/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40100140.txt b/upstream_fastlane/metadata/android/pt-BR/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/pt-BR/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/pt-BR/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40100150.txt b/upstream_fastlane/metadata/android/pt-BR/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/pt-BR/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/pt-BR/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40100160.txt b/upstream_fastlane/metadata/android/pt-BR/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/pt-BR/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/pt-BR/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40100170.txt b/upstream_fastlane/metadata/android/pt-BR/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/pt-BR/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/pt-BR/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40101000.txt b/upstream_fastlane/metadata/android/pt-BR/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/pt-BR/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/pt-BR/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40101010.txt b/upstream_fastlane/metadata/android/pt-BR/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/pt-BR/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/pt-BR/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/pt-BR/full_description.txt b/upstream_fastlane/metadata/android/pt-BR/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/pt-BR/full_description.txt
rename to upstream_fastlane/metadata/android/pt-BR/full_description.txt
diff --git a/fastlane/metadata/android/pt-BR/short_description.txt b/upstream_fastlane/metadata/android/pt-BR/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/pt-BR/short_description.txt
rename to upstream_fastlane/metadata/android/pt-BR/short_description.txt
diff --git a/fastlane/metadata/android/pt-BR/title.txt b/upstream_fastlane/metadata/android/pt-BR/title.txt
similarity index 100%
rename from fastlane/metadata/android/pt-BR/title.txt
rename to upstream_fastlane/metadata/android/pt-BR/title.txt
diff --git a/fastlane/metadata/android/ru/changelogs/40100100.txt b/upstream_fastlane/metadata/android/ru/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/ru/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/ru/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/ru/changelogs/40100110.txt b/upstream_fastlane/metadata/android/ru/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/ru/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/ru/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/ru/changelogs/40100120.txt b/upstream_fastlane/metadata/android/ru/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/ru/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/ru/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/ru/changelogs/40100130.txt b/upstream_fastlane/metadata/android/ru/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/ru/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/ru/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/ru/changelogs/40100140.txt b/upstream_fastlane/metadata/android/ru/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/ru/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/ru/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/ru/changelogs/40100150.txt b/upstream_fastlane/metadata/android/ru/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/ru/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/ru/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/ru/changelogs/40100160.txt b/upstream_fastlane/metadata/android/ru/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/ru/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/ru/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/ru/changelogs/40100170.txt b/upstream_fastlane/metadata/android/ru/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/ru/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/ru/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/ru/changelogs/40101000.txt b/upstream_fastlane/metadata/android/ru/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/ru/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/ru/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/ru/changelogs/40101010.txt b/upstream_fastlane/metadata/android/ru/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/ru/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/ru/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/ru/changelogs/40101020.txt b/upstream_fastlane/metadata/android/ru/changelogs/40101020.txt
similarity index 100%
rename from fastlane/metadata/android/ru/changelogs/40101020.txt
rename to upstream_fastlane/metadata/android/ru/changelogs/40101020.txt
diff --git a/fastlane/metadata/android/ru/changelogs/40101030.txt b/upstream_fastlane/metadata/android/ru/changelogs/40101030.txt
similarity index 100%
rename from fastlane/metadata/android/ru/changelogs/40101030.txt
rename to upstream_fastlane/metadata/android/ru/changelogs/40101030.txt
diff --git a/fastlane/metadata/android/ru/full_description.txt b/upstream_fastlane/metadata/android/ru/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/ru/full_description.txt
rename to upstream_fastlane/metadata/android/ru/full_description.txt
diff --git a/fastlane/metadata/android/ru/short_description.txt b/upstream_fastlane/metadata/android/ru/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/ru/short_description.txt
rename to upstream_fastlane/metadata/android/ru/short_description.txt
diff --git a/fastlane/metadata/android/ru/title.txt b/upstream_fastlane/metadata/android/ru/title.txt
similarity index 100%
rename from fastlane/metadata/android/ru/title.txt
rename to upstream_fastlane/metadata/android/ru/title.txt
diff --git a/fastlane/metadata/android/si/title.txt b/upstream_fastlane/metadata/android/si/title.txt
similarity index 100%
rename from fastlane/metadata/android/si/title.txt
rename to upstream_fastlane/metadata/android/si/title.txt
diff --git a/fastlane/metadata/android/sk/changelogs/40100100.txt b/upstream_fastlane/metadata/android/sk/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/sk/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/sk/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/sk/changelogs/40100110.txt b/upstream_fastlane/metadata/android/sk/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/sk/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/sk/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/sk/changelogs/40100120.txt b/upstream_fastlane/metadata/android/sk/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/sk/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/sk/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/sk/changelogs/40100130.txt b/upstream_fastlane/metadata/android/sk/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/sk/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/sk/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/sk/changelogs/40100140.txt b/upstream_fastlane/metadata/android/sk/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/sk/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/sk/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/sk/changelogs/40100150.txt b/upstream_fastlane/metadata/android/sk/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/sk/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/sk/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/sk/changelogs/40100160.txt b/upstream_fastlane/metadata/android/sk/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/sk/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/sk/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/sk/changelogs/40100170.txt b/upstream_fastlane/metadata/android/sk/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/sk/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/sk/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/sk/full_description.txt b/upstream_fastlane/metadata/android/sk/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/sk/full_description.txt
rename to upstream_fastlane/metadata/android/sk/full_description.txt
diff --git a/fastlane/metadata/android/sk/short_description.txt b/upstream_fastlane/metadata/android/sk/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/sk/short_description.txt
rename to upstream_fastlane/metadata/android/sk/short_description.txt
diff --git a/fastlane/metadata/android/sk/title.txt b/upstream_fastlane/metadata/android/sk/title.txt
similarity index 100%
rename from fastlane/metadata/android/sk/title.txt
rename to upstream_fastlane/metadata/android/sk/title.txt
diff --git a/fastlane/metadata/android/sr/changelogs/40100100.txt b/upstream_fastlane/metadata/android/sr/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/sr/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/sr/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/sr/changelogs/40100110.txt b/upstream_fastlane/metadata/android/sr/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/sr/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/sr/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/sr/changelogs/40100120.txt b/upstream_fastlane/metadata/android/sr/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/sr/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/sr/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/sr/changelogs/40100130.txt b/upstream_fastlane/metadata/android/sr/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/sr/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/sr/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/sr/changelogs/40100140.txt b/upstream_fastlane/metadata/android/sr/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/sr/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/sr/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/sr/changelogs/40100150.txt b/upstream_fastlane/metadata/android/sr/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/sr/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/sr/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/sr/changelogs/40100160.txt b/upstream_fastlane/metadata/android/sr/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/sr/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/sr/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/sr/changelogs/40100170.txt b/upstream_fastlane/metadata/android/sr/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/sr/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/sr/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/sr/full_description.txt b/upstream_fastlane/metadata/android/sr/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/sr/full_description.txt
rename to upstream_fastlane/metadata/android/sr/full_description.txt
diff --git a/fastlane/metadata/android/sr/short_description.txt b/upstream_fastlane/metadata/android/sr/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/sr/short_description.txt
rename to upstream_fastlane/metadata/android/sr/short_description.txt
diff --git a/fastlane/metadata/android/sr/title.txt b/upstream_fastlane/metadata/android/sr/title.txt
similarity index 100%
rename from fastlane/metadata/android/sr/title.txt
rename to upstream_fastlane/metadata/android/sr/title.txt
diff --git a/fastlane/metadata/android/sv/changelogs/40100100.txt b/upstream_fastlane/metadata/android/sv/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/sv/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/sv/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/sv/changelogs/40100110.txt b/upstream_fastlane/metadata/android/sv/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/sv/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/sv/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/sv/changelogs/40100120.txt b/upstream_fastlane/metadata/android/sv/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/sv/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/sv/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/sv/changelogs/40100130.txt b/upstream_fastlane/metadata/android/sv/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/sv/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/sv/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/sv/changelogs/40100140.txt b/upstream_fastlane/metadata/android/sv/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/sv/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/sv/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/sv/changelogs/40100150.txt b/upstream_fastlane/metadata/android/sv/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/sv/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/sv/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/sv/changelogs/40100160.txt b/upstream_fastlane/metadata/android/sv/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/sv/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/sv/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/sv/changelogs/40100170.txt b/upstream_fastlane/metadata/android/sv/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/sv/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/sv/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/sv/changelogs/40101000.txt b/upstream_fastlane/metadata/android/sv/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/sv/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/sv/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/sv/changelogs/40101010.txt b/upstream_fastlane/metadata/android/sv/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/sv/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/sv/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/sv/changelogs/40101020.txt b/upstream_fastlane/metadata/android/sv/changelogs/40101020.txt
similarity index 100%
rename from fastlane/metadata/android/sv/changelogs/40101020.txt
rename to upstream_fastlane/metadata/android/sv/changelogs/40101020.txt
diff --git a/fastlane/metadata/android/sv/changelogs/40101030.txt b/upstream_fastlane/metadata/android/sv/changelogs/40101030.txt
similarity index 100%
rename from fastlane/metadata/android/sv/changelogs/40101030.txt
rename to upstream_fastlane/metadata/android/sv/changelogs/40101030.txt
diff --git a/fastlane/metadata/android/sv/changelogs/40101040.txt b/upstream_fastlane/metadata/android/sv/changelogs/40101040.txt
similarity index 100%
rename from fastlane/metadata/android/sv/changelogs/40101040.txt
rename to upstream_fastlane/metadata/android/sv/changelogs/40101040.txt
diff --git a/fastlane/metadata/android/sv/changelogs/40101050.txt b/upstream_fastlane/metadata/android/sv/changelogs/40101050.txt
similarity index 100%
rename from fastlane/metadata/android/sv/changelogs/40101050.txt
rename to upstream_fastlane/metadata/android/sv/changelogs/40101050.txt
diff --git a/fastlane/metadata/android/sv/changelogs/40101060.txt b/upstream_fastlane/metadata/android/sv/changelogs/40101060.txt
similarity index 100%
rename from fastlane/metadata/android/sv/changelogs/40101060.txt
rename to upstream_fastlane/metadata/android/sv/changelogs/40101060.txt
diff --git a/fastlane/metadata/android/sv/full_description.txt b/upstream_fastlane/metadata/android/sv/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/sv/full_description.txt
rename to upstream_fastlane/metadata/android/sv/full_description.txt
diff --git a/fastlane/metadata/android/sv/short_description.txt b/upstream_fastlane/metadata/android/sv/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/sv/short_description.txt
rename to upstream_fastlane/metadata/android/sv/short_description.txt
diff --git a/fastlane/metadata/android/sv/title.txt b/upstream_fastlane/metadata/android/sv/title.txt
similarity index 100%
rename from fastlane/metadata/android/sv/title.txt
rename to upstream_fastlane/metadata/android/sv/title.txt
diff --git a/fastlane/metadata/android/th/short_description.txt b/upstream_fastlane/metadata/android/th/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/th/short_description.txt
rename to upstream_fastlane/metadata/android/th/short_description.txt
diff --git a/fastlane/metadata/android/th/title.txt b/upstream_fastlane/metadata/android/th/title.txt
similarity index 100%
rename from fastlane/metadata/android/th/title.txt
rename to upstream_fastlane/metadata/android/th/title.txt
diff --git a/fastlane/metadata/android/tr/changelogs/40100100.txt b/upstream_fastlane/metadata/android/tr/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/tr/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/tr/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/tr/changelogs/40100110.txt b/upstream_fastlane/metadata/android/tr/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/tr/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/tr/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/tr/changelogs/40100120.txt b/upstream_fastlane/metadata/android/tr/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/tr/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/tr/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/tr/changelogs/40100130.txt b/upstream_fastlane/metadata/android/tr/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/tr/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/tr/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/tr/changelogs/40100140.txt b/upstream_fastlane/metadata/android/tr/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/tr/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/tr/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/tr/changelogs/40100170.txt b/upstream_fastlane/metadata/android/tr/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/tr/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/tr/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/tr/changelogs/40101000.txt b/upstream_fastlane/metadata/android/tr/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/tr/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/tr/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/tr/changelogs/40101010.txt b/upstream_fastlane/metadata/android/tr/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/tr/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/tr/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/tr/full_description.txt b/upstream_fastlane/metadata/android/tr/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/tr/full_description.txt
rename to upstream_fastlane/metadata/android/tr/full_description.txt
diff --git a/fastlane/metadata/android/tr/short_description.txt b/upstream_fastlane/metadata/android/tr/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/tr/short_description.txt
rename to upstream_fastlane/metadata/android/tr/short_description.txt
diff --git a/fastlane/metadata/android/tr/title.txt b/upstream_fastlane/metadata/android/tr/title.txt
similarity index 100%
rename from fastlane/metadata/android/tr/title.txt
rename to upstream_fastlane/metadata/android/tr/title.txt
diff --git a/fastlane/metadata/android/uk/changelogs/40100100.txt b/upstream_fastlane/metadata/android/uk/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/uk/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/uk/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/uk/changelogs/40100110.txt b/upstream_fastlane/metadata/android/uk/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/uk/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/uk/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/uk/changelogs/40100120.txt b/upstream_fastlane/metadata/android/uk/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/uk/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/uk/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/uk/changelogs/40100130.txt b/upstream_fastlane/metadata/android/uk/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/uk/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/uk/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/uk/changelogs/40100140.txt b/upstream_fastlane/metadata/android/uk/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/uk/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/uk/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/uk/changelogs/40100150.txt b/upstream_fastlane/metadata/android/uk/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/uk/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/uk/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/uk/changelogs/40100160.txt b/upstream_fastlane/metadata/android/uk/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/uk/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/uk/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/uk/changelogs/40100170.txt b/upstream_fastlane/metadata/android/uk/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/uk/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/uk/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/uk/changelogs/40101000.txt b/upstream_fastlane/metadata/android/uk/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/uk/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/uk/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/uk/changelogs/40101010.txt b/upstream_fastlane/metadata/android/uk/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/uk/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/uk/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/uk/changelogs/40101020.txt b/upstream_fastlane/metadata/android/uk/changelogs/40101020.txt
similarity index 100%
rename from fastlane/metadata/android/uk/changelogs/40101020.txt
rename to upstream_fastlane/metadata/android/uk/changelogs/40101020.txt
diff --git a/fastlane/metadata/android/uk/changelogs/40101030.txt b/upstream_fastlane/metadata/android/uk/changelogs/40101030.txt
similarity index 100%
rename from fastlane/metadata/android/uk/changelogs/40101030.txt
rename to upstream_fastlane/metadata/android/uk/changelogs/40101030.txt
diff --git a/fastlane/metadata/android/uk/full_description.txt b/upstream_fastlane/metadata/android/uk/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/uk/full_description.txt
rename to upstream_fastlane/metadata/android/uk/full_description.txt
diff --git a/fastlane/metadata/android/uk/short_description.txt b/upstream_fastlane/metadata/android/uk/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/uk/short_description.txt
rename to upstream_fastlane/metadata/android/uk/short_description.txt
diff --git a/fastlane/metadata/android/uk/title.txt b/upstream_fastlane/metadata/android/uk/title.txt
similarity index 100%
rename from fastlane/metadata/android/uk/title.txt
rename to upstream_fastlane/metadata/android/uk/title.txt
diff --git a/fastlane/metadata/android/vi/changelogs/40100100.txt b/upstream_fastlane/metadata/android/vi/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/vi/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/vi/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/vi/changelogs/40100110.txt b/upstream_fastlane/metadata/android/vi/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/vi/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/vi/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/vi/short_description.txt b/upstream_fastlane/metadata/android/vi/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/vi/short_description.txt
rename to upstream_fastlane/metadata/android/vi/short_description.txt
diff --git a/fastlane/metadata/android/vi/title.txt b/upstream_fastlane/metadata/android/vi/title.txt
similarity index 100%
rename from fastlane/metadata/android/vi/title.txt
rename to upstream_fastlane/metadata/android/vi/title.txt
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40100100.txt b/upstream_fastlane/metadata/android/zh-Hans/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hans/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/zh-Hans/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40100110.txt b/upstream_fastlane/metadata/android/zh-Hans/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hans/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/zh-Hans/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40100120.txt b/upstream_fastlane/metadata/android/zh-Hans/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hans/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/zh-Hans/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40100130.txt b/upstream_fastlane/metadata/android/zh-Hans/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hans/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/zh-Hans/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40100140.txt b/upstream_fastlane/metadata/android/zh-Hans/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hans/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/zh-Hans/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40100150.txt b/upstream_fastlane/metadata/android/zh-Hans/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hans/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/zh-Hans/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40100160.txt b/upstream_fastlane/metadata/android/zh-Hans/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hans/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/zh-Hans/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40100170.txt b/upstream_fastlane/metadata/android/zh-Hans/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hans/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/zh-Hans/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40101000.txt b/upstream_fastlane/metadata/android/zh-Hans/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hans/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/zh-Hans/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40101010.txt b/upstream_fastlane/metadata/android/zh-Hans/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hans/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/zh-Hans/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/zh-Hans/full_description.txt b/upstream_fastlane/metadata/android/zh-Hans/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hans/full_description.txt
rename to upstream_fastlane/metadata/android/zh-Hans/full_description.txt
diff --git a/fastlane/metadata/android/zh-Hans/short_description.txt b/upstream_fastlane/metadata/android/zh-Hans/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hans/short_description.txt
rename to upstream_fastlane/metadata/android/zh-Hans/short_description.txt
diff --git a/fastlane/metadata/android/zh-Hans/title.txt b/upstream_fastlane/metadata/android/zh-Hans/title.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hans/title.txt
rename to upstream_fastlane/metadata/android/zh-Hans/title.txt
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40100100.txt b/upstream_fastlane/metadata/android/zh-Hant/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/zh-Hant/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40100110.txt b/upstream_fastlane/metadata/android/zh-Hant/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/zh-Hant/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40100120.txt b/upstream_fastlane/metadata/android/zh-Hant/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/zh-Hant/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40100130.txt b/upstream_fastlane/metadata/android/zh-Hant/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/zh-Hant/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40100140.txt b/upstream_fastlane/metadata/android/zh-Hant/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/zh-Hant/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40100150.txt b/upstream_fastlane/metadata/android/zh-Hant/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/zh-Hant/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40100160.txt b/upstream_fastlane/metadata/android/zh-Hant/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/zh-Hant/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40100170.txt b/upstream_fastlane/metadata/android/zh-Hant/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/zh-Hant/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101000.txt b/upstream_fastlane/metadata/android/zh-Hant/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/zh-Hant/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101010.txt b/upstream_fastlane/metadata/android/zh-Hant/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/zh-Hant/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101020.txt b/upstream_fastlane/metadata/android/zh-Hant/changelogs/40101020.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/changelogs/40101020.txt
rename to upstream_fastlane/metadata/android/zh-Hant/changelogs/40101020.txt
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101030.txt b/upstream_fastlane/metadata/android/zh-Hant/changelogs/40101030.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/changelogs/40101030.txt
rename to upstream_fastlane/metadata/android/zh-Hant/changelogs/40101030.txt
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101040.txt b/upstream_fastlane/metadata/android/zh-Hant/changelogs/40101040.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/changelogs/40101040.txt
rename to upstream_fastlane/metadata/android/zh-Hant/changelogs/40101040.txt
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101050.txt b/upstream_fastlane/metadata/android/zh-Hant/changelogs/40101050.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/changelogs/40101050.txt
rename to upstream_fastlane/metadata/android/zh-Hant/changelogs/40101050.txt
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101060.txt b/upstream_fastlane/metadata/android/zh-Hant/changelogs/40101060.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/changelogs/40101060.txt
rename to upstream_fastlane/metadata/android/zh-Hant/changelogs/40101060.txt
diff --git a/fastlane/metadata/android/zh-Hant/full_description.txt b/upstream_fastlane/metadata/android/zh-Hant/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/full_description.txt
rename to upstream_fastlane/metadata/android/zh-Hant/full_description.txt
diff --git a/fastlane/metadata/android/zh-Hant/short_description.txt b/upstream_fastlane/metadata/android/zh-Hant/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/short_description.txt
rename to upstream_fastlane/metadata/android/zh-Hant/short_description.txt
diff --git a/fastlane/metadata/android/zh-Hant/title.txt b/upstream_fastlane/metadata/android/zh-Hant/title.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hant/title.txt
rename to upstream_fastlane/metadata/android/zh-Hant/title.txt