diff --git a/README.md b/README.md
index c57aebb343..1ec425793f 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,32 @@
-# SchildiChat for Android
+[![Buildkite](https://badge.buildkite.com/657d3db27364448d69d54f66c690f7788bc6aa80a7628e37f3.svg?branch=develop)](https://buildkite.com/matrix-dot-org/riotx-android/builds?branch=develop)
+[![Weblate](https://translate.riot.im/widgets/element-android/-/svg-badge.svg)](https://translate.riot.im/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=vector.android.riotx&metric=alert_status)](https://sonarcloud.io/dashboard?id=vector.android.riotx)
+[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riotx&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=vector.android.riotx)
+[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riotx&metric=bugs)](https://sonarcloud.io/dashboard?id=vector.android.riotx)
-SchildiChat is an Android Matrix Client based on [Element](https://github.com/vector-im/riotX-android).
+# Element Android
-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
+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.
-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).
+[](https://play.google.com/store/apps/details?id=im.vector.app)
+[](https://f-droid.org/app/im.vector.app)
-Join the discussion on matrix
+Nightly build: [![Buildkite](https://badge.buildkite.com/657d3db27364448d69d54f66c690f7788bc6aa80a7628e37f3.svg?branch=develop)](https://buildkite.com/matrix-dot-org/riotx-android/builds?branch=develop)
-## Screenshots
+# 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. We will make separate repos once the SDK is stable enough.
+
+# 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/riotX-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_README.md b/tmp_sc_README.md
new file mode 100644
index 0000000000..c57aebb343
--- /dev/null
+++ b/tmp_sc_README.md
@@ -0,0 +1,22 @@
+# SchildiChat for Android
+
+SchildiChat is an Android Matrix Client based on [Element](https://github.com/vector-im/riotX-android).
+
+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
+
+
+
+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/fastlane/metadata/android/de-DE/full_description.txt b/tmp_sc_fastlane/metadata/android/de-DE/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/de-DE/full_description.txt
rename to tmp_sc_fastlane/metadata/android/de-DE/full_description.txt
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png b/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png
similarity index 100%
rename from fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png
rename to tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png b/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png
similarity index 100%
rename from fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png
rename to tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png b/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png
similarity index 100%
rename from fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png
rename to tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png b/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png
similarity index 100%
rename from fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png
rename to tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png
diff --git a/fastlane/metadata/android/de-DE/short_description.txt b/tmp_sc_fastlane/metadata/android/de-DE/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/de-DE/short_description.txt
rename to tmp_sc_fastlane/metadata/android/de-DE/short_description.txt
diff --git a/fastlane/metadata/android/de-DE/title.txt b/tmp_sc_fastlane/metadata/android/de-DE/title.txt
similarity index 100%
rename from fastlane/metadata/android/de-DE/title.txt
rename to tmp_sc_fastlane/metadata/android/de-DE/title.txt
diff --git a/fastlane/metadata/android/de-DE/video.txt b/tmp_sc_fastlane/metadata/android/de-DE/video.txt
similarity index 100%
rename from fastlane/metadata/android/de-DE/video.txt
rename to tmp_sc_fastlane/metadata/android/de-DE/video.txt
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/tmp_sc_fastlane/metadata/android/en-US/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/full_description.txt
rename to tmp_sc_fastlane/metadata/android/en-US/full_description.txt
diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/tmp_sc_fastlane/metadata/android/en-US/images/featureGraphic.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/featureGraphic.png
rename to tmp_sc_fastlane/metadata/android/en-US/images/featureGraphic.png
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/tmp_sc_fastlane/metadata/android/en-US/images/icon.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/icon.png
rename to tmp_sc_fastlane/metadata/android/en-US/images/icon.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png b/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png
rename to tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png b/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png
rename to tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png b/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png
rename to tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png b/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png
rename to tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/tmp_sc_fastlane/metadata/android/en-US/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/short_description.txt
rename to tmp_sc_fastlane/metadata/android/en-US/short_description.txt
diff --git a/fastlane/metadata/android/en-US/title.txt b/tmp_sc_fastlane/metadata/android/en-US/title.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/title.txt
rename to tmp_sc_fastlane/metadata/android/en-US/title.txt
diff --git a/fastlane/metadata/android/en-US/video.txt b/tmp_sc_fastlane/metadata/android/en-US/video.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/video.txt
rename to tmp_sc_fastlane/metadata/android/en-US/video.txt
diff --git a/upstream_README.md b/upstream_README.md
deleted file mode 100644
index 1ec425793f..0000000000
--- a/upstream_README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-[![Buildkite](https://badge.buildkite.com/657d3db27364448d69d54f66c690f7788bc6aa80a7628e37f3.svg?branch=develop)](https://buildkite.com/matrix-dot-org/riotx-android/builds?branch=develop)
-[![Weblate](https://translate.riot.im/widgets/element-android/-/svg-badge.svg)](https://translate.riot.im/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=vector.android.riotx&metric=alert_status)](https://sonarcloud.io/dashboard?id=vector.android.riotx)
-[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riotx&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=vector.android.riotx)
-[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riotx&metric=bugs)](https://sonarcloud.io/dashboard?id=vector.android.riotx)
-
-# 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/657d3db27364448d69d54f66c690f7788bc6aa80a7628e37f3.svg?branch=develop)](https://buildkite.com/matrix-dot-org/riotx-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. We will make separate repos once the SDK is stable enough.
-
-# 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/riotX-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).