diff --git a/metadata/com.alaskalinuxuser.shipcaptainandcrew.txt b/metadata/com.alaskalinuxuser.shipcaptainandcrew.txt
deleted file mode 100644
index b05b50b116..0000000000
--- a/metadata/com.alaskalinuxuser.shipcaptainandcrew.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-Categories:Games
-License:Apache-2.0
-Web Site:
-Source Code:https://gitlab.com/alaskalinuxuser/app_ship_capt_crew
-Issue Tracker:https://gitlab.com/alaskalinuxuser/app_ship_capt_crew/issues
-
-Auto Name:Ship Captain and Crew
-Summary:Play a classic dice game for up to 4 players
-Description:
-A classic dice game for up to four players!
-
-This simple game requires a lot of luck and a very small amount of skill. In
-times past, this game was used as a gambling or drinking game by sailors and
-merchants alike. You must procure a ship (6), a captain (5), and a crew (4), the
-remainder is your cargo.
-
-Once you have your ship, captain, and crew, you can click on dice that you wish
-to hold in order to save them rather than roll them. You can also choose to keep
-them all if the conditions are right. The "point" or high score is always
-visible, and that is a big help to the "hammer" or the last player.
-
-This game is open source and add free! So grab a couple friends and set sail for
-high adventure with this fun little dice game. If your lucky, you may even
-strike "midnight"!
-.
-
-Repo Type:git
-Repo:https://gitlab.com/alaskalinuxuser/app_ship_capt_crew
-
-Build:1.3,4
-    commit=a8a6c6b12714dc0639b06a23db4cf60f8122c38e
-    subdir=app
-    gradle=yes
-
-Build:1.6,6
-    commit=21869e8548e844e62dc7a5dcecf8112b2c680fd5
-    subdir=app
-    gradle=yes
-
-Build:1.7,7
-    commit=f1e0f278884949d967981cf5cd67bb243c97edc5
-    subdir=app
-    gradle=yes
-
-Build:1.8,8
-    commit=fd178ece3b32de959ead6d0052af24df3476398e
-    subdir=app
-    gradle=yes
-
-Build:2.0,10
-    commit=9ce19f6e6b1dbd5b42732c6beb514d60951c9b9f
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:2.0
-Current Version Code:10
diff --git a/metadata/com.alaskalinuxuser.shipcaptainandcrew.yml b/metadata/com.alaskalinuxuser.shipcaptainandcrew.yml
new file mode 100644
index 0000000000..9be378c6c9
--- /dev/null
+++ b/metadata/com.alaskalinuxuser.shipcaptainandcrew.yml
@@ -0,0 +1,68 @@
+Categories:
+  - Games
+License: Apache-2.0
+SourceCode: https://gitlab.com/alaskalinuxuser/app_ship_capt_crew
+IssueTracker: https://gitlab.com/alaskalinuxuser/app_ship_capt_crew/issues
+
+AutoName: Ship Captain and Crew
+Summary: Play a classic dice game for up to 4 players
+Description: |-
+    A classic dice game for up to four players!
+
+    This simple game requires a lot of luck and a very small amount of skill. In
+    times past, this game was used as a gambling or drinking game by sailors and
+    merchants alike. You must procure a ship (6), a captain (5), and a crew (4), the
+    remainder is your cargo.
+
+    Once you have your ship, captain, and crew, you can click on dice that you wish
+    to hold in order to save them rather than roll them. You can also choose to keep
+    them all if the conditions are right. The "point" or high score is always
+    visible, and that is a big help to the "hammer" or the last player.
+
+    This game is open source and add free! So grab a couple friends and set sail for
+    high adventure with this fun little dice game. If your lucky, you may even
+    strike "midnight"!
+
+RepoType: git
+Repo: https://gitlab.com/alaskalinuxuser/app_ship_capt_crew
+
+Builds:
+  - versionName: '1.3'
+    versionCode: 4
+    commit: a8a6c6b12714dc0639b06a23db4cf60f8122c38e
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.6'
+    versionCode: 6
+    commit: 21869e8548e844e62dc7a5dcecf8112b2c680fd5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.7'
+    versionCode: 7
+    commit: f1e0f278884949d967981cf5cd67bb243c97edc5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.8'
+    versionCode: 8
+    commit: fd178ece3b32de959ead6d0052af24df3476398e
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.0'
+    versionCode: 10
+    commit: 9ce19f6e6b1dbd5b42732c6beb514d60951c9b9f
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '2.0'
+CurrentVersionCode: 10
diff --git a/metadata/com.alexcruz.papuhwalls.txt b/metadata/com.alexcruz.papuhwalls.txt
deleted file mode 100644
index c8dd49afbb..0000000000
--- a/metadata/com.alexcruz.papuhwalls.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Categories:Theming
-License:CC-BY-SA-4.0
-Web Site:https://plus.google.com/u/0/communities/117004088255020338497
-Source Code:https://github.com/Papuh/PapuhWalls
-Issue Tracker:https://github.com/Papuh/PapuhWalls/issues
-
-Auto Name:Papuh
-Summary:Display live wallpapers
-Description:
-Cloud based live wallpapers that are CC licensed.
-
-Features:
-
-* Over 1600 wallpapers pulled from the cloud (new additions weekly)
-* Beautiful and user friendly dashboard
-* Ability to apply, share, edit, and crop any wallpaper
-* One of a kind, theme support! (Make it yours)
-* Grid changer (1-3 columns)
-* Time-context headers
-* Horizontal scrollview / Pinch to zoom
-* Wallpaper notification with Pushbullet
-* Full Muzei Live Wallpaper support
-* Full Behang support
-.
-
-Repo Type:git
-Repo:https://github.com/Papuh/PapuhWalls
-
-Build:2.0.6,10
-    commit=058a392e3798886e251f20d484da013484b36dd6
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:2.0.6
-Current Version Code:10
diff --git a/metadata/com.alexcruz.papuhwalls.yml b/metadata/com.alexcruz.papuhwalls.yml
new file mode 100644
index 0000000000..2802da998a
--- /dev/null
+++ b/metadata/com.alexcruz.papuhwalls.yml
@@ -0,0 +1,38 @@
+Categories:
+  - Theming
+License: CC-BY-SA-4.0
+WebSite: https://plus.google.com/u/0/communities/117004088255020338497
+SourceCode: https://github.com/Papuh/PapuhWalls
+
+AutoName: Papuh
+Summary: Display live wallpapers
+Description: |-
+    Cloud based live wallpapers that are CC licensed.
+
+    Features:
+
+    * Over 1600 wallpapers pulled from the cloud (new additions weekly)
+    * Beautiful and user friendly dashboard
+    * Ability to apply, share, edit, and crop any wallpaper
+    * One of a kind, theme support! (Make it yours)
+    * Grid changer (1-3 columns)
+    * Time-context headers
+    * Horizontal scrollview / Pinch to zoom
+    * Wallpaper notification with Pushbullet
+    * Full Muzei Live Wallpaper support
+    * Full Behang support
+
+Builds:
+  - versionName: 2.0.6
+    versionCode: 10
+    commit: 058a392e3798886e251f20d484da013484b36dd6
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: 2.0.6
+CurrentVersionCode: 10
+
+NoSourceSince: 2.0.6
diff --git a/metadata/com.alexkang.bluechat.txt b/metadata/com.alexkang.bluechat.txt
deleted file mode 100644
index d1dfd7f0b1..0000000000
--- a/metadata/com.alexkang.bluechat.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Categories:Connectivity
-License:MIT
-Web Site:
-Source Code:https://github.com/AlexKang/blue-chat
-Issue Tracker:https://github.com/AlexKang/blue-chat/issues
-
-Auto Name:BlueChat
-Summary:Chat locally over Bluetooth
-Description:
-Local chat via Bluetooth.
-.
-
-Repo Type:git
-Repo:https://github.com/AlexKang/blue-chat
-
-Build:1.0,1
-    commit=8b3c0c3b1cdea93de37107e699836e371005bbea
-    subdir=app
-    gradle=yes
-
-Build:1.1,2
-    commit=928fdb3cde79e4c348abc7432cbcee72cfbbe37f
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.1
-Current Version Code:2
diff --git a/metadata/com.alexkang.bluechat.yml b/metadata/com.alexkang.bluechat.yml
new file mode 100644
index 0000000000..1cd459efff
--- /dev/null
+++ b/metadata/com.alexkang.bluechat.yml
@@ -0,0 +1,32 @@
+Categories:
+  - Connectivity
+License: MIT
+SourceCode: https://github.com/AlexKang/blue-chat
+IssueTracker: https://github.com/AlexKang/blue-chat/issues
+
+AutoName: BlueChat
+Summary: Chat locally over Bluetooth
+Description: Local chat via Bluetooth.
+
+RepoType: git
+Repo: https://github.com/AlexKang/blue-chat
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 8b3c0c3b1cdea93de37107e699836e371005bbea
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: 928fdb3cde79e4c348abc7432cbcee72cfbbe37f
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.1'
+CurrentVersionCode: 2
diff --git a/metadata/com.alexkang.x3matrixcalculator.txt b/metadata/com.alexkang.x3matrixcalculator.txt
deleted file mode 100644
index 42445c7ad4..0000000000
--- a/metadata/com.alexkang.x3matrixcalculator.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Categories:Science & Education
-License:MIT
-Web Site:
-Source Code:https://github.com/AlexKang/simple-matrix
-Issue Tracker:https://github.com/AlexKang/simple-matrix/issues
-
-Auto Name:Matrix Calc
-Summary:Matrix calculator
-Description:
-Square matrix calculator with support for addition, subtraction, multiplication,
-determinants, and inverses.
-
-Note: Calculations except for determinants are rounded to three decimal places.
-Use Fraction Mode if extreme precision is needed.
-.
-
-Repo Type:git
-Repo:https://github.com/AlexKang/simple-matrix
-
-Build:1.5,6
-    commit=64de5a05e5ac0e9559333e3fb76ca435260c98b4
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.5
-Current Version Code:6
diff --git a/metadata/com.alexkang.x3matrixcalculator.yml b/metadata/com.alexkang.x3matrixcalculator.yml
new file mode 100644
index 0000000000..31328ae11e
--- /dev/null
+++ b/metadata/com.alexkang.x3matrixcalculator.yml
@@ -0,0 +1,27 @@
+Categories:
+  - Science & Education
+License: MIT
+SourceCode: https://github.com/AlexKang/simple-matrix
+IssueTracker: https://github.com/AlexKang/simple-matrix/issues
+
+AutoName: Matrix Calc
+Summary: Matrix calculator
+Description: |-
+    Square matrix calculator with support for addition, subtraction, multiplication,
+    determinants, and inverses.
+
+    Note: Calculations except for determinants are rounded to three decimal places.
+    Use Fraction Mode if extreme precision is needed.
+
+RepoType: git
+Repo: https://github.com/AlexKang/simple-matrix
+
+Builds:
+  - versionName: '1.5'
+    versionCode: 6
+    commit: 64de5a05e5ac0e9559333e3fb76ca435260c98b4
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.5'
+CurrentVersionCode: 6
diff --git a/metadata/com.alexxz.hawkingquotes.txt b/metadata/com.alexxz.hawkingquotes.txt
deleted file mode 100644
index 9f9d047545..0000000000
--- a/metadata/com.alexxz.hawkingquotes.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Categories:Reading
-License:BSD-2-Clause-FreeBSD
-Web Site:http://alexxz.ru/
-Source Code:https://github.com/Alexxz/Hawkingquotes
-Issue Tracker:https://github.com/Alexxz/Hawkingquotes/issues
-
-Auto Name:Stephen Hawking quotes
-Summary:Show quotes from Stephen Hawking
-Description:
-Shows quotes of amazing physicist Stephen Hawking.
-.
-
-Repo Type:git
-Repo:https://github.com/Alexxz/Hawkingquotes
-
-Build:1.5,7
-    commit=6bf42a329ae07b6c8a829cdec8d045a48c208248
-    prebuild=sed -i -e 's/new OnClickListener ()/new View.OnClickListener()/g' src/com/alexxz/hawkingquotes/MainActivity.java
-    target=android-13
-
-Maintainer Notes:
-android-13 required!
-.
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.5
-Current Version Code:7
diff --git a/metadata/com.alexxz.hawkingquotes.yml b/metadata/com.alexxz.hawkingquotes.yml
new file mode 100644
index 0000000000..fe0cc86806
--- /dev/null
+++ b/metadata/com.alexxz.hawkingquotes.yml
@@ -0,0 +1,27 @@
+Categories:
+  - Reading
+License: BSD-2-Clause-FreeBSD
+WebSite: http://alexxz.ru/
+SourceCode: https://github.com/Alexxz/Hawkingquotes
+IssueTracker: https://github.com/Alexxz/Hawkingquotes/issues
+
+AutoName: Stephen Hawking quotes
+Summary: Show quotes from Stephen Hawking
+Description: Shows quotes of amazing physicist Stephen Hawking.
+
+RepoType: git
+Repo: https://github.com/Alexxz/Hawkingquotes
+
+Builds:
+  - versionName: '1.5'
+    versionCode: 7
+    commit: 6bf42a329ae07b6c8a829cdec8d045a48c208248
+    prebuild: sed -i -e 's/new OnClickListener ()/new View.OnClickListener()/g' src/com/alexxz/hawkingquotes/MainActivity.java
+    target: android-13
+
+MaintainerNotes: android-13 required!
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.5'
+CurrentVersionCode: 7
diff --git a/metadata/com.alfray.asqare.txt b/metadata/com.alfray.asqare.txt
deleted file mode 100644
index c7b0e10f4b..0000000000
--- a/metadata/com.alfray.asqare.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Categories:Games
-License:GPL-3.0-only
-Web Site:https://code.google.com/p/asqare
-Source Code:https://code.google.com/p/asqare/source
-Issue Tracker:
-
-Auto Name:Asqare
-Summary:Coloured squares game
-Description:
-The screen is covered with colored sprites (squares or circles). When you align
-3 or more in a row, all adjacents sprites of the shape & color vanish.
-
-You can only swap adjacent sprites vertically or horizontally. You can swap
-sprites even if it won't result in a 3-or-more alignment, but that will cost you
-10% of your current score.
-
-The game offers two variations on the gameplay and manages a list of current
-games, that you can pause and recall at any time.
-.
-
-Repo Type:git
-Repo:https://code.google.com/p/asqare
-
-Build:1.3,103
-    commit=61828d08
-    subdir=asqare
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.3
-Current Version Code:103
diff --git a/metadata/com.alfray.asqare.yml b/metadata/com.alfray.asqare.yml
new file mode 100644
index 0000000000..b39f813f31
--- /dev/null
+++ b/metadata/com.alfray.asqare.yml
@@ -0,0 +1,32 @@
+Categories:
+  - Games
+License: GPL-3.0-only
+SourceCode: https://code.google.com/p/asqare/source
+
+AutoName: Asqare
+Summary: Coloured squares game
+Description: |-
+    The screen is covered with colored sprites (squares or circles). When you align
+    3 or more in a row, all adjacents sprites of the shape & color vanish.
+
+    You can only swap adjacent sprites vertically or horizontally. You can swap
+    sprites even if it won’t result in a 3-or-more alignment, but that will cost you
+    10% of your current score.
+
+    The game offers two variations on the gameplay and manages a list of current
+    games, that you can pause and recall at any time.
+
+Builds:
+  - versionName: '1.3'
+    versionCode: 103
+    commit: 61828d08
+    subdir: asqare
+
+MaintainerNotes: New location is https://bitbucket.org/ralfoide/asqare but requires login.
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: '1.3'
+CurrentVersionCode: 103
+
+NoSourceSince: '1.3'
diff --git a/metadata/com.alfray.mandelbrot2.txt b/metadata/com.alfray.mandelbrot2.txt
deleted file mode 100644
index 3cb1ba455c..0000000000
--- a/metadata/com.alfray.mandelbrot2.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Disabled:Past sell by date
-Categories:Games
-License:GPL-3.0-only
-Web Site:https://code.google.com/p/mandelbrot
-Source Code:https://code.google.com/p/mandelbrot/source
-Issue Tracker:
-
-Auto Name:Mandelbrot Map
-Summary:Mandelbrot set (fractal) viewer
-Description:
-Mandelbrot set viewer that works in the style of a map viewer - i.e. scroll
-around and zoom in/out. There is an option to use renderscript if the device
-supports it which may get executed in the GPU if you are running Android 4.2.
-.
-
-Repo Type:git-svn
-Repo:https://mandelbrot.googlecode.com/svn/trunk
-
-Build:0.13,13
-    commit=145
-    subdir=mandelbrot
-    init=rm -f build.xml
-    prebuild=rm -f res/raw/*
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:0.13
-Current Version Code:13
diff --git a/metadata/com.alfray.mandelbrot2.yml b/metadata/com.alfray.mandelbrot2.yml
new file mode 100644
index 0000000000..f74ca98fc4
--- /dev/null
+++ b/metadata/com.alfray.mandelbrot2.yml
@@ -0,0 +1,29 @@
+Disabled: Past sell by date
+Categories:
+  - Games
+License: GPL-3.0-only
+WebSite: https://code.google.com/p/mandelbrot
+SourceCode: https://code.google.com/p/mandelbrot/source
+
+AutoName: Mandelbrot Map
+Summary: Mandelbrot set (fractal) viewer
+Description: |-
+    Mandelbrot set viewer that works in the style of a map viewer - i.e. scroll
+    around and zoom in/out. There is an option to use renderscript if the device
+    supports it which may get executed in the GPU if you are running Android 4.2.
+
+RepoType: git-svn
+Repo: https://mandelbrot.googlecode.com/svn/trunk
+
+Builds:
+  - versionName: '0.13'
+    versionCode: 13
+    commit: '145'
+    subdir: mandelbrot
+    init: rm -f build.xml
+    prebuild: rm -f res/raw/*
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: '0.13'
+CurrentVersionCode: 13
diff --git a/metadata/com.alfray.timeriffic.txt b/metadata/com.alfray.timeriffic.txt
deleted file mode 100644
index 88c825159b..0000000000
--- a/metadata/com.alfray.timeriffic.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-Categories:Time
-License:GPL-3.0-only
-Web Site:http://rdrrlabs.com/
-Source Code:
-Issue Tracker:
-
-Summary:Scheduled settings
-Description:
-Allows you to set multiple schedules to control mute, vibrate, brightness, WiFi
-and airplane mode.
-
-Status: Source code was last published in 2011.
-.
-
-Build:1.09.03,10903
-    disable=huge ass version name at 45
-    commit=45
-    subdir=Timeriffic
-    oldsdkloc=yes
-
-Build:1.09.05,10905
-    commit=fc40dccbb9
-    subdir=Timeriffic
-    oldsdkloc=yes
-    novcheck=yes
-
-Build:1.10.01,11001
-    disable=Source code is not published
-    commit=unknown - see disabled
-
-Maintainer Notes:
-1.09.05 was from https://timeriffic.googlecode.com/hg
-.
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:0
-Current Version Code:0
-
-No Source Since:1.09.11
diff --git a/metadata/com.alfray.timeriffic.yml b/metadata/com.alfray.timeriffic.yml
new file mode 100644
index 0000000000..2160b06074
--- /dev/null
+++ b/metadata/com.alfray.timeriffic.yml
@@ -0,0 +1,40 @@
+Categories:
+  - Time
+License: GPL-3.0-only
+WebSite: http://rdrrlabs.com/
+
+Summary: Scheduled settings
+Description: |-
+    Allows you to set multiple schedules to control mute, vibrate, brightness, WiFi
+    and airplane mode.
+
+    Status: Source code was last published in 2011.
+
+Builds:
+  - versionName: 1.09.03
+    versionCode: 10903
+    disable: huge ass version name at 45
+    commit: '45'
+    subdir: Timeriffic
+    oldsdkloc: true
+
+  - versionName: 1.09.05
+    versionCode: 10905
+    commit: fc40dccbb9
+    subdir: Timeriffic
+    oldsdkloc: true
+    novcheck: true
+
+  - versionName: 1.10.01
+    versionCode: 11001
+    disable: Source code is not published
+    commit: unknown - see disabled
+
+MaintainerNotes: 1.09.05 was from https://timeriffic.googlecode.com/hg
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: '0'
+CurrentVersionCode: 0
+
+NoSourceSince: 1.09.11
diff --git a/metadata/com.amabyte.vtucslabmanual.txt b/metadata/com.amabyte.vtucslabmanual.txt
deleted file mode 100644
index b3f0facff7..0000000000
--- a/metadata/com.amabyte.vtucslabmanual.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Categories:Science & Education
-License:GPL-3.0-only
-Web Site:http://www.amabyte.com
-Source Code:https://github.com/Amabyte/vtu-cs-lab-manual
-Issue Tracker:https://github.com/Amabyte/vtu-cs-lab-manual/issues
-
-Auto Name:VTU CS Lab Manual
-Summary:Manual for VTU computer science lab
-Description:
-VTU CS Lab Manual aims at providing Lab Manual for Computer Science students of
-all semesters affiliated to [http://vtu.ac.in/ Vishweshwarayya Technical
-University]. The Lab materials provided in this app are all checked and verified
-to be working. Content is derived from FSMK's Lab manual project which is
-released under CC-BY-SA.
-.
-
-Repo Type:git
-Repo:https://github.com/Amabyte/vtu-cs-lab-manual
-
-Build:1.0,1
-    commit=00ee44039c5cc6bad020c19c5ec6e7817304a55e
-    subdir=app
-    gradle=yes
-
-Maintainer Notes:
-1.0,1:
-* markdown4j-2.2.jar matches https://code.google.com/p/markdown4j/downloads/list
-* markdown4j only provide source tarballs, no repo, so we cannot include it via
-  srclibs. "org.commonjava.googlecode.markdown4j:markdown4j:2.2-cj-1.0" does not
-  work.
-.
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest/free
-Current Version:1.0
-Current Version Code:1
diff --git a/metadata/com.amabyte.vtucslabmanual.yml b/metadata/com.amabyte.vtucslabmanual.yml
new file mode 100644
index 0000000000..5bb1c7e612
--- /dev/null
+++ b/metadata/com.amabyte.vtucslabmanual.yml
@@ -0,0 +1,38 @@
+Categories:
+  - Science & Education
+License: GPL-3.0-only
+WebSite: http://www.amabyte.com
+SourceCode: https://github.com/Amabyte/vtu-cs-lab-manual
+IssueTracker: https://github.com/Amabyte/vtu-cs-lab-manual/issues
+
+AutoName: VTU CS Lab Manual
+Summary: Manual for VTU computer science lab
+Description: |-
+    VTU CS Lab Manual aims at providing Lab Manual for Computer Science students of
+    all semesters affiliated to [http://vtu.ac.in/ Vishweshwarayya Technical
+    University]. The Lab materials provided in this app are all checked and verified
+    to be working. Content is derived from FSMK's Lab manual project which is
+    released under CC-BY-SA.
+
+RepoType: git
+Repo: https://github.com/Amabyte/vtu-cs-lab-manual
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 00ee44039c5cc6bad020c19c5ec6e7817304a55e
+    subdir: app
+    gradle:
+      - yes
+
+MaintainerNotes: |-
+    1.0,1:
+    * markdown4j-2.2.jar matches https://code.google.com/p/markdown4j/downloads/list
+    * markdown4j only provide source tarballs, no repo, so we cannot include it via
+      srclibs. "org.commonjava.googlecode.markdown4j:markdown4j:2.2-cj-1.0" does not
+      work.
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest/free
+CurrentVersion: '1.0'
+CurrentVersionCode: 1
diff --git a/metadata/com.ames.books.txt b/metadata/com.ames.books.txt
deleted file mode 100644
index 164e8d79e1..0000000000
--- a/metadata/com.ames.books.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-AntiFeatures:NonFreeNet
-Categories:Science & Education,Reading,Multimedia,Internet
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/andviane/google-books-android-viewer
-Issue Tracker:https://github.com/andviane/google-books-android-viewer/issues
-
-Auto Name:BookList
-Summary:Unofficial Google Books viewer
-Description:
-This is the demo/wrapping app to demonstrate the capabilities of the Uncover
-library. This library builds a bridge between "infinitely scrolling view" that
-requires fast synchronous data model and web resource or database that uses slow
-asynchronous and strongly prefers more than a single item per request. The
-library performs many internal optimizations on how the data are fetched. Unlike
-many alternative approaches (mostly centered around the scroll listener) it
-features clean classic MVC design.
-
-The mentioned library is the open source project under Apache 2.0 license. The
-wrapping app (same repository) is under GPLv3.
-
-The demo app is fully usable by the end non-programming user. It allows to view
-the large Google Books directory, displaying titles and book covers. If it is
-possible to purchase the book from some vendor, the "book purchase link" appears
-in the book details view. Tapping on it opens the web browser of your device (no
-longer this app) and you may read more details or even to make a purchase there.
-
-The app communicates with Google server with the help of
-com.google.apis:google-api-services-books library that if fetched from Maven
-Central. Maven Central specifies the license of this library as Apache 2.0.
-.
-
-Repo Type:git
-Repo:https://github.com/andviane/google-books-android-viewer.git
-
-Build:1.7,7
-    commit=2.0.1
-    subdir=app
-    patch=uncover.patch
-    gradle=yes
-    prebuild=sed -i -e '/sign file/d' ../uncover/build.gradle
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.7
-Current Version Code:7
diff --git a/metadata/com.ames.books.yml b/metadata/com.ames.books.yml
new file mode 100644
index 0000000000..92069fba06
--- /dev/null
+++ b/metadata/com.ames.books.yml
@@ -0,0 +1,53 @@
+AntiFeatures:
+  - NonFreeNet
+Categories:
+  - Science & Education
+  - Reading
+  - Multimedia
+  - Internet
+License: GPL-3.0-only
+SourceCode: https://github.com/andviane/google-books-android-viewer
+IssueTracker: https://github.com/andviane/google-books-android-viewer/issues
+
+AutoName: BookList
+Summary: Unofficial Google Books viewer
+Description: |-
+    This is the demo/wrapping app to demonstrate the capabilities of the Uncover
+    library. This library builds a bridge between "infinitely scrolling view" that
+    requires fast synchronous data model and web resource or database that uses slow
+    asynchronous and strongly prefers more than a single item per request. The
+    library performs many internal optimizations on how the data are fetched. Unlike
+    many alternative approaches (mostly centered around the scroll listener) it
+    features clean classic MVC design.
+
+    The mentioned library is the open source project under Apache 2.0 license. The
+    wrapping app (same repository) is under GPLv3.
+
+    The demo app is fully usable by the end non-programming user. It allows to view
+    the large Google Books directory, displaying titles and book covers. If it is
+    possible to purchase the book from some vendor, the "book purchase link" appears
+    in the book details view. Tapping on it opens the web browser of your device (no
+    longer this app) and you may read more details or even to make a purchase there.
+
+    The app communicates with Google server with the help of
+    com.google.apis:google-api-services-books library that if fetched from Maven
+    Central. Maven Central specifies the license of this library as Apache 2.0.
+
+RepoType: git
+Repo: https://github.com/andviane/google-books-android-viewer.git
+
+Builds:
+  - versionName: '1.7'
+    versionCode: 7
+    commit: 2.0.1
+    subdir: app
+    patch:
+      - uncover.patch
+    gradle:
+      - yes
+    prebuild: sed -i -e '/sign file/d' ../uncover/build.gradle
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '1.7'
+CurrentVersionCode: 7
diff --git a/metadata/com.ancantus.HYPNOTOAD.txt b/metadata/com.ancantus.HYPNOTOAD.txt
deleted file mode 100644
index 10c81378c1..0000000000
--- a/metadata/com.ancantus.HYPNOTOAD.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Categories:Theming
-License:GPL-3.0-only
-Web Site:
-Source Code:https://bitbucket.org/Ancantus/hypnotoad_live_wallpaper/src
-Issue Tracker:https://bitbucket.org/Ancantus/hypnotoad_live_wallpaper/issues
-
-Auto Name:Hypnotoad Live Wallpaper
-Summary:Live wallpaper
-Description:
-Strange toad blinking in front of a static picture.
-.
-
-Repo Type:hg
-Repo:https://bitbucket.org/Ancantus/hypnotoad_live_wallpaper
-
-Build:1.3,4
-    commit=9b411
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.3
-Current Version Code:4
diff --git a/metadata/com.ancantus.HYPNOTOAD.yml b/metadata/com.ancantus.HYPNOTOAD.yml
new file mode 100644
index 0000000000..fd6345a8e6
--- /dev/null
+++ b/metadata/com.ancantus.HYPNOTOAD.yml
@@ -0,0 +1,22 @@
+Categories:
+  - Theming
+License: GPL-3.0-only
+SourceCode: https://bitbucket.org/Ancantus/hypnotoad_live_wallpaper/src
+IssueTracker: https://bitbucket.org/Ancantus/hypnotoad_live_wallpaper/issues
+
+AutoName: Hypnotoad Live Wallpaper
+Summary: Live wallpaper
+Description: Strange toad blinking in front of a static picture.
+
+RepoType: hg
+Repo: https://bitbucket.org/Ancantus/hypnotoad_live_wallpaper
+
+Builds:
+  - versionName: '1.3'
+    versionCode: 4
+    commit: 9b411
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.3'
+CurrentVersionCode: 4
diff --git a/metadata/com.anddevw.getchromium.txt b/metadata/com.anddevw.getchromium.txt
deleted file mode 100644
index 701ed1d608..0000000000
--- a/metadata/com.anddevw.getchromium.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-Categories:Internet,System
-License:GPL-3.0-only
-Web Site:https://andDevW.com
-Source Code:https://github.com/andDevW/getChromium
-Issue Tracker:https://github.com/andDevW/getChromium/issues
-Bitcoin:188RxvRnSXSZZnjuDdLwNirHDfNusVPobh
-
-Auto Name:getChromium
-Summary:Installs the latest build of Chromium
-Description:
-Installs the latest build of Chromium for Android. Push the button to install
-Chromium, then push the button and install Chromium again. Each time you install
-Chromium it updates Chromium. Chromium does NOT AUTO-UPDATE, getChromium does
-NOT AUTO-UPDATE. Genuine Chromium APK courtesy of the Chromium team
-[https://chromium.org]
-.
-
-Repo Type:git
-Repo:https://github.com/andDevW/getChromium
-
-Build:1.0,1
-    commit=bacc6f79fbed5d599e7cfd164b9691e50e2b6a70
-    subdir=app
-    init=echo 'task wrapper(type: Wrapper) { gradleVersion = "2.11" }' >> ../build.gradle
-    gradle=yes
-    rm=app/libs/*
-
-Build:2.1,20160614
-    commit=913065436c6f6c8270b61f7b8fbbfa0688c8f493
-    subdir=app
-    init=echo 'task wrapper(type: Wrapper) { gradleVersion = "2.11" }' >> ../build.gradle
-    gradle=yes
-    rm=app/libs/*
-
-Build:3.0,20161021
-    commit=6e86b6ec99b30cedfb0fc144aebc045712a0190f
-    subdir=app
-    init=echo 'task wrapper(type: Wrapper) { gradleVersion = "2.14.1" }' >> ../build.gradle
-    gradle=yes
-    rm=app/libs/*
-
-Build:3.1,20161025
-    commit=a71f0db354163d910ac461090cf3da8c8f7dfa7b
-    subdir=app
-    init=echo 'task wrapper(type: Wrapper) { gradleVersion = "2.14.1" }' >> ../build.gradle
-    gradle=yes
-    rm=app/libs/*
-
-Build:3.2,20161103
-    commit=8fcbdb7ab6adbf3a425a0126610b9d927a83ea0f
-    subdir=app
-    init=echo 'task wrapper(type: Wrapper) { gradleVersion = "2.14.1" }' >> ../build.gradle
-    gradle=yes
-    rm=app/libs/*
-
-Build:3.5,20170314
-    commit=v3.5
-    subdir=app
-    init=echo 'task wrapper(type: Wrapper) { gradleVersion = "2.14.1" }' >> ../build.gradle
-    gradle=yes
-    rm=app/libs/*
-    prebuild=sed -i -e '/mcxiaoke/s@//@@g' build.gradle
-
-Build:4.0,20170318
-    commit=v4.0
-    subdir=app
-    gradle=yes
-    rm=app/libs/*
-    prebuild=sed -i -e '/mcxiaoke/s@//@@g' build.gradle
-
-Build:4.1,20170830
-    commit=v4.1
-    subdir=app
-    gradle=yes
-    rm=app/libs/*
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:4.1
-Current Version Code:20170830
diff --git a/metadata/com.anddevw.getchromium.yml b/metadata/com.anddevw.getchromium.yml
new file mode 100644
index 0000000000..3fe3ecf483
--- /dev/null
+++ b/metadata/com.anddevw.getchromium.yml
@@ -0,0 +1,106 @@
+Categories:
+  - Internet
+  - System
+License: GPL-3.0-only
+WebSite: https://andDevW.com
+SourceCode: https://github.com/andDevW/getChromium
+IssueTracker: https://github.com/andDevW/getChromium/issues
+Bitcoin: 188RxvRnSXSZZnjuDdLwNirHDfNusVPobh
+
+AutoName: getChromium
+Summary: Installs the latest build of Chromium
+Description: |-
+    Installs the latest build of Chromium for Android. Push the button to install
+    Chromium, then push the button and install Chromium again. Each time you install
+    Chromium it updates Chromium. Chromium does NOT AUTO-UPDATE, getChromium does
+    NOT AUTO-UPDATE. Genuine Chromium APK courtesy of the Chromium team
+    [https://chromium.org]
+
+RepoType: git
+Repo: https://github.com/andDevW/getChromium
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: bacc6f79fbed5d599e7cfd164b9691e50e2b6a70
+    subdir: app
+    init: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"2.11\" }' >> ../build.gradle"
+    gradle:
+      - yes
+    rm:
+      - app/libs/*
+
+  - versionName: '2.1'
+    versionCode: 20160614
+    commit: 913065436c6f6c8270b61f7b8fbbfa0688c8f493
+    subdir: app
+    init: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"2.11\" }' >> ../build.gradle"
+    gradle:
+      - yes
+    rm:
+      - app/libs/*
+
+  - versionName: '3.0'
+    versionCode: 20161021
+    commit: 6e86b6ec99b30cedfb0fc144aebc045712a0190f
+    subdir: app
+    init: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"2.14.1\" }' >> ../build.gradle"
+    gradle:
+      - yes
+    rm:
+      - app/libs/*
+
+  - versionName: '3.1'
+    versionCode: 20161025
+    commit: a71f0db354163d910ac461090cf3da8c8f7dfa7b
+    subdir: app
+    init: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"2.14.1\" }' >> ../build.gradle"
+    gradle:
+      - yes
+    rm:
+      - app/libs/*
+
+  - versionName: '3.2'
+    versionCode: 20161103
+    commit: 8fcbdb7ab6adbf3a425a0126610b9d927a83ea0f
+    subdir: app
+    init: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"2.14.1\" }' >> ../build.gradle"
+    gradle:
+      - yes
+    rm:
+      - app/libs/*
+
+  - versionName: '3.5'
+    versionCode: 20170314
+    commit: v3.5
+    subdir: app
+    init: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"2.14.1\" }' >> ../build.gradle"
+    gradle:
+      - yes
+    rm:
+      - app/libs/*
+    prebuild: sed -i -e '/mcxiaoke/s@//@@g' build.gradle
+
+  - versionName: '4.0'
+    versionCode: 20170318
+    commit: v4.0
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - app/libs/*
+    prebuild: sed -i -e '/mcxiaoke/s@//@@g' build.gradle
+
+  - versionName: '4.1'
+    versionCode: 20170830
+    commit: v4.1
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - app/libs/*
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '4.1'
+CurrentVersionCode: 20170830