diff --git a/metadata/com.iskrembilen.quasseldroid.txt b/metadata/com.iskrembilen.quasseldroid.txt
deleted file mode 100644
index bbf316ea9fca7a37948b5c243ea6d393edda5002..0000000000000000000000000000000000000000
--- a/metadata/com.iskrembilen.quasseldroid.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-License:GPL-3.0
-Web Site:https://quasseldroid.info/
-Issue Tracker:https://git.kuschku.de/justJanne/QuasselDroid-ng/issues
-Donate:https://www.patreon.com/justjanne
-Summary:Chat comfortably. Everywhere.
-Categories:Internet
-Description:
-'''REQUIRES A QUASSEL CORE – DOES NOT WORK AS STANDALONE IRC CLIENT'''
-
-* Use IRC on the go – thanks to the Quassel core, you’ll never miss anything
-* Always have your entire chat history available – just scroll up to load older messages, the core keeps them for you
-* Be notified when someone messages you – even if you had no connection in the meantime
-
-'''Requirements:'''
-
-You need to have an account on a Quassel core to use this app. If you have none, you can either set a core up yourself, or check if you can get an account on someone else’s core.
-
-This app only works with cores that run at least Quassel v0.6
-
-To learn about how to set up a quassel core, see the wiki.
-
-'''Contact:'''
-
-You can find us in #quasseldroid on Freenode, or contact us under support@kuschku.de
-.
-
-Repo Type:git
-Repo:https://git.kuschku.de/justjanne/QuasselDroid-ng/
-Source Code:https://git.kuschku.de/justjanne/QuasselDroid-ng/
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/featureGraphic.png b/metadata/en-US/images/featureGraphic.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/featureGraphic.png
rename to metadata/en-US/images/featureGraphic.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/icon.png b/metadata/en-US/images/icon.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/icon.png
rename to metadata/en-US/images/icon.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/01.png b/metadata/en-US/images/phoneScreenshots/01.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/01.png
rename to metadata/en-US/images/phoneScreenshots/01.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/02.png b/metadata/en-US/images/phoneScreenshots/02.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/02.png
rename to metadata/en-US/images/phoneScreenshots/02.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/03.png b/metadata/en-US/images/phoneScreenshots/03.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/03.png
rename to metadata/en-US/images/phoneScreenshots/03.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/04.png b/metadata/en-US/images/phoneScreenshots/04.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/04.png
rename to metadata/en-US/images/phoneScreenshots/04.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/05.png b/metadata/en-US/images/phoneScreenshots/05.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/05.png
rename to metadata/en-US/images/phoneScreenshots/05.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/06.png b/metadata/en-US/images/phoneScreenshots/06.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/06.png
rename to metadata/en-US/images/phoneScreenshots/06.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/07.png b/metadata/en-US/images/phoneScreenshots/07.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/07.png
rename to metadata/en-US/images/phoneScreenshots/07.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/08.png b/metadata/en-US/images/phoneScreenshots/08.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/phoneScreenshots/08.png
rename to metadata/en-US/images/phoneScreenshots/08.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/promoGraphic.png b/metadata/en-US/images/promoGraphic.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/promoGraphic.png
rename to metadata/en-US/images/promoGraphic.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/01.png b/metadata/en-US/images/sevenInchScreenshots/01.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/01.png
rename to metadata/en-US/images/sevenInchScreenshots/01.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/02.png b/metadata/en-US/images/sevenInchScreenshots/02.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/02.png
rename to metadata/en-US/images/sevenInchScreenshots/02.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/03.png b/metadata/en-US/images/sevenInchScreenshots/03.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/03.png
rename to metadata/en-US/images/sevenInchScreenshots/03.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/04.png b/metadata/en-US/images/sevenInchScreenshots/04.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/04.png
rename to metadata/en-US/images/sevenInchScreenshots/04.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/05.png b/metadata/en-US/images/sevenInchScreenshots/05.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/05.png
rename to metadata/en-US/images/sevenInchScreenshots/05.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/06.png b/metadata/en-US/images/sevenInchScreenshots/06.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/06.png
rename to metadata/en-US/images/sevenInchScreenshots/06.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/07.png b/metadata/en-US/images/sevenInchScreenshots/07.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/07.png
rename to metadata/en-US/images/sevenInchScreenshots/07.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/08.png b/metadata/en-US/images/sevenInchScreenshots/08.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/sevenInchScreenshots/08.png
rename to metadata/en-US/images/sevenInchScreenshots/08.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/01.png b/metadata/en-US/images/tenInchScreenshots/01.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/01.png
rename to metadata/en-US/images/tenInchScreenshots/01.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/02.png b/metadata/en-US/images/tenInchScreenshots/02.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/02.png
rename to metadata/en-US/images/tenInchScreenshots/02.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/03.png b/metadata/en-US/images/tenInchScreenshots/03.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/03.png
rename to metadata/en-US/images/tenInchScreenshots/03.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/04.png b/metadata/en-US/images/tenInchScreenshots/04.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/04.png
rename to metadata/en-US/images/tenInchScreenshots/04.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/05.png b/metadata/en-US/images/tenInchScreenshots/05.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/05.png
rename to metadata/en-US/images/tenInchScreenshots/05.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/06.png b/metadata/en-US/images/tenInchScreenshots/06.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/06.png
rename to metadata/en-US/images/tenInchScreenshots/06.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/07.png b/metadata/en-US/images/tenInchScreenshots/07.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/07.png
rename to metadata/en-US/images/tenInchScreenshots/07.png
diff --git a/metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/08.png b/metadata/en-US/images/tenInchScreenshots/08.png
similarity index 100%
rename from metadata/com.iskrembilen.quasseldroid/en-US/tenInchScreenshots/08.png
rename to metadata/en-US/images/tenInchScreenshots/08.png